debian: remove support for pre-multiarch versions of Debian

All versions of Debian after Wheezy support Multiarch, so we can
simply the Debian control.in and rules file by removing support for
older versions of Debian without Multiarch support.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/debian/comerr-dev.files.in b/debian/comerr-dev.files
similarity index 100%
rename from debian/comerr-dev.files.in
rename to debian/comerr-dev.files

diff --git a/debian/control.in b/debian/control.in
index f7ed6aa266600d87a5202eed5cbb7e4aacc7067b..32703c67bd2559b31b373c78905af7d925310239 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,6 +1,3 @@
-define(MULTIARCH_HEADERS,ifdef(`DO_MULTIARCH',
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},REMOVE_ME))dnl
 Source: e2fsprogs
 Section: admin
 Priority: required
@@ -56,7 +53,8 @@ Provides: libcomerr-kth-compat
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: e2fsprogs (<< 1.34-1)
 Architecture: any
-MULTIARCH_HEADERS
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: common error description library
  libcomerr is an attempt to present a common error-handling mechanism to
  manipulate the most common form of error code in a fashion that does not
@@ -81,7 +79,8 @@ Section: libs
 Depends: libcomerr2, ${shlibs:Depends}, ${misc:Depends}
 Replaces: e2fsprogs (<< 1.34-1)
 Architecture: any
-MULTIARCH_HEADERS
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: command-line interface parsing library
  libss provides a simple command-line interface parser which will
  accept input from the user, parse the command into an argv argument
@@ -124,7 +123,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: e2fsprogs (<< 1.34-1)
 Provides: libext2fs2, libe2p2
 Architecture: any
-MULTIARCH_HEADERS
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: ext2/ext3/ext4 file system libraries
  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/e2fslibs-dev.files.in b/debian/e2fslibs-dev.files
similarity index 100%
rename from debian/e2fslibs-dev.files.in
rename to debian/e2fslibs-dev.files

diff --git a/debian/e2fslibs.files.in b/debian/e2fslibs.files
similarity index 100%
rename from debian/e2fslibs.files.in
rename to debian/e2fslibs.files

diff --git a/debian/libblkid-dev.files.in b/debian/libblkid-dev.files
similarity index 100%
rename from debian/libblkid-dev.files.in
rename to debian/libblkid-dev.files

diff --git a/debian/libblkid1.files.in b/debian/libblkid1.files
similarity index 100%
rename from debian/libblkid1.files.in
rename to debian/libblkid1.files

diff --git a/debian/libcomerr2.files.in b/debian/libcomerr2.files
similarity index 100%
rename from debian/libcomerr2.files.in
rename to debian/libcomerr2.files

diff --git a/debian/libss2.files.in b/debian/libss2.files
similarity index 100%
rename from debian/libss2.files.in
rename to debian/libss2.files

diff --git a/debian/libuuid1.files.in b/debian/libuuid1.files
similarity index 100%
rename from debian/libuuid1.files.in
rename to debian/libuuid1.files

diff --git a/debian/rules b/debian/rules
index 7354a508af5e7570c3eefde616831fe954bd2cdd..903c77c55fa9b900c0a994123144d5de446103da 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ DEB_BUILD_ARCH                ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_HOST_OS            ?= $(shell dpkg-architecture -qDEB_HOST_OS)
 DEB_HOST_GNU_TYPE      ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE     ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_MULTIARCH     ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
+DEB_HOST_MULTIARCH     ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # Allow distro-specific behaviour
 DISTRO :=$(shell sed -ne '/DISTRIB_ID/s/.*=//p' /etc/lsb-release 2>/dev/null || echo Debian)
@@ -144,21 +144,12 @@ ifneq ($(SKIP_FUSE2FS),)
 UTIL_CONF_FLAGS +=  --disable-fuse2fs
 endif
 
-ifneq ($(strip $(DEB_HOST_MULTIARCH)),)
-MULTIARCH_CONF ?= --with-multiarch=$(DEB_HOST_MULTIARCH)
-# This doesn't work yet because gdb and lintian don't expect and/or
-# don't work with /usr/lib/<triplet>/debug
-#USRLIB = /usr/lib/$(DEB_HOST_MULTIARCH)
-USRLIB ?= /usr/lib
-else
-USRLIB ?= /usr/lib
-endif
-
 BACKTRACE_CONF_FLAGS ?= $(shell if ${debdir}/scripts/test-backtrace ; then echo --disable-backtrace ; fi)
 
 COMMON_CONF_FLAGS = --disable-e2initrd-helper --enable-quota \
        --infodir=/usr/share/info  --enable-symlink-install \
-       $(MULTIARCH_CONF) $(BACKTRACE_CONF_FLAGS) $(UTIL_CONF_FLAGS)
+       --with-multiarch=$(DEB_HOST_MULTIARCH) \
+       $(BACKTRACE_CONF_FLAGS) $(UTIL_CONF_FLAGS)
 
 STD_CONF_FLAGS ?= --enable-elf-shlibs
 
@@ -176,12 +167,6 @@ DBG_PACKAGES += -pe2fsprogs-dbg -pe2fslibs-dbg -plibcomerr2-dbg -plibss2-dbg
 M4_ARGS+=-UUSE_DBGSYM
 endif
 
-ifneq ($(strip $(DEB_HOST_MULTIARCH)),)
-M4_ARGS+=-DDO_MULTIARCH
-else
-M4_ARGS+=-UDO_MULTIARCH
-endif
-
 ifneq ($(BUILD_E2FSCK_STATIC),no)
 M4_ARGS+=-DE2FSCK_STATIC
 else
@@ -201,18 +186,7 @@ else
 M4_ARGS+=-UFUSE2FS
 endif
 
-FILES_FIXUP= libcomerr2.files comerr-dev.files libss2.files ss-dev.files \
-       libuuid1.files uuid-dev.files libblkid1.files libblkid-dev.files \
-       e2fslibs.files e2fslibs-dev.files
-
 debian-files: debian/control
-ifeq ($(strip $(DEB_HOST_MULTIARCH)),)
-       for i in $(FILES_FIXUP); do \
-               sed -e 's;lib/\*/;lib/;' debian/$$i.in > debian/$$i; \
-       done
-else
-       for i in $(FILES_FIXUP); do cp debian/$$i.in debian/$$i; done
-endif
 
 mrproper: clean
        rm debian/control

diff --git a/debian/ss-dev.files.in b/debian/ss-dev.files
similarity index 100%
rename from debian/ss-dev.files.in
rename to debian/ss-dev.files

diff --git a/debian/uuid-dev.files.in b/debian/uuid-dev.files
similarity index 100%
rename from debian/uuid-dev.files.in
rename to debian/uuid-dev.files