[SCM] adplug/master: Imported Debian patch 2.0.1.dfsg-1
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Sun Sep 26 15:06:59 UTC 2010
Imported Upstream version 2.0.1.dfsg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 53e4990e4569f172cf0b3b53776f06061b9248ac
X-Git-Newrev: 5f9874600059e9a31b41738807ae3c6773ff4e8a
The following commit has been merged in the master branch:
commit 5f9874600059e9a31b41738807ae3c6773ff4e8a
Merge: 53e4990e4569f172cf0b3b53776f06061b9248ac 3adedefa22c3a7cb51899120f98344ff4f094d00
Author: Chris Lamb <lamby at debian.org>
Date: Mon Jul 27 10:40:47 2009 +0200
Imported Debian patch 2.0.1.dfsg-1
diff --combined debian/changelog
index 11a8060,0000000..4f7e838
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,108 -1,0 +1,117 @@@
++adplug (2.0.1.dfsg-1) unstable; urgency=low
++
++ * QA upload.
++ * Repack upstream tarball to not include test/ directory as it contains
++ non-DFSG compliant samples from proprietary games. (Closes: #532974)
++ * Bump Standards-Version to 3.8.2.
++
++ -- Chris Lamb <lamby at debian.org> Mon, 27 Jul 2009 10:40:47 +0200
++
+adplug (2.0.1-7) unstable; urgency=low
+
+ * QA upload.
+ * Fix FTBFS with gcc-4.3 by fixing missing includes (Closes: #417078).
+ + debian/patches/02-fix-ftbfs-with-gcc-4.3.dpatch
+ * No longer ignore “make distclean†errors.
+ * Move the Homepage from the descriptions to a source field.
+ * Bump Standards-Version (no changes needed).
+
+ -- Cyril Brulebois <cyril.brulebois at enst-bretagne.fr> Mon, 17 Mar 2008 02:24:23 +0100
+
+adplug (2.0.1-6) unstable; urgency=low
+
+ * Orphaning package, setting maintainer to the Debian QA Group.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org> Wed, 05 Dec 2007 16:12:15 +0100
+
+adplug (2.0.1-5) unstable; urgency=low
+
+ * New Maintainer. (Closes: #407626)
+
+ -- Gürkan Sengün <gurkan at linuks.mine.nu> Mon, 16 Apr 2007 12:31:08 +0200
+
+adplug (2.0.1-4) unstable; urgency=low
+
+ * Debian QA Group <packages at qa.debian.org>.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 20 Jan 2007 09:57:00 +0100
+
+adplug (2.0.1-3) unstable; urgency=low
+
+ * Minor cleanups.
+
+ -- Daniel Baumann <daniel at debian.org> Fri, 19 Jan 2007 10:14:00 +0100
+
+adplug (2.0.1-2) unstable; urgency=low
+
+ * The previous upload did not take care about the bumped soname, therefore
+ updated the shlibs now. This requires all packages build-depending on adplug
+ to be recompiled against 2.0.1-2. Fortunately, this affects only ocp and
+ adplay*.
+
+ -- Daniel Baumann <daniel at debian.org> Sun, 17 Sep 2006 18:37:00 +0200
+
+adplug (2.0.1-1) unstable; urgency=high
+
+ * New upstream release:
+ - fixes multiple remote stack-based buffer overflows CVE-2006-3582
+ CVE-2006-3581 (Closes: #378279).
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 17 Jul 2006 19:48:00 +0200
+
+adplug (2.0-3) unstable; urgency=low
+
+ * New email address.
+
+ -- Daniel Baumann <daniel at debian.org> Thu, 6 Jul 2006 07:17:00 +0200
+
+adplug (2.0-2) unstable; urgency=low
+
+ * Fixed build-depends (Closes: #375713).
+
+ -- Daniel Baumann <daniel.baumann at panthera-systems.net> Wed, 28 Jun 2006 08:36:00 +0200
+
+adplug (2.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel.baumann at panthera-systems.net> Sun, 25 Jun 2006 12:43:00 +0200
+
+adplug (1.5.1-6) unstable; urgency=low
+
+ * Rebuild and rename due to new libstdc++ configuration (Closes: #339143).
+
+ -- Daniel Baumann <daniel.baumann at panthera-systems.net> Sun, 20 Nov 2005 17:01:00 +0200
+
+adplug (1.5.1-5) unstable; urgency=low
+
+ * Added patch to update includes of new libbinio1c2 (Closes: #335825).
+
+ -- Daniel Baumann <daniel.baumann at panthera-systems.net> Sat, 29 Aug 2005 16:49:00 +0200
+
+adplug (1.5.1-4) unstable; urgency=low
+
+ * Recompiled against fixed libbinio1c2 to correct depends (Closes: #321573).
+ * Added override for libadplug0c2 complaining about package name.
+ * Removed unnecessary provides-fields.
+
+ -- Daniel Baumann <daniel.baumann at panthera-systems.net> Sat, 6 Aug 2005 13:34:00 +0200
+
+adplug (1.5.1-3) unstable; urgency=low
+
+ * C++ ABI change.
+ * bumped policy to 3.6.2.
+
+ -- Daniel Baumann <daniel.baumann at panthera-systems.net> Fri, 8 Jul 2005 15:18:00 +0200
+
+adplug (1.5.1-2) unstable; urgency=low
+
+ * debian/rules: reverted binary-targets to default (Closes: #312025).
+
+ -- Daniel Baumann <daniel.baumann at panthera-systems.net> Sun, 5 Jun 2005 16:52:00 +0100
+
+adplug (1.5.1-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Daniel Baumann <daniel.baumann at panthera-systems.net> Wed, 11 May 2005 12:38:00 +0200
diff --combined debian/control
index 462478d,0000000..de71006
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,42 -1,0 +1,42 @@@
+Source: adplug
+Section: libs
+Priority: optional
+Maintainer: Debian QA Group <packages at qa.debian.org>
+Build-Depends: debhelper (>= 5), dpatch, libbinio-dev, pkg-config
- Standards-Version: 3.7.3
++Standards-Version: 3.8.2
+Homepage: http://adplug.sourceforge.net/
+
+Package: libadplug0c2a
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: adplug-utils
+Description: free AdLib sound library
+ AdPlug is a free, multi-platform, hardware independent AdLib sound library,
+ mainly written in C++. AdPlug plays sound data, originally created for the
+ AdLib (OPL2) audio board, on top of an OPL2 emulator or by using the real
+ hardware. No OPL2 chip is required for playback.
+
+Package: libadplug-dev
+Section: libdevel
+Architecture: any
+Depends: libadplug0c2a (= ${binary:Version})
+Description: free AdLib sound library (development)
+ AdPlug is a free, multi-platform, hardware independent AdLib sound library,
+ mainly written in C++. AdPlug plays sound data, originally created for the
+ AdLib (OPL2) audio board, on top of an OPL2 emulator or by using the real
+ hardware. No OPL2 chip is required for playback.
+ .
+ This package contains the development files.
+
+Package: adplug-utils
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: free AdLib sound library (utils)
+ AdPlug is a free, multi-platform, hardware independent AdLib sound library,
+ mainly written in C++. AdPlug plays sound data, originally created for the
+ AdLib (OPL2) audio board, on top of an OPL2 emulator or by using the real
+ hardware. No OPL2 chip is required for playback.
+ .
+ This package contains additional utilities.
diff --combined debian/patches/00list
index 7951076,0000000..f7485a8
mode 100644,000000..100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@@ -1,2 -1,0 +1,3 @@@
+01-include
+02-fix-ftbfs-with-gcc-4.3.dpatch
++03-no-tests.dpatch
diff --combined debian/patches/03-no-tests.dpatch
index 0000000,0000000..de82ecd
new file mode 100644
--- /dev/null
+++ b/debian/patches/03-no-tests.dpatch
@@@ -1,0 -1,0 +1,51 @@@
++#!/bin/sh /usr/share/dpatch/dpatch-run
++## 03-no-tests.dpatch by Chris Lamb <lamby at debian.org>
++##
++## DP: Don't run tests; we have stripped that directory from the tarball.
++
++ at DPATCH@
++
++diff -urNd adplug-2.0.1.orig/configure adplug-2.0.1/configure
++--- adplug-2.0.1.orig/configure 2009-07-27 11:11:55.000000000 +0200
+++++ adplug-2.0.1/configure 2009-07-27 11:13:07.000000000 +0200
++@@ -1528,7 +1528,7 @@
++
++
++
++- ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile adplugdb/Makefile test/Makefile adplug.pc"
+++ ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile adplugdb/Makefile adplug.pc"
++
++ am__api_version="1.9"
++ ac_aux_dir=
++@@ -21725,7 +21725,6 @@
++ "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
++ "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
++ "adplugdb/Makefile" ) CONFIG_FILES="$CONFIG_FILES adplugdb/Makefile" ;;
++- "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
++ "adplug.pc" ) CONFIG_FILES="$CONFIG_FILES adplug.pc" ;;
++ "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
++ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
++diff -urNd adplug-2.0.1.orig/configure.in adplug-2.0.1/configure.in
++--- adplug-2.0.1.orig/configure.in 2009-07-27 11:11:55.000000000 +0200
+++++ adplug-2.0.1/configure.in 2009-07-27 11:12:29.000000000 +0200
++@@ -1,7 +1,7 @@
++ # Tell autoconf we're compiling a C++ library, using automake & libtool
++ AC_INIT(adplug,2.0.1)
++ AC_CONFIG_SRCDIR(src/adplug.cpp)
++-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile adplugdb/Makefile test/Makefile adplug.pc])
+++AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile adplugdb/Makefile adplug.pc])
++ AM_INIT_AUTOMAKE
++ AM_MAINTAINER_MODE
++ AM_PROG_LIBTOOL
++diff -urNd adplug-2.0.1.orig/Makefile.in adplug-2.0.1/Makefile.in
++--- adplug-2.0.1.orig/Makefile.in 2009-07-27 11:11:55.000000000 +0200
+++++ adplug-2.0.1/Makefile.in 2009-07-27 11:12:18.000000000 +0200
++@@ -185,7 +185,7 @@
++ sharedstatedir = @sharedstatedir@
++ sysconfdir = @sysconfdir@
++ target_alias = @target_alias@
++-SUBDIRS = src doc adplugdb test
+++SUBDIRS = src doc adplugdb
++ EXTRA_DIST = adplug.spec adplug.qpg BUGS adplug.pc.in
++ AUTOMAKE_OPTIONS = dist-bzip2
++ pkgconfigdir = $(libdir)/pkgconfig
--
adplug packaging
More information about the pkg-multimedia-commits
mailing list