diff options
| author | Simon McVittie <smcv@debian.org> | 2012-02-21 18:19:44 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2012-02-21 18:19:44 +0000 |
| commit | ce04fc3fa08718a531d28f33b0cd7368fd3dde52 (patch) | |
| tree | 241728dfa114974ff70240c318860a2710fc3921 | |
| parent | a9ded3402b9f8fb79483d410777df458afc30622 (diff) | |
| download | dbus-ce04fc3fa08718a531d28f33b0cd7368fd3dde52.tar.gz | |
Use debhelper 9 (mainly for compressed, build-ID-based debug symbols), and dpkg's default.mk instead of hardening-includes
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 5 | ||||
| -rwxr-xr-x | debian/rules | 20 |
4 files changed, 14 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog index 9fddc666..988d0ad8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ dbus (1.5.10-1) UNRELEASED; urgency=low * New upstream release * Merge from unstable * Build with systemd console-user-checking support + * Use debhelper 9 (mainly for compressed, build-ID-based debug symbols), + and dpkg's default.mk instead of hardening-includes -- Simon McVittie <smcv@debian.org> Tue, 21 Feb 2012 17:41:59 +0000 diff --git a/debian/compat b/debian/compat index 45a4fb75..ec635144 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index aaff8224..852013d1 100644 --- a/debian/control +++ b/debian/control @@ -20,11 +20,10 @@ Uploaders: Sjoerd Simons <sjoerd@debian.org>, # python-gobject Build-Depends: automake (>= 1:1.10), autotools-dev, - debhelper (>= 8.1.3), + debhelper (>= 9), dh-autoreconf, doxygen, - dpkg-dev (>= 1.16.0~ubuntu4), - hardening-includes, + dpkg-dev (>= 1.16.1), libexpat-dev, libdbus-glib-1-dev, libglib2.0-dev, diff --git a/debian/rules b/debian/rules index 32a3ca5a..1d6687fb 100755 --- a/debian/rules +++ b/debian/rules @@ -4,20 +4,15 @@ # Copyright © 2006 Sjoerd Simons <sjoerd@debian.org> # Copyright © 2011 Michael Biebl <biebl@debian.org> +include /usr/share/dpkg/default.mk + %: dh $@ --builddirectory=build --with autoreconf --parallel libdbusN := $(shell sed -rn 's/Package:[[:space:]]*(libdbus-[0-9-]+)[[:space:]]*$$/\1/p' debian/control | head -n 1) libdbus_soname := $(patsubst libdbus-1-%,libdbus-1.so.%,$(libdbusN)) -DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -cflags := $(shell dpkg-buildflags --get CFLAGS) -ldflags := $(shell dpkg-buildflags --get LDFLAGS) -ldflags += -Wl,--as-needed - -include /usr/share/hardening-includes/hardening.make -cflags += $(HARDENING_CFLAGS) -ldflags += $(HARDENING_LDFLAGS) +LDFLAGS += -Wl,--as-needed common_configure_flags := \ --disable-silent-rules \ @@ -25,7 +20,7 @@ common_configure_flags := \ --enable-installed-tests \ --libexecdir=\$${prefix}/lib/dbus-1.0 \ --with-systemdsystemunitdir=/lib/systemd/system \ - CFLAGS="$(cflags)" LDFLAGS="$(ldflags)" + $(NULL) override_dh_auto_configure: dh_auto_configure \ @@ -33,7 +28,8 @@ override_dh_auto_configure: $(common_configure_flags) \ --enable-xml-docs \ --enable-doxygen-docs \ - --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) + --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ + $(NULL) dh_auto_configure \ --builddirectory=build-debug \ -- \ @@ -44,7 +40,9 @@ override_dh_auto_configure: --enable-checks \ --enable-tests \ --enable-verbose-mode \ - --prefix=/usr/lib/$(DEB_HOST_MULTIARCH)/dbus-1.0/debug-build + --prefix=/usr/lib/$(DEB_HOST_MULTIARCH)/dbus-1.0/debug-build \ + --libdir='$${prefix}/lib' \ + $(NULL) override_dh_auto_build: dh_auto_build |