branches/KDE/3.4/kdesdk/debian

[Ben Burton <bab@debian.org>]

SVN commit 414018 by benb:

New 3.4 upload to experimental.  Merge changes from 3.3.x, disable CVS rules, conflict with kdevelop3-plugins while both provide the svn ioslave.

 M  +13 -0     branches/KDE/3.4/kdesdk/debian/changelog  
 M  +1 -1      branches/KDE/3.4/kdesdk/debian/control  
 M  +3 -3      branches/KDE/3.4/kdesdk/debian/rules  


--- branches/KDE/3.4/kdesdk/debian/changelog #414017:414018
@@ -1,3 +1,16 @@
+kdesdk (4:3.4.0-0pre2) unstable; urgency=low
+
+  * Merge in recent packaging changes from the 3.3 branch.
+  * Introduce a temporary conflicts against kdevelop3-plugins, which provides
+    a copy of the subversion I/O slave taken from kdesdk-misc.  This will be
+    removed once kdevelop has been rebuilt against KDE 3.4 (without the
+    subversion I/O slave), and a versioned replaces will be put in place
+    instead.
+  * Now that KDE has moved to subversion, disable cvs-clean in debian/rules
+    for the time being.
+
+ -- Ben Burton <bab@debian.org>  Sat, 14 May 2005 19:20:58 +1000
+
 kdesdk (4:3.4.0-0pre1) unstable; urgency=low
 
   * New major upstream release.
--- branches/KDE/3.4/kdesdk/debian/control #414017:414018
@@ -163,7 +163,7 @@
 Depends: ${shlibs:Depends}
 Recommends: libqt3-mt-dev | libqt3-dev
 Suggests: gimp | xpaint
-Conflicts: kdepalettes (<= 4:3.1.0-1), scheck (<< 4:3.2.0-0)
+Conflicts: kdepalettes (<= 4:3.1.0-1), scheck (<< 4:3.2.0-0), kdevelop3-plugins
 Replaces: kdepalettes (<= 4:3.1.0-1), scheck (<< 4:3.2.0-0)
 Description: various goodies from the KDE Software Development Kit
  This package contains miscellaneous goodies provided with the official
--- branches/KDE/3.4/kdesdk/debian/rules #414017:414018
@@ -119,9 +119,9 @@
 		$(MAKE) distclean; \
 	fi
 
-	if test -d CVS; then \
-		$(MAKE) -f admin/Makefile.common cvs-clean ;\
-	fi
+	# if test -d CVS; then \
+	# 	$(MAKE) -f admin/Makefile.common cvs-clean ;\
+	# fi
 
 	dh_clean