From b745501b908749d743d0c51174cc3a3e0634b532 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@debian.org>
Date: Tue, 26 Dec 2017 13:11:50 -0500
Subject: [PATCH 1/2] Switch from cdbs to dh
Closes: #885398
---
debian/control | 3 +--
debian/libwavpack-dev.docs | 1 +
debian/rules | 33 ++++++++++++++++++++-------------
3 files changed, 22 insertions(+), 15 deletions(-)
create mode 100644 debian/libwavpack-dev.docs
diff --git a/debian/control b/debian/control
index b073389..dfa875f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: sound
Priority: optional
Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
Uploaders: Sebastian Dröge <sl...@debian.org>
-Build-Depends: cdbs (>= 0.4.93~),
- debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
dh-autoreconf,
dpkg-dev (>= 1.14.13)
Standards-Version: 4.0.0
diff --git a/debian/libwavpack-dev.docs b/debian/libwavpack-dev.docs
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/debian/libwavpack-dev.docs
@@ -0,0 +1 @@
+README
diff --git a/debian/rules b/debian/rules
index fd06a0c..7890799 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,27 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/rules/utils.mk
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
-common-binary-post-install-arch:: list-missing
+ifeq (,$(filter-out armel armhf,$(DEB_HOST_ARCH)))
+asm += --disable-asm
+endif
-DEB_SHLIBDEPS_INCLUDE := debian/libwavpack1/usr/lib
-DEB_DH_MAKESHLIBS_ARGS_libwavpack1 += -- -c4
+%:
+ dh $@
-DEB_INSTALL_DOCS_ALL =
-DEB_INSTALL_DOCS_libwavpack-dev = README
+override_dh_autoreconf:
+ dh_autoreconf --as-needed
-DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+override_dh_auto_configure:
+ dh_auto_configure -- ${asm}
-ifeq (,$(filter-out armel armhf,$(DEB_HOST_ARCH)))
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-asm
-endif
+override_dh_makeshlibs:
+ dh_makeshlibs -- -c4
+
+override_dh_install:
+ find debian/tmp -name '*.la' -print -delete
+ dh_install
+
+override_dh_missing:
+ dh_missing --fail-missing
--
2.14.1
From 5c38a7c46f7ec2c8b43f086c44136d426b220884 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@debian.org>
Date: Tue, 26 Dec 2017 13:17:34 -0500
Subject: [PATCH 2/2] Bump debhelper compat to 11
and drop obsolete dpkg-dev and pre-depends for multi-archification
---
debian/compat | 2 +-
debian/control | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/debian/compat b/debian/compat
index ec63514..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11
diff --git a/debian/control b/debian/control
index dfa875f..d11bf36 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,7 @@ Section: sound
Priority: optional
Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
Uploaders: Sebastian Dröge <sl...@debian.org>
-Build-Depends: debhelper (>= 9),
- dh-autoreconf,
- dpkg-dev (>= 1.14.13)
+Build-Depends: debhelper (>= 11),
Standards-Version: 4.0.0
Homepage: http://www.wavpack.com
Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/wavpack.git
@@ -15,7 +13,6 @@ Package: libwavpack1
Architecture: any
Multi-Arch: same
Section: libs
-Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: audio codec (lossy and lossless) - library
--
2.14.1
_______________________________________________
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
