Your message dated Thu, 17 May 2018 15:36:15 +0000
with message-id <e1fjkwx-0005qq...@fasolo.debian.org>
and subject line Bug#810258: fixed in opus 1.3~beta+20180516-1
has caused the Debian Bug report #810258,
regarding modernize the packaging a bit
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
810258: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=810258
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: src:opus
Version: 1.1.1-1
Tags: patch

Hi,

please find attached a patch which updates the packaging a bit, runs the tests during the build and bumps the debhelper level to 9.

  * Merge with Debian; remaining changes:
  * Convert to Debhelper 9 with a simpler rules file.
  * Build using dh-autoreconf.
  * Add a watch file.
  * debian/control: close some Lintian errors.
    - Pre-depend on multiarch-support.
    - Add ${misc:Depends} to package dependencies.
  * Convert to debian source format 3.0 (quilt).
  * Run the tests.

diff -Nru opus-1.1.1/debian/compat opus-1.1.1/debian/compat
--- opus-1.1.1/debian/compat	2016-01-07 19:21:24.000000000 +0100
+++ opus-1.1.1/debian/compat	2016-01-07 18:49:24.000000000 +0100
@@ -1 +1 @@
-5
+9
diff -Nru opus-1.1.1/debian/control opus-1.1.1/debian/control
--- opus-1.1.1/debian/control	2016-01-07 19:21:24.000000000 +0100
+++ opus-1.1.1/debian/control	2016-01-07 18:57:53.000000000 +0100
@@ -2,7 +2,7 @@
 Section: sound
 Priority: optional
 Maintainer: Ron Lee <r...@debian.org>
-Build-Depends: debhelper (>= 5), doxygen
+Build-Depends: debhelper (>= 9), doxygen, dh-autoreconf
 Standards-Version: 3.9.6.1
 Homepage: http://www.opus-codec.org
 Vcs-Git: git://git.debian.org/users/ron/opus.git
@@ -12,7 +12,8 @@
 Section: libs
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: opus-tools
 Description: Opus codec runtime library
  The Opus codec is designed for interactive speech and audio transmission over
@@ -42,7 +43,7 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libopus0 (= ${binary:Version})
+Depends: libopus0 (= ${binary:Version}), ${misc:Depends}
 Description: Opus codec library development files
  The Opus codec is designed for interactive speech and audio transmission over
  the Internet. It is designed by the IETF Codec Working Group and incorporates
@@ -72,13 +73,14 @@
 Priority: extra
 Architecture: any
 Multi-Arch: same
-Depends: libopus0 (= ${binary:Version})
+Depends: libopus0 (= ${binary:Version}), ${misc:Depends}
 Description: debugging symbols for libopus
  This package provides the detached debug symbols for libopus.
 
 Package: libopus-doc
 Section: doc
 Architecture: all
+Depends: ${misc:Depends}
 Description: libopus API documentation
  This package contains the developer documentation for libopus.
 
diff -Nru opus-1.1.1/debian/libopus0.install opus-1.1.1/debian/libopus0.install
--- opus-1.1.1/debian/libopus0.install	1970-01-01 01:00:00.000000000 +0100
+++ opus-1.1.1/debian/libopus0.install	2013-10-23 12:56:05.000000000 +0200
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*
diff -Nru opus-1.1.1/debian/libopus-dev.install opus-1.1.1/debian/libopus-dev.install
--- opus-1.1.1/debian/libopus-dev.install	1970-01-01 01:00:00.000000000 +0100
+++ opus-1.1.1/debian/libopus-dev.install	2013-10-23 12:56:05.000000000 +0200
@@ -0,0 +1,4 @@
+usr/include/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/opus.pc
diff -Nru opus-1.1.1/debian/rules opus-1.1.1/debian/rules
--- opus-1.1.1/debian/rules	2016-01-07 19:21:24.000000000 +0100
+++ opus-1.1.1/debian/rules	2016-01-07 19:19:46.000000000 +0100
@@ -1,156 +1,17 @@
 #!/usr/bin/make -f
-# Ron Lee 2003 - 2012
-
-#export DH_VERBOSE=1
-export DH_OPTIONS
-
-SHELL = /bin/bash
-
-NUM_CPUS = $(shell getconf _NPROCESSORS_ONLN 2>/dev/null)
-PARALLEL = $(subst parallel=,,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-NJOBS    = -j$(or $(PARALLEL),$(NUM_CPUS),1)
-
-
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
-
-
-HARD_CPPFLAGS = -D_FORTIFY_SOURCE=2
-HARD_CFLAGS   = -Wformat=2
-HARD_LDFLAGS  = -Wl,-z,now
-
-ifneq (,$(filter-out $(DEB_HOST_ARCH), alpha hppa arm))
-	HARD_CFLAGS += -fstack-protector --param ssp-buffer-size=4
-endif
-ifneq (,$(filter-out $(DEB_HOST_ARCH), ia64 hppa avr32))
-	HARD_LDFLAGS += -Wl,-z,relro
-endif
-
-# Keep dpkg-buildpackage the hell out of messing with our compile flags,
-# we should trust upstream to know better than it what to use here.
-# We explicitly re-add -g and -O2 here, since by explicitly overriding
-# these variables, we otherwise disable autoconf adding them by default.
-CPPFLAGS = $(HARD_CPPFLAGS)
-CFLAGS   = $(HARD_CFLAGS) -g -O2
-CXXFLAGS = $(HARD_CFLAGS) -g -O2
-LDFLAGS  = $(HARD_LDFLAGS)
-
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS = -g -O0
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	BUILD_TARGET = check-opus
-else
-	BUILD_TARGET = opus
-endif
-
-
-ifneq (,$(DEB_HOST_MULTIARCH))
-	MADIR = /$(DEB_HOST_MULTIARCH)
-	EXTRA_CONFIG_FLAGS = --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
-endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH), arm armel mips mipsel))
-	EXTRA_CONFIG_FLAGS += --enable-fixed-point
+EXTRA_CONFIG_FLAGS += --enable-fixed-point
 endif
 
+%:
+	dh $@ --parallel --with autoreconf
 
+override_dh_auto_configure:
+	dh_auto_configure -- --disable-silent-rules $(EXTRA_CONFIG_FLAGS)
 
-objdir := objs
-
-
-clean:
-	dh_testdir
-	dh_testroot
-	$(RM) -r $(objdir)
-	$(RM) *-stamp
-	dh_clean
-
-
-$(objdir)/config.status: configure
-	dh_testdir
-	mkdir -p $(objdir)
-	cd $(objdir) &&	../configure --disable-maintainer-mode		\
-				     --host=$(DEB_HOST_GNU_TYPE)	\
-				     --build=$(DEB_BUILD_GNU_TYPE)	\
-				     --prefix=/usr			\
-				     $(EXTRA_CONFIG_FLAGS)		\
-				     CPPFLAGS="$(CPPFLAGS)"		\
-				     CFLAGS="$(CFLAGS)"			\
-				     CXXFLAGS="$(CXXFLAGS)"		\
-				     LDFLAGS="$(LDFLAGS)"
-
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: $(objdir)/config.status
-	dh_testdir
-	$(MAKE) $(NJOBS) -C $(objdir) $(BUILD_TARGET)
-	touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp: $(objdir)/config.status
-	dh_testdir
-	$(MAKE) $(NJOBS) -C $(objdir) docs
-	touch $@
-
-
-install: install-arch install-indep
-
-install-arch: install-arch-stamp
-install-arch-stamp: build-arch
-	dh_testdir
-	$(MAKE) -C $(objdir) install-opus DESTDIR=$(CURDIR)/debian/tmp
-	touch $@
-
-install-indep: install-indep-stamp
-install-indep-stamp: build-indep
-	dh_testdir
-	$(MAKE) -C $(objdir) install-docs DESTDIR=$(CURDIR)/debian/tmp
-	touch $@
-
-
-binary: binary-arch binary-indep
-
-binary-indep: DH_OPTIONS = -i
-binary-indep: install-indep
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-arch: install-arch
-	dh_testdir
-	dh_testroot
-	dh_install -plibopus0    debian/tmp/usr/lib$(MADIR)/lib*.so.*		usr/lib$(MADIR)
-	dh_install -plibopus-dev debian/tmp/usr/include/*			usr/include
-	dh_install -plibopus-dev debian/tmp/usr/lib$(MADIR)/lib*.{a,so}		usr/lib$(MADIR)
-	dh_install -plibopus-dev debian/tmp/usr/lib$(MADIR)/pkgconfig/opus.pc	usr/lib$(MADIR)/pkgconfig
-	dh_installdocs -a
-	dh_installchangelogs -a
-	dh_strip -a --dbg-package=libopus-dbg
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -plibopus0 -- -c0
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-
-.PHONY: clean build build-arch build-indep install install-arch install-indep \
-	binary binary-arch binary-indep
+override_dh_test:
+	$(MAKE) check
 
+override_dh_strip:
+	dh_strip --dbg-package=libopus-dbg
diff -Nru opus-1.1.1/debian/source/format opus-1.1.1/debian/source/format
--- opus-1.1.1/debian/source/format	1970-01-01 01:00:00.000000000 +0100
+++ opus-1.1.1/debian/source/format	2012-09-26 01:08:20.000000000 +0200
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru opus-1.1.1/debian/watch opus-1.1.1/debian/watch
--- opus-1.1.1/debian/watch	1970-01-01 01:00:00.000000000 +0100
+++ opus-1.1.1/debian/watch	2016-01-07 18:54:21.000000000 +0100
@@ -0,0 +1,2 @@
+version=3
+http://www.opus-codec.org/downloads/ (?:|.*/)opus-(\d[\d\.]*)\.tar\.(?:xz|bz2|gz)

--- End Message ---
--- Begin Message ---
Source: opus
Source-Version: 1.3~beta+20180516-1

We believe that the bug you reported is fixed in the latest version of
opus, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 810...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Ron Lee <r...@debian.org> (supplier of updated opus package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Thu, 17 May 2018 16:07:39 +0930
Source: opus
Binary: libopus0 libopus-dev libopus-dbg libopus-doc
Architecture: source amd64 all
Version: 1.3~beta+20180516-1
Distribution: unstable
Urgency: medium
Maintainer: Ron Lee <r...@debian.org>
Changed-By: Ron Lee <r...@debian.org>
Description:
 libopus-dbg - debugging symbols for libopus
 libopus-dev - Opus codec library development files
 libopus-doc - libopus API documentation
 libopus0   - Opus codec runtime library
Closes: 810258 898690
Changes:
 opus (1.3~beta+20180516-1) unstable; urgency=medium
 .
   * Snapshot from 652c4559f593d3aad78bd5c85a216eeae7859429 as a preview of
     patches pending for the 1.3 release.  The main motivation for doing this
     now is to pull in the fix for the PLC regression introduced just before
     1.2~alpha2, which Closes: #898690, and to get some broader testing on the
     new hardening checks before flipping the switch to enable those by default
     upstream.
   * Fix celt_pitch_xcorr() ARM jump table compiling error for a bug introduced
     in 1.2-rc1.
   * Better rate allocation for stereo SILK in hybrid mode.
   * Add RNN for VAD and speech/music classification.
   * Fixing bandwidth detection for 24 kHz analysis.
   * Enable RFC 8251 changes by default.
   * Better tuning for low-bitrate music.
   * Don't set _FORTIFY_SOURCE and -fstack-protector as part of the packaging
     anymore, the upstream build system will add them where they are supported
     and needed now.
   * Build with --enable-hardening, which isn't related to the compile options
     above, but instead includes additional opus-specific runtime sanity checks
     which are cheap and certain enough to use in production builds.
   * Use dh compat 9, not because it actually brings anything new which we need
     here, but it hushes the increasingly insistent warnings about deprecated
     compat levels, and is a baseline supported by all of the releases we still
     need to be able to support.  I'm going to say this Closes: #810258, since
     the rest of the 'modernisation' there mostly isn't helpful.  We've already
     been running the tests since the very first release, we release directly
     from upstream git and maintain upstream patches there, so format 3(quilt)
     adds nothing but pain, and we have upstream build and install targets that
     are designed to cleanly separate the -arch specific and -indep components,
     so regressing to make those codependent isn't very appealing either.  It
     would have also broken support for building where m-a wasn't supported,
     though that's less of a problem today than it was previously.
Checksums-Sha1:
 57fee47a5d8cbdab979e8208994cecbc308ac42e 2006 opus_1.3~beta+20180516-1.dsc
 69ec8db4ba2b2112cc43ab2d0b64a8fb66a9e5cb 1071376 
opus_1.3~beta+20180516.orig.tar.gz
 480a58dd531d42ee35b23e3e5c3ec999436b59cf 8621 opus_1.3~beta+20180516-1.diff.gz
 38003886aaff8a0518017836f39aa239cf8ba045 504244 
libopus-dbg_1.3~beta+20180516-1_amd64.deb
 b9e8497086c72a63e3eccc776eaa843235590556 234348 
libopus-dev_1.3~beta+20180516-1_amd64.deb
 abdce1b765ee45e308c7b08d03c310183c293e91 201280 
libopus-doc_1.3~beta+20180516-1_all.deb
 74bfb3d43d1427b8889f5ba3b78a2ba49e792cdd 188384 
libopus0_1.3~beta+20180516-1_amd64.deb
 bd9cd7d73432e05d64870d9c0351cf2c57dc02af 7879 
opus_1.3~beta+20180516-1_amd64.buildinfo
Checksums-Sha256:
 96e9f806ee9ee9e97a3bbb3ed77d2b09a5b7eaec365c81832127fba2e1bcb9d4 2006 
opus_1.3~beta+20180516-1.dsc
 729360281bdd5cb6ccf0d0c16cf6510477cb568d114ec43dc2412fcc2cbaeeaa 1071376 
opus_1.3~beta+20180516.orig.tar.gz
 33ddaa51bd32ba30068b904c5bab51c8570b4cc2e91f40a9119e64c244fa51cf 8621 
opus_1.3~beta+20180516-1.diff.gz
 db414bd932d4455237ce4ca2628e80631ad8f886ebcc065ff44a8211996c237a 504244 
libopus-dbg_1.3~beta+20180516-1_amd64.deb
 531aa064b48d2e78244b85aff803d08efb92b497d02735f4571355316e7c0b89 234348 
libopus-dev_1.3~beta+20180516-1_amd64.deb
 de2e5d7e70f83c2c82bf122db710e0c6fcd1d3881e395e79a57f30629e73e3d8 201280 
libopus-doc_1.3~beta+20180516-1_all.deb
 4763340a051247218189bb5a68cf144c9a09bf703576633ca9c1af43c56b01e1 188384 
libopus0_1.3~beta+20180516-1_amd64.deb
 374c95d2039aa9a419f86d36cb287b31fd811e233c0908631c83710f27f57d25 7879 
opus_1.3~beta+20180516-1_amd64.buildinfo
Files:
 94143c0ac73af1337f7c218bff9ab426 2006 sound optional 
opus_1.3~beta+20180516-1.dsc
 6c99459e59846254fb8789538d7b1039 1071376 sound optional 
opus_1.3~beta+20180516.orig.tar.gz
 4937f64be81f8f21f9ea6a642f1e545c 8621 sound optional 
opus_1.3~beta+20180516-1.diff.gz
 78604f063bad59f1a2c81fdc5e85865f 504244 debug extra 
libopus-dbg_1.3~beta+20180516-1_amd64.deb
 bc4179310a3a392758838c04035e5eec 234348 libdevel optional 
libopus-dev_1.3~beta+20180516-1_amd64.deb
 92a782518c6d5a288e6647ca6e7e09e1 201280 doc optional 
libopus-doc_1.3~beta+20180516-1_all.deb
 ae6f943a3972983eee9d825aef848db2 188384 libs optional 
libopus0_1.3~beta+20180516-1_amd64.deb
 920d703542fca069ca6b748c7622f20e 7879 sound optional 
opus_1.3~beta+20180516-1_amd64.buildinfo

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBCAAGBQJa/Z1kAAoJECSWn9pgwHEseJQP/0UxQ+FXgfFL+o6GHJOQa2um
7ntkrpy15CUOYuNerXNIfVNXEUrgo6HOxOeo3LleTe8ijLSxOv1KIR++youmIY1k
VgRD8J+1WMoOID09tJSakGj5pziAIH6s3bBiTQDPXtC3I7JhIOflG1YFUJRJcCKQ
rAE8y+gfS4wSUUUK5Sszs/IEGoNi8V+AvhE1X5irfyo94vSA9NTwob3wrNWvU/TO
bUUzSpIRqP8cfCiz5WScQi2gaiYRffNHzKVze4sk2CqXowgm0xTMUzNdY8RW0lDk
q8BXL/RJ119UiHVUtIpv6agszAzxqbZYJ+cZCLexdB5R1L1Nov+PvZ1FYZ5p+VQD
eizy3ykMeWwMXmrCb6c+e02AE7ujj153798LQFbnFSrUa+skLVIP9TOxg9OEqJsE
ds+ozHDYMM2S3SvZATf16Zq7rNflqJl7Vaoh/48/phlDvovJSXA4CoiRuARS0/4w
qiDBDRMVxWx4Xt/xvnTFPSwgfDXYV7w/U0p599j1qnyAhAI4q0iKq4bQFZAKcO8R
5Bh8llIpvE5SPRrI+InFuc3qL+NJxa1P9kiikKomve8OUhnJqftPC8eu2Spkr3K5
o7IoFC7Nh9CdpGmyUPJI1a4dvourPS272fiajuJbF+oBSuUFkwK6BG6I4FKRrgSb
Uw/G0qTp+FYdQbqKesA2
=Omov
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to