Remove conditional multi-arch compilation, all supported dists are multi-arched now.

df7cb · df7cb · commit cf4e81c97fee · 2016-06-03T13:26:53.000+02:00
diff --git a/debian/changelog b/debian/changelog
@@ -1,6 +1,8 @@
 postgresql-9.6 (9.6~beta1-5) UNRELEASED; urgency=medium
 
   * Run regression tests in architecture-dependant builds only.
+  * Remove conditional multi-arch compilation, all supported dists are
+    multi-arched now.
 
  -- Christoph Berg <christoph.berg@credativ.de>  Thu, 19 May 2016 15:08:36 +0200
 
diff --git a/debian/control b/debian/control
@@ -67,7 +67,7 @@ Architecture: any
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: ${misc:Multi-Arch}
+Multi-Arch: same
 Description: PostgreSQL C client library
  libpq is a C library that enables user programs to communicate with
  the PostgreSQL database server.  The server can be on another machine
@@ -84,7 +84,7 @@ Architecture: any
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: ${misc:Multi-Arch}
+Multi-Arch: same
 Description: run-time library for ECPG programs
  The libecpg shared library is used by programs built with ECPG
  (Embedded PostgreSQL for C).
@@ -116,7 +116,7 @@ Architecture: any
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: ${misc:Multi-Arch}
+Multi-Arch: same
 Description: older version of run-time library for ECPG programs
  The libecpg_compat shared library is used by programs built with ecpg.
  (Embedded PostgreSQL for C).
@@ -128,7 +128,7 @@ Architecture: any
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: ${misc:Multi-Arch}
+Multi-Arch: same
 Description: shared library libpgtypes for PostgreSQL 9.6
  The libpgtypes shared library is used by programs built with ecpg.
  (Embedded PostgreSQL for C).
diff --git a/debian/rules b/debian/rules
@@ -9,17 +9,8 @@ MAJOR_VER := 9.6
 CATVERSION = $(shell awk '/CATALOG_VERSION_NO/ { print $$3 }' src/include/catalog/catversion.h)
 
 DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-# this must also work for old releases with multiarch, so don't fail if the
-# variable doesn't exist
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH || true)
-
-# support multi-arch location
-ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/tcl$(TCL_VER)),)
+DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 TCL_CONFIG_DIR := /usr/lib/$(DEB_HOST_MULTIARCH)
-else
-TCL_CONFIG_DIR := /usr/lib
-endif
 
 # support both hardening-wrapper (for backports) and dpkg-buildflags
 export DEB_BUILD_HARDENING = 1
@@ -185,14 +176,6 @@ override_dh_compress:
 	gzip -9n $(CURDIR)/debian/*/usr/share/postgresql/*/man/man*/*.[137]
 
 override_dh_install-arch:
-ifneq ($(DEB_HOST_MULTIARCH),)
-	# enabling multiarch support in debian/lib*.install
-	sed -i -e 's!usr/lib/\(lib\|pkgconfig\)!usr/lib/*/\1!' debian/lib*.install
-else
-	# disabling multiarch support in debian/lib*.install
-	sed -i -e 's!usr/lib/\*/\(lib\|pkgconfig\)!usr/lib/\1!' debian/lib*.install
-endif
-
 	dh_install --fail-missing
 
 	# link README.Debian.gz to postgresql-common
@@ -238,9 +221,6 @@ override_dh_installdeb-arch:
 	# record catversion in preinst
 	sed -i -e 's/@CATVERSION@/$(CATVERSION)/' debian/postgresql-$(MAJOR_VER)/DEBIAN/preinst
 
-ifneq ($(DEB_HOST_MULTIARCH),)
-GENCONTROL_MA = -Vmisc:Multi-Arch=same
-endif
 override_dh_gencontrol:
 	# record catversion in .deb control file
-	dh_gencontrol -- $(GENCONTROL_MA) -Vpostgresql:Catversion=$(CATVERSION)
+	dh_gencontrol -- -Vpostgresql:Catversion=$(CATVERSION)
