diff -u terminatorx-3.82/debian/control terminatorx-3.82/debian/control --- terminatorx-3.82/debian/control +++ terminatorx-3.82/debian/control @@ -1,7 +1,8 @@ Source: terminatorx Section: sound Priority: optional -Maintainer: Mike Furr +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Mike Furr Build-Depends: debhelper (>= 4.1.16), mpg321, vorbis-tools, sox, ladspa-sdk, libaudiofile-dev, libvorbis-dev, libglib2.0-dev, libgtk2.0-dev, libmad0-dev, libxml2-dev, libatk1.0-dev, libpango1.0-dev, zlib1g-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], scrollkeeper, liblrdf0-dev, libjack-dev, libcap2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], dpatch, libxxf86dga-dev, libxext-dev, libxi-dev, libx11-dev, libsm-dev, libice-dev, libxt-dev, autotools-dev Standards-Version: 3.6.1.0 diff -u terminatorx-3.82/debian/changelog terminatorx-3.82/debian/changelog --- terminatorx-3.82/debian/changelog +++ terminatorx-3.82/debian/changelog @@ -1,3 +1,12 @@ +terminatorx (3.82-7.4ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. (LP: #802147) Remaining changes: + - debian/patches/17_cleanup_desktop_file.dpatch: Cleanup upstream desktop + file according to Freedesktop.org's spec. + - debian/patches/21_fix_ftbfs_binutils_gold.dpatch: Dropped, apllied in Debian. + + -- Mahyuddin Susanto Wed, 29 Jun 2011 15:27:52 +0700 + terminatorx (3.82-7.4) unstable; urgency=low * Non-maintainer upload. @@ -6,6 +15,28 @@ -- Alessio Treglia Thu, 05 May 2011 19:22:08 +0200 +terminatorx (3.82-7.3ubuntu3) natty; urgency=low + + * debian/patches/21_fix_ftbfs_binutils_gold.dpatch: + fix FTBFS binutils-gold with ld --no-add-needed by adding dl + library linker in src/Makefile (LP: #701465) + + -- Mahyuddin Susanto Sun, 16 Jan 2011 02:32:04 +0700 + +terminatorx (3.82-7.3ubuntu2) maverick; urgency=low + + * No-change rebuild for JACK2 transition. + + -- Alessio Treglia Wed, 21 Jul 2010 13:07:56 +0200 + +terminatorx (3.82-7.3ubuntu1) lucid; urgency=low + + * Merge from debian testing, remaining changes: + - debian/patches/17_cleanup_desktop_file.dpatch: Cleanup upstream desktop + file according to Freedesktop.org's spec. + + -- Alessio Treglia Thu, 07 Jan 2010 08:53:46 +0100 + terminatorx (3.82-7.3) unstable; urgency=low * Non-maintainer upload. @@ -21,6 +52,15 @@ -- Cyril Brulebois Mon, 21 Dec 2009 14:29:36 +0100 +terminatorx (3.82-7.2ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes: + - Add patch 17_cleanup_desktop_file to cleanup upstream .desktop; + remove .png extension from Icon filename according with Freedesktop.org + spec. + + -- Alessio Treglia Tue, 17 Feb 2009 21:00:19 +0100 + terminatorx (3.82-7.2) unstable; urgency=low * Non-maintainer upload. @@ -32,6 +72,16 @@ -- Torsten Werner Tue, 17 Feb 2009 06:47:47 +0100 +terminatorx (3.82-7.1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - Clean up upstream .desktop. + - Fix spelling mistake in exit dialog (loose -> lose). + - Replace Debian maintainer field. + * Remove full-stop from the end of the .desktop comment. + + -- William Grant Thu, 19 Jun 2008 13:08:09 +1000 + terminatorx (3.82-7.1) unstable; urgency=low * Non-maintainer upload to fix pending l10n issues and other @@ -53,6 +103,21 @@ -- Christian Perrier Sun, 30 Mar 2008 14:29:31 +0200 +terminatorx (3.82-7ubuntu2) feisty; urgency=low + + * Remove Ubuntu .desktop, as upstream has one. (LP: #61950) + - Clean up upstream .desktop. + * Fix spelling mistake (loose -> lose). (LP: #61952) + * Replace Debian maintainer field. + + -- William Grant Sun, 1 Apr 2007 19:05:58 +1000 + +terminatorx (3.82-7ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + + -- Lucas Nussbaum Mon, 17 Jul 2006 17:17:48 +0200 + terminatorx (3.82-7) unstable; urgency=low * !@!$@# Note to future self, don't use aptitude to install @@ -75,6 +140,18 @@ -- Mike Furr Tue, 17 Jan 2006 23:32:25 -0500 +terminatorx (3.82-4ubuntu2) dapper; urgency=low + + * Added a .desktop file from Emmet Hikory (Closes: #28882) + + -- Dana Olson Fri, 24 Feb 2006 10:20:38 -0500 + +terminatorx (3.82-4ubuntu1) dapper; urgency=low + + * Resynchronise with Debian (Closes: #4652). + + -- Daniel T Chen Sat, 19 Nov 2005 19:28:36 -0800 + terminatorx (3.82-4) unstable; urgency=low * Rebuild for gxx transition @@ -83,6 +160,24 @@ -- Mike Furr Wed, 21 Sep 2005 00:02:44 -0400 +terminatorx (3.82-3ubuntu3) breezy; urgency=low + + * Rebuild with the new cairo version + + -- Sebastien Bacher Thu, 18 Aug 2005 17:23:12 +0000 + +terminatorx (3.82-3ubuntu2) breezy; urgency=low + + * Update build-depends from Debian dropped patch. Add libxxf68dga-dev + + -- Barry deFreese Sun, 24 Jul 2005 21:57:23 +0000 + +terminatorx (3.82-3ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + + -- Scott James Remnant Sat, 02 Jul 2005 12:50:49 +0100 + terminatorx (3.82-3) unstable; urgency=low * Rebuild against libjack0.100.0 @@ -97,6 +192,18 @@ -- Mike Furr Wed, 2 Feb 2005 14:08:14 -0500 +terminatorx (3.82-1ubuntu2) breezy; urgency=low + + * Rebuild for new C++ ABI + + -- Matthias Klose Tue, 28 Jun 2005 11:06:46 +0000 + +terminatorx (3.82-1ubuntu1) hoary; urgency=low + + * added libxxf86dga-dev to build-depends. + + -- Daniel Holbach Thu, 7 Apr 2005 00:22:14 +0200 + terminatorx (3.82-1) unstable; urgency=low * New upstream release. diff -u terminatorx-3.82/debian/patches/00list terminatorx-3.82/debian/patches/00list --- terminatorx-3.82/debian/patches/00list +++ terminatorx-3.82/debian/patches/00list @@ -2,4 +2,5 @@ 15_icon_xpm 16_loose_spelling_fix +17_cleanup_desktop_file 20_fix_ftbfs_on_kfreebsd.dpatch 21_fix_ftbfs_binutils_gold only in patch2: unchanged: --- terminatorx-3.82.orig/debian/patches/17_cleanup_desktop_file.dpatch +++ terminatorx-3.82/debian/patches/17_cleanup_desktop_file.dpatch @@ -0,0 +1,26 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 17_cleanup_desktop_file.dpatch by William Grant +## Remove .png extension from icon filename -- Alessio Treglia +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Clean up .desktop file. + +@DPATCH@ +diff -urNad terminatorx-3.82~/gnome-support/terminatorX.desktop terminatorx-3.82/gnome-support/terminatorX.desktop +--- terminatorx-3.82~/gnome-support/terminatorX.desktop 2004-03-26 20:13:24.000000000 +0100 ++++ terminatorx-3.82/gnome-support/terminatorX.desktop 2009-02-17 20:56:47.000000000 +0100 +@@ -1,10 +1,10 @@ + [Desktop Entry] + Exec=terminatorX + Name=terminatorX +-GenericName=Virtual turntable +-Comment=Versatile DJ scratching and mixing application. ++GenericName=Virtual Turntable ++Comment=Scratch and mix audio + Terminal=false + Type=Application +-Icon=terminatorX-app.png +-Categories=Application;AudioVideo; ++Icon=terminatorX-app ++Categories=AudioVideo; + StartupNotify=true