diff -u xmms2-0.5DrLecter/debian/changelog xmms2-0.5DrLecter/debian/changelog --- xmms2-0.5DrLecter/debian/changelog +++ xmms2-0.5DrLecter/debian/changelog @@ -1,3 +1,17 @@ +xmms2 (0.5DrLecter-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable (LP: #241098), remaining changes: + + debian/control: + + Update Maintainer field + + add lpia to xmms2-plugin-alsa supported architectures + + Added liba52-0.7.4-dev to build depends + + debian/rules: Added patch, patch-stamp and unpatch + + changed 01_gcc4.3.patch: + + src/include/xmmsclient/xmmsclient++/helpers.h: Added #include + * New upstream relase fixes LP: #212566, #222341 + + -- Benjamin Drung Fri, 04 Jul 2008 12:44:25 +0200 + xmms2 (0.5DrLecter-1) unstable; urgency=low * New upstream release. @@ -18,6 +32,25 @@ -- Florian Ragwitz Sun, 22 Jun 2008 12:53:18 +0200 +xmms2 (0.4DrKosmos-4ubuntu2) intrepid; urgency=low + + * Fix FTBFS with gcc 4.3 (LP: #237497): + - src/include/xmmsclient/xmmsclient++/helpers.h: Added #include + - debian/control: Added liba52-0.7.4-dev to build depends + - debian/rules: Added patch, patch-stamp and unpatch + * Rebuild for the perl 5.10 transition (LP: #230016). + + -- Benjamin Drung Thu, 05 Jun 2008 02:22:24 +0200 + +xmms2 (0.4DrKosmos-4ubuntu1) intrepid; urgency=low + + * Merge from debian unstable (LP: #178477), remaining changes: + - debian/control: Update Maintainer field + - debian/control: add lpia to xmms2-plugin-alsa supported architectures + * This version reads AAC files (LP: #156359) + + -- Benjamin Drung Thu, 29 May 2008 10:14:25 +0200 + xmms2 (0.4DrKosmos-4) unstable; urgency=low * Make all packages that ship pkg-config files depend on pkg-config. @@ -90,6 +123,36 @@ -- Florian Ragwitz Sat, 09 Feb 2008 21:55:10 +0100 +xmms2 (0.2DrJekyll-4ubuntu4) hardy; urgency=low + + * Change fftw3-dev to libfftw3-dev. + + -- Steve Kowalik Wed, 19 Dec 2007 22:19:52 +1100 + +xmms2 (0.2DrJekyll-4ubuntu3) hardy; urgency=low + + * debian/control: add lpia to xmms2-plugin-alsa supported architectures + + -- Luca Falavigna Sat, 17 Nov 2007 12:26:17 +0100 + +xmms2 (0.2DrJekyll-4ubuntu2) gutsy; urgency=low + + * Rebuild for boost 1.34.0 -> 1.34.1 transistion. + + -- Steve Kowalik Thu, 13 Sep 2007 11:06:53 +1000 + +xmms2 (0.2DrJekyll-4ubuntu1) gutsy; urgency=low + + * Rebuild for the libcurl4 -> libcurl3 back transition. + * Merge from debian unstable, remaining changes: + - debian/python-xmmsclient.install: Fix path for python 2.5 module + - debian/control: Remove faad2 dependency and don't build xmms-plugin-faad + - debian/control: Update Maintainer field + * debian/control: + - Replace libcurl3-openssl-dev with libcurl4-openssl-dev in Build-Depends. + + -- Michael Bienia Mon, 02 Jul 2007 23:52:40 +0200 + xmms2 (0.2DrJekyll-4) unstable; urgency=low * Explicitally compile all of sid plugin with -fPIC (Closes: #429869). @@ -97,6 +160,14 @@ -- Thomas Jollans Thu, 21 Jun 2007 17:07:01 +0200 +xmms2 (0.2DrJekyll-3ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/python-xmmsclient.install: Fix path for python 2.5 module + - debian/control: Remove faad2 dependency and don't build xmms-plugin-faad + + -- Zak B. Elep Tue, 19 Jun 2007 17:34:40 +0800 + xmms2 (0.2DrJekyll-3) unstable; urgency=low * Don't dump core on fatal errors (Closes: #419998). @@ -118,6 +189,21 @@ -- Florian Ragwitz Sun, 17 Jun 2007 21:54:53 +0200 +xmms2 (0.2DrJekyll-1ubuntu2) gutsy; urgency=low + + * debian/control: + - Remove faad2 dependency, as it is currently in multiverse; + do not build faad2-needing packages. + + -- Zak B. Elep Thu, 14 Jun 2007 16:57:01 +0800 + +xmms2 (0.2DrJekyll-1ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/python-xmmsclient.install: Fix path for python 2.5 module + + -- Zak B. Elep Thu, 14 Jun 2007 13:56:46 +0800 + xmms2 (0.2DrJekyll-1) unstable; urgency=low * New upstream release. @@ -149,6 +235,48 @@ -- Florian Ragwitz Mon, 2 Apr 2007 15:31:28 +0200 +xmms2 (0.2DrHouse-3.1ubuntu3) feisty; urgency=low + + * debian/control: + - Added git-core to build-deps to fix FTBFS + - Added Ubuntu MOTU Maintainer field, moved old one to Original-Maintainer + + -- Stephan Hermann Tue, 6 Feb 2007 18:28:23 +0100 + +xmms2 (0.2DrHouse-3.1ubuntu2) feisty; urgency=low + + * Try to find out why the build fails on the buildds: + - show the config.log if scons fails + + -- Michael Bienia Mon, 5 Feb 2007 13:48:47 +0100 + +xmms2 (0.2DrHouse-3.1ubuntu1) feisty; urgency=low + + * debian/python-xmmsclient.install: Fix path for python 2.5 module + + -- Michael Bienia Wed, 31 Jan 2007 13:17:31 +0100 + +xmms2 (0.2DrHouse-3.1) unstable; urgency=high + + [ Andreas Henriksson ] + * NMU + * Revert to build xmms2 without faad plugin, since faad library is being + removed from Etch. (Reopens: #399339, Closes: #404304) + + [ Andreas Barth ] + * Uploading to unstable. + * Replace typo XB-Python... with XS-Python in debian/control + + -- Andreas Barth Sun, 7 Jan 2007 09:21:21 +0000 + +xmms2 (0.2DrHouse-3) unstable; urgency=low + + * Use dh_makeshlibs -V to generate more strict shlib files. + * Fix a typo in debian/control. + * Remove some unused stuff fron debian/control. + + -- Florian Ragwitz Fri, 15 Dec 2006 00:46:59 +0100 + xmms2 (0.2DrHouse-2) unstable; urgency=low * Add xmms2-plugin-ao. diff -u xmms2-0.5DrLecter/debian/control xmms2-0.5DrLecter/debian/control --- xmms2-0.5DrLecter/debian/control +++ xmms2-0.5DrLecter/debian/control @@ -1,7 +1,8 @@ Source: xmms2 Section: sound Priority: optional -Maintainer: Florian Ragwitz +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Florian Ragwitz Uploaders: Jens Taprogge , Jonne Lehtinen , Thomas Jollans , Anders Waldenborg Standards-Version: 3.8.0 Build-Depends: debhelper (>= 5.0.37.2), @@ -11,6 +12,7 @@ libperl-dev, python, python-all-dev (>= 2.3.5-11), + liba52-0.7.4-dev, libglib2.0-dev, libcurl4-openssl-dev, libsmbclient-dev, @@ -494,7 +496,7 @@ This package enables OSS output for xmms2. Package: xmms2-plugin-alsa -Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m32r m68k mips mipsel powerpc s390 sparc +Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m32r m68k mips mipsel powerpc s390 sparc lpia Depends: ${misc:Depends}, ${shlibs:Depends}, xmms2-core (= ${binary:Version}) diff -u xmms2-0.5DrLecter/debian/rules xmms2-0.5DrLecter/debian/rules --- xmms2-0.5DrLecter/debian/rules +++ xmms2-0.5DrLecter/debian/rules @@ -9,7 +9,34 @@ export NOCOLOR=1 -build: build-stamp $(PYVERS:%=build-python%) +# Apply patches to the package +patch: patch-stamp +patch-stamp: + dh_testdir + @patches=debian/patches/*.patch; for patch in $$patches; do \ + test -f $$patch || continue; \ + echo "Applying $$patch"; \ + patch -stuN -p1 < $$patch || exit 1; \ + done + touch $@ + +# Remove patches from the package +unpatch: + dh_testdir + @if test -f patch-stamp; then \ + patches=debian/patches/*.patch; \ + for patch in $$patches; do \ + reversepatches="$$patch $$reversepatches"; \ + done; \ + for patch in $$reversepatches; do \ + test -f $$patch || continue; \ + echo "Reversing $$patch"; \ + patch -suRf -p1 < $$patch || exit 1; \ + done; \ + rm -f patch-stamp; \ + fi + +build: patch build-stamp $(PYVERS:%=build-python%) build-stamp: dh_testdir ./waf configure $(WAFFLAGS) @@ -31,7 +58,7 @@ ./waf install --destdir=$(CURDIR)/debian/tmp mv _build_ _build_python$*_ -clean: clean1 +clean: clean1 unpatch clean1: dh_testdir dh_testroot only in patch2: unchanged: --- xmms2-0.5DrLecter.orig/debian/patches/01_gcc4.3.patch +++ xmms2-0.5DrLecter/debian/patches/01_gcc4.3.patch @@ -0,0 +1,11 @@ +diff -Nur xmms2-0.4DrKosmos/src/include/xmmsclient/xmmsclient++/helpers.h xmms2-0.4DrKosmos.new/src/include/xmmsclient/xmmsclient++/helpers.h +--- xmms2-0.4DrKosmos/src/include/xmmsclient/xmmsclient++/helpers.h 2007-11-15 19:25:07.000000000 +0100 ++++ xmms2-0.4DrKosmos.new/src/include/xmmsclient/xmmsclient++/helpers.h 2008-06-05 00:32:11.000000000 +0200 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + namespace Xmms + {