KDE_3_3_BRANCH: kdeaddons/debian

[Ben Burton <bab@debian.org>]

CVS commit by benb: 

A round of fixes for 3.3.1.


  M +13 -0     changelog   1.30.2.6
  M +1 -0      control   1.35.2.3
  M +7 -3      rules   1.20.2.1


--- kdeaddons/debian/changelog  #1.30.2.5:1.30.2.6
@@ -1,2 +1,15 @@
+kdeaddons (4:3.3.1-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * Patched .lnk kfile plugin and /usr/bin/lnkforward so that they can
+    distinguish between drive and path information.  Previously, lnkforward
+    would lose path information altogether (and thus fail to work).
+  * Force a rerun of admin/Makefile.common when building (not just after a
+    clean), since the debian patches affect Makefile.ams.
+  * Build-conflict with autoconf2.13, since admin/Makefile.common does not
+    operate correctly in its presence.
+
+ -- Ben Burton <bab@debian.org>  Sat, 23 Oct 2004 15:17:56 +1000
+
 kdeaddons (4:3.3.0-1) unstable; urgency=low
 

--- kdeaddons/debian/control  #1.35.2.2:1.35.2.3
@@ -4,4 +4,5 @@
 Maintainer: Ben Burton <bab@debian.org>
 Build-Depends: atlantik-dev (>> 4:3.3.0), automake1.7, debhelper (>> 4.0.0), gawk, gettext, kdebase-dev (>> 4:3.3.0), kdelibs4-dev (>> 4:3.3.0), kdemultimedia-dev (>> 4:3.3.0), libdb4.2++-dev, libkdegames-dev (>> 4:3.3.0), libkonq4-dev (>> 4:3.3.0), kdepim-dev (>> 4:3.3.0), libsdl1.2-dev (>= 1.2.2-3.3), libxine-dev, xlibs-pic, xmms-dev
+Build-Conflicts: autoconf2.13
 Standards-Version: 3.6.1
 

--- kdeaddons/debian/rules  #1.20:1.20.2.1
@@ -56,7 +56,11 @@
 
         # KDE CVS does not have aclocal.m4 or configure
-        if test ! -f configure; then \
-                $(MAKE) -f admin/Makefile.common ;\
-        fi
+        # if test ! -f configure; then \
+        #       $(MAKE) -f admin/Makefile.common ;\
+        # fi
+
+        # Force a rerun of automake/etc since this is required by the
+        # debian patches.
+        $(MAKE) -f admin/Makefile.common ;\
 
         # ensure configure is executable