KDE_3_3_BRANCH: kdesdk/debian

[Ben Burton <bab@debian.org>]

CVS commit by benb: 

Updates for 3.3.1.


  M +10 -0     changelog   1.60.2.3
  M +1 -0      control   1.61.2.7
  M +7 -3      rules   1.57.2.5


--- kdesdk/debian/changelog  #1.60.2.2:1.60.2.3
@@ -1,2 +1,12 @@
+kdesdk (4:3.3.1-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * Build-conflicts with autoconf2.13, which does not play well with
+    Makefile.common.
+  * Force a rerun of admin/Makefile.common when building (not just after
+    a clean), since the debian patches affect Makefile.ams.
+
+ -- Ben Burton <bab@debian.org>  Thu, 28 Oct 2004 19:03:02 +1000
+
 kdesdk (4:3.3.0-1) unstable; urgency=low
 

--- kdesdk/debian/control  #1.61.2.6:1.61.2.7
@@ -4,4 +4,5 @@
 Maintainer: Ben Burton <bab@debian.org>
 Build-Depends: automake1.7, binutils-dev, bison, debhelper (>> 4.0.0), flex, kdelibs4-dev (>= 4:3.3.0), libdb4.2-dev, libkcal2-dev (>= 4:3.3.0)
+Build-Conflicts: autoconf2.13
 Standards-Version: 3.6.1
 

--- kdesdk/debian/rules  #1.57.2.4:1.57.2.5
@@ -61,7 +61,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 Makefile.common, since the debian patches touch
+        # the Makefile.ams.
+        $(MAKE) -f admin/Makefile.common
 
         # make build directory