[Pkg-kde-commits] rev 303 - in branches/kde-3.3.2/kdelibs/debian: . patches

[Adeodato Sim??]

Author: dato-guest
Date: 2004-12-13 19:03:56 -0700 (Mon, 13 Dec 2004)
New Revision: 303

Added:
   branches/kde-3.3.2/kdelibs/debian/patches/06_automake-1.9.diff
Removed:
   branches/kde-3.3.2/kdelibs/debian/patches/01_kdelibs_branch.diff.uu
   branches/kde-3.3.2/kdelibs/debian/patches/post-3.3.1-kdelibs-khtml.diff
Modified:
   branches/kde-3.3.2/kdelibs/debian/changelog
Log:
  * Removed patches:
    - 01_kdelibs_branch.diff.uu
    - post-3.3.1-kdelibs-khtml.diff

  * New patches:
    - 06_automake-1.9.diff



Modified: branches/kde-3.3.2/kdelibs/debian/changelog
===================================================================
--- branches/kde-3.3.2/kdelibs/debian/changelog	2004-12-13 23:32:00 UTC (rev 302)
+++ branches/kde-3.3.2/kdelibs/debian/changelog	2004-12-14 02:03:56 UTC (rev 303)
@@ -1,3 +1,17 @@
+kdelibs (4:3.3.2-1~pre1) unstable; urgency=low
+
+  * New upstream release.
+
+  * Removed patches:
+    - 01_kdelibs_branch.diff.uu
+    - post-3.3.1-kdelibs-khtml.diff (we keep post-3.3.1-kdelibs-kio.diff since
+      the fix is KDE_3_3_BRANCH but not in KDE_3_3_2_RELEASE).
+
+  * New patches:
+    - 06_automake-1.9.diff
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Tue, 14 Dec 2004 03:00:19 +0100
+
 kdelibs (4:3.3.1-3) unstable; urgency=high
 
   * Fix kdeaccessability Conflict. Closes: #285391

Deleted: branches/kde-3.3.2/kdelibs/debian/patches/01_kdelibs_branch.diff.uu

Added: branches/kde-3.3.2/kdelibs/debian/patches/06_automake-1.9.diff
===================================================================
--- branches/kde-3.3.2/kdelibs/debian/patches/06_automake-1.9.diff	2004-12-13 23:32:00 UTC (rev 302)
+++ branches/kde-3.3.2/kdelibs/debian/patches/06_automake-1.9.diff	2004-12-14 02:03:56 UTC (rev 303)
@@ -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.9 -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

Deleted: branches/kde-3.3.2/kdelibs/debian/patches/post-3.3.1-kdelibs-khtml.diff