From kde-commits  Sun Oct 31 21:49:48 2004
From: Ben Burton <bab () debian ! org>
Date: Sun, 31 Oct 2004 21:49:48 +0000
To: kde-commits
Subject: KDE_3_3_BRANCH: kdeartwork/debian
Message-Id: <20041031214948.6A08916C66 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=109925939714907

CVS commit by benb: 

Updates for 3.3.1.


  M +15 -0     changelog   1.31.2.4
  M +1 -1      control   1.37.2.3
  M +9 -0      copyright   1.10.2.3
  M +7 -3      rules   1.18.4.2


--- kdeartwork/debian/changelog  #1.31.2.3:1.31.2.4
@@ -1,2 +1,17 @@
+kdeartwork (4:3.3.1-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * Added kdeclassic/locolor icon license to debian/copyright, which has been
+    clarified upstream.
+  * 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.
+  * Fixed typo in kaleidescope configuration command (closes: #277119).
+  * Distinguished KSlideshow and GL Slideshow translations in German
+    (closes: #267974).
+
+ -- Ben Burton <bab@debian.org>  Sun, 31 Oct 2004 15:17:56 +1100
+
 kdeartwork (4:3.3.0-1) unstable; urgency=low
 

--- kdeartwork/debian/control  #1.37.2.2:1.37.2.3
@@ -4,5 +4,5 @@
 Maintainer: Ben Burton <bab@debian.org>
 Build-Depends: automake1.7, debhelper (>> 4.0.0), kdebase-dev (>> 4:3.3.0), kdelibs4-dev (>= 4:3.3.0), kwin, xlibmesa-gl-dev, xlibmesa-glu-dev, xscreensaver, xscreensaver-gl
-Build-Conflicts: nvidia-glx
+Build-Conflicts: autoconf2.13, nvidia-glx
 Standards-Version: 3.6.1
 

--- kdeartwork/debian/copyright  #1.10.2.2:1.10.2.3
@@ -84,4 +84,5 @@
 
     CDE window decoration theme: BSD License
+    KDE-Classic and KDE-LoColor icon themes: (see below)
     KWorldClock Themes: (see below)
     OpenLook window decoration theme: (see below)
@@ -101,4 +102,12 @@
   --------------------
 
+  KDE-Classic and KDE-LoColor icon themes:
+
+  The images inside this directory are COMPLETELY FREE for commercial
+  and non-commercial use.
+  Clarification: this means you can copy, modify and redistribute them.
+
+  --------------------
+
   KWorldClock themes:
 

--- kdeartwork/debian/rules  #1.18.4.1:1.18.4.2
@@ -60,7 +60,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