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

[Adeodato Sim??]

Author: dato-guest
Date: 2004-11-28 15:31:42 -0700 (Sun, 28 Nov 2004)
New Revision: 277

Added:
   people/dato/packages/trunk/amarok/debian/patches/am_maintainer_mode.patch
   people/dato/packages/trunk/amarok/debian/patches/automake-1.6.patch
Modified:
   people/dato/packages/trunk/amarok/debian/TODO
   people/dato/packages/trunk/amarok/debian/changelog
Log:
  * Use AM_MAINTAINER_MODE, so that --disable-maintainer-mode really works
    (patch: am_maintainer_mode.patch). To make the .diff.gz stuff smaller,
    force automake-1.6 (used by upstream) in admin/detect-autoconf.sh (patch:
    automake-1.6.patch).


Modified: people/dato/packages/trunk/amarok/debian/TODO
===================================================================
--- people/dato/packages/trunk/amarok/debian/TODO	2004-11-28 22:28:18 UTC (rev 276)
+++ people/dato/packages/trunk/amarok/debian/TODO	2004-11-28 22:31:42 UTC (rev 277)
@@ -1,2 +1,2 @@
-- link dynamically against sqlite once 3.0 enters Debian (#272271).
-- do something wrt --disable-maintainer-mode.
+- link dynamically against sqlite once 3.0 enters Debian (#272271). is
+  currently in the NEW queue.

Modified: people/dato/packages/trunk/amarok/debian/changelog
===================================================================
--- people/dato/packages/trunk/amarok/debian/changelog	2004-11-28 22:28:18 UTC (rev 276)
+++ people/dato/packages/trunk/amarok/debian/changelog	2004-11-28 22:31:42 UTC (rev 277)
@@ -1,5 +1,7 @@
-amarok (1.1.1-2~pre1) unstable; urgency=low
+amarok (1.2-beta1-1) experimental; urgency=low
 
+  * Packaged first 1.2 beta from upstream.
+
   * debian/amarok.1:
     - correct "hyphen vs. minus sign" usage.
 
@@ -17,8 +19,13 @@
   * Added note to README.Debian about the 'Socket-path is not a link or a
     directory' error.
 
- -- Adeodato Simó <asp16@alu.ua.es>  Tue, 09 Nov 2004 03:43:22 +0100
+  * Use AM_MAINTAINER_MODE, so that --disable-maintainer-mode really works
+    (patch: am_maintainer_mode.patch). To make the .diff.gz stuff smaller,
+    force automake-1.6 (used by upstream) in admin/detect-autoconf.sh (patch:
+    automake-1.6.patch).
 
+ -- Adeodato Simó <asp16@alu.ua.es>  Sun, 28 Nov 2004 23:25:33 +0100
+
 amarok (1.1.1-1) unstable; urgency=low
 
   * New upstream release packaged. Most notably, fixes several GStreamer

Added: people/dato/packages/trunk/amarok/debian/patches/am_maintainer_mode.patch
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/am_maintainer_mode.patch	2004-11-28 22:28:18 UTC (rev 276)
+++ people/dato/packages/trunk/amarok/debian/patches/am_maintainer_mode.patch	2004-11-28 22:31:42 UTC (rev 277)
@@ -0,0 +1,11 @@
+--- a/admin/configure.in.min
++++ b/admin/configure.in.min
+@@ -38,6 +38,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+ 
++AM_MAINTAINER_MODE
++
+ KDE_SET_PREFIX
+ 
+ dnl generate the config header

Added: people/dato/packages/trunk/amarok/debian/patches/automake-1.6.patch
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/automake-1.6.patch	2004-11-28 22:28:18 UTC (rev 276)
+++ people/dato/packages/trunk/amarok/debian/patches/automake-1.6.patch	2004-11-28 22:31:42 UTC (rev 277)
@@ -0,0 +1,11 @@
+--- a/admin/detect-autoconf.sh
++++ b/admin/detect-autoconf.sh
+@@ -11,7 +11,7 @@
+ # needed to compile KDE. Do not forget to include the name/version #
+ # separator if one is present, e.g. -1.2 where - is the separator.
+ KDE_AUTOCONF_VERS="-2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x"
+-KDE_AUTOMAKE_VERS="-1.7 17 -1.6"
++KDE_AUTOMAKE_VERS="-1.6 -1.7 17 -1.6"
+ 
+ # We don't use variable here for remembering the type ... strings. Local 
+ # variables are not that portable, but we fear namespace issues with our