[Pkg-kde-commits] rev 1455 - in people/dato/packages/trunk/amarok/debian: . patches

[Adeodato Simó]

Author: adeodato
Date: 2005-08-15 21:53:24 +0000 (Mon, 15 Aug 2005)
New Revision: 1455

Added:
   people/dato/packages/trunk/amarok/debian/patches/disable-final.diff
   people/dato/packages/trunk/amarok/debian/patches/taglib-1.3.1-suffices.diff
Removed:
   people/dato/packages/trunk/amarok/debian/patches/automake-1.6.patch
   people/dato/packages/trunk/amarok/debian/patches/fix_103510.diff
   people/dato/packages/trunk/amarok/debian/patches/force-no-akode.diff
Modified:
   people/dato/packages/trunk/amarok/debian/changelog
   people/dato/packages/trunk/amarok/debian/control
Log:
amaroK 1.3 packaging.


Modified: people/dato/packages/trunk/amarok/debian/changelog
===================================================================
--- people/dato/packages/trunk/amarok/debian/changelog	2005-08-15 19:58:28 UTC (rev 1454)
+++ people/dato/packages/trunk/amarok/debian/changelog	2005-08-15 21:53:24 UTC (rev 1455)
@@ -1,3 +1,32 @@
+amarok (1.3.0-1) UNRELEASED; urgency=low
+
+  * New upstream release packaged (closes: #323249). Bugs reported in the
+    Debian BTS fixed with in this version:
+
+    + does not display advertisements in lyrics. (Closes: #321499)
+    + pre-amp in the equalizer works with XINE engine too. (Closes: #283750)
+    + includes PartyMode. (Closes: #293293)
+    + includes equalizer presets. (Closes: #283761)
+    + builds fine with GCC 4.0. (Closes: #314779, #323093)
+
+  * Updated Build-Dependencies:
+
+    + automake1.6 to automake1.9.
+    + libmysqlclient12-dev to libmysqlclient14-dev.
+
+  * Adjustments to the build-system:
+
+    + do not require TagLib 1.4.0 since it's not in Debian yet (#323280).
+    + don't use KDE_FINAL in amarok/src since both MySQL and KDE have had the
+      brilliant idea to define a struct/class named "NET".
+
+  * This version links against libtunepimp2c2, so libtunepimp2 0.3.0-4
+    breakage does not affect us anymore. (Closes: #318000)
+
+  * Update Standards-Version to 3.6.2 (no changes required).
+
+ -- Adeodato Simó <asp16 at alu.ua.es>  Mon, 15 Aug 2005 23:48:44 +0200
+
 amarok (1.2.4-1) unstable; urgency=low
 
   * The "following Debian Policy is cool, except when it's not" release.

Modified: people/dato/packages/trunk/amarok/debian/control
===================================================================
--- people/dato/packages/trunk/amarok/debian/control	2005-08-15 19:58:28 UTC (rev 1454)
+++ people/dato/packages/trunk/amarok/debian/control	2005-08-15 21:53:24 UTC (rev 1455)
@@ -2,8 +2,8 @@
 Section: kde
 Priority: optional
 Maintainer: Adeodato Simó <asp16 at alu.ua.es>
-Build-Depends: cdbs (>= 0.4.21), debhelper (>> 4.1.0), bzip2, automake1.6, libtool, kdelibs4-dev (>= 4:3.2), kdemultimedia-dev (>= 4:3.2), kdebase-dev (>= 4:3.2), libgstreamer0.8-dev, libgstreamer-plugins0.8-dev, libmysqlclient12-dev, libtag1-dev (>> 1.3.1), libxine-dev (>= 1-rc4), libsqlite3-dev, xmms-dev, libtunepimp2-dev (>= 0.3.0-2.1)
-Standards-Version: 3.6.1
+Build-Depends: cdbs (>= 0.4.21), debhelper (>> 4.1.0), bzip2, automake1.9, libtool, kdelibs4-dev (>= 4:3.2), kdemultimedia-dev (>= 4:3.2), kdebase-dev (>= 4:3.2), libgstreamer0.8-dev, libgstreamer-plugins0.8-dev, libmysqlclient14-dev, libtag1-dev (>> 1.3.1), libxine-dev (>= 1-rc4), libsqlite3-dev, xmms-dev, libtunepimp2-dev (>= 0.3.0-2.1)
+Standards-Version: 3.6.2
 
 Package: amarok
 Architecture: any

Deleted: people/dato/packages/trunk/amarok/debian/patches/automake-1.6.patch

Added: people/dato/packages/trunk/amarok/debian/patches/disable-final.diff
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/disable-final.diff	2005-08-15 19:58:28 UTC (rev 1454)
+++ people/dato/packages/trunk/amarok/debian/patches/disable-final.diff	2005-08-15 21:53:24 UTC (rev 1455)
@@ -0,0 +1,10 @@
+--- amarok-1.3/amarok/src/Makefile.am~	2005-08-15 23:28:19.000000000 +0200
++++ amarok-1.3/amarok/src/Makefile.am	2005-08-15 23:29:27.000000000 +0200
+@@ -8,6 +8,7 @@
+     KONQSIDEBAR_SUBDIR = konquisidebar
+ endif
+ 
++KDE_OPTIONS = nofinal
+ 
+ bin_PROGRAMS = amarokapp
+ 

Deleted: people/dato/packages/trunk/amarok/debian/patches/fix_103510.diff

Deleted: people/dato/packages/trunk/amarok/debian/patches/force-no-akode.diff

Added: people/dato/packages/trunk/amarok/debian/patches/taglib-1.3.1-suffices.diff
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/taglib-1.3.1-suffices.diff	2005-08-15 19:58:28 UTC (rev 1454)
+++ people/dato/packages/trunk/amarok/debian/patches/taglib-1.3.1-suffices.diff	2005-08-15 21:53:24 UTC (rev 1455)
@@ -0,0 +1,11 @@
+--- amarok-1.3/amarok/configure.in.in~	2005-08-15 22:52:47.000000000 +0200
++++ amarok-1.3/amarok/configure.in.in	2005-08-15 22:54:11.000000000 +0200
+@@ -37,7 +37,7 @@
+ # BEGIN TAGLIB CHECK
+ ###############################################################################
+ 
+-TAGLIB_REQ_VERSION="1.4.0";
++TAGLIB_REQ_VERSION="1.3.1";
+ AC_DEFUN([VERSION_TO_NUMBER], [`$1 | awk 'BEGIN { FS = "."; } { printf "%d",  ([$]1* 1000 + [$]2) * 1000 + [$]3;}'`])
+ 
+ AC_PATH_PROG(TAGLIB_CONFIG, taglib-config, no)