debian: make e2fsprogs-l10n be arch:all
Addresses-Debian-Bug: 873813
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
diff --git a/debian/control.in b/debian/control.in
index 0581fa1..a8ba5f5 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -38,7 +38,7 @@
Priority: extra
Depends: e2fsprogs (= ${binary:Version}), ${misc:Depends}
Replaces: e2fsprogs (<< 1.43.5-1)
-Architecture: any
+Architecture: all
Description: ext2/ext3/ext4 file system utilities - translations
The ext2, ext3 and ext4 file systems are successors of the original ext
("extended") file system. They are the main file system types used for
diff --git a/debian/rules b/debian/rules
index d4ce5e5..a2eac6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -364,10 +364,22 @@
ln -sf mke2fs mkfs.ext2 ; ln -sf mke2fs mkfs.ext3 ; \
ln -sf mke2fs mkfs.ext4)
-binary-indep:
- # no arch-independant debs.
+binary-indep: install
+ dh_testdir
+ dh_testroot
+ dh_lintian -i
+ dh_installchangelogs -i
+ dh_fixperms -i
+ dh_compress -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
-binary-arch: DH_OPTIONS= -a
+# binary-arch builds a superset of binary-indep. This is because
+# building e2fsprogs-l10n.deb unnecessarily takes less time than
+# running the install recipe twice. At some point when we rototill
+# the rules file we can clean this up in a better way.
binary-arch: install $(INSTALL_UDEB)
dh_testdir
dh_testroot
@@ -470,7 +482,9 @@
dh_md5sums
dh_builddeb
-binary: binary-indep binary-arch
+# binary-arch builds a superset of binary-indep. See the comment
+# before the binary-arch rule for more details.
+binary: binary-arch
.PHONY: binary binary-arch binary-indep clean checkroot mrproper \
debug_flags debian-files
