rev 4545 - kde-extras/ksplash-engine-moodin/trunk/debian

[Fathi Boudra]

Author: fboudra-guest
Date: 2006-09-21 15:50:15 +0000 (Thu, 21 Sep 2006)
New Revision: 4545

Modified:
   kde-extras/ksplash-engine-moodin/trunk/debian/changelog
   kde-extras/ksplash-engine-moodin/trunk/debian/rules
Log:
merge patches from ubuntu

Modified: kde-extras/ksplash-engine-moodin/trunk/debian/changelog
===================================================================
--- kde-extras/ksplash-engine-moodin/trunk/debian/changelog	2006-09-21 13:03:50 UTC (rev 4544)
+++ kde-extras/ksplash-engine-moodin/trunk/debian/changelog	2006-09-21 15:50:15 UTC (rev 4545)
@@ -1,3 +1,11 @@
+ksplash-engine-moodin (0.4.2-2) unstable; urgency=low
+
+  * merged patches from ubuntu:
+    * add kdepot
+    * icon fix
+
+ -- Fathi Boudra <fboudra at free.fr>  Thu, 21 Sep 2006 17:44:25 +0200
+
 ksplash-engine-moodin (0.4.2-1) unstable; urgency=low
 
   * Initial release Closes: #329690

Modified: kde-extras/ksplash-engine-moodin/trunk/debian/rules
===================================================================
--- kde-extras/ksplash-engine-moodin/trunk/debian/rules	2006-09-21 13:03:50 UTC (rev 4544)
+++ kde-extras/ksplash-engine-moodin/trunk/debian/rules	2006-09-21 15:50:15 UTC (rev 4545)
@@ -26,7 +26,20 @@
 debian/debiandirs: admin/debianrules
 	perl -w admin/debianrules echodirs > debian/debiandirs
 
-config.status: configure
+patch-stamp:
+	# Apply Debian specific patches
+	if test ! -f patch-stamp; then \
+		for patch in $(CURDIR)/debian/patches/*.diff ;\
+		do \
+			echo APPLYING PATCH\: $${patch##*/};\
+			patch -p1 < $$patch ;\
+		done ;\
+		touch patch-stamp ;\
+	fi
+
+patch: patch-stamp
+
+config.status: configure patch
 	dh_testdir
 	
 	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde)
@@ -54,6 +67,16 @@
 	cp -f /usr/share/misc/config.guess config.guess
 endif
 
+	# Remove Debian specific patches
+	if test -f patch-stamp; then \
+		for patch in $(CURDIR)/debian/patches/*.diff ;\
+		do \
+			echo REMOVING PATCH\: $${patch##*/};\
+			patch -p1 -R < $$patch ;\
+		done ;\
+		rm -f patch-stamp ;\
+	fi
+
 	dh_clean  
 
 install: build