[Pkg-cli-apps-commits] [SCM] smuxi branch, master, updated. debian/0.8-4-3-ga76aa87

[Mirco Bauer]

The following commit has been merged in the master branch:
commit a76aa87179217ee53903678695e9d0e929f5110a
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Jun 25 23:10:42 2011 +0200

    Fixed Ubuntu distro detection by making use of vendor-specific patches with quilt

diff --git a/debian/patches/series b/debian/patches/ubuntu.series
similarity index 53%
copy from debian/patches/series
copy to debian/patches/ubuntu.series
index 1d2af7d..31c82bb 100644
--- a/debian/patches/series
+++ b/debian/patches/ubuntu.series
@@ -1,2 +1,2 @@
 fix_Notification.Close_crash.patch
-debian_default_settings.patch
+ubuntu_default_settings.patch
diff --git a/debian/rules b/debian/rules
index 72bb66e..b7f48e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,19 +4,7 @@ export DH_VERBOSE=1
 include /usr/share/cli-common/cli.make
 include /usr/share/quilt/quilt.make
 
-DISTRO = "$(shell lsb_release -si)"
-PATCH_LIST_FILE = $(CURDIR)/debian/patches/series
-
-$(PATCH_LIST_FILE):
-	egrep -v '(ubuntu|debian)_default_settings' $(PATCH_LIST_FILE) > $(PATCH_LIST_FILE).new || true
-	if [ "$(DISTRO)" = "Ubuntu" ]; then \
-		echo ubuntu_default_settings.patch >> $(PATCH_LIST_FILE).new; \
-	else \
-		echo debian_default_settings.patch >> $(PATCH_LIST_FILE).new; \
-	fi
-	mv $(PATCH_LIST_FILE).new $(PATCH_LIST_FILE)
-
-override_dh_auto_configure: $(PATCH_LIST_FILE) patch
+override_dh_auto_configure:
 	dh_auto_configure -- --enable-engine-irc --enable-frontend-gnome --with-notify --with-indicate GMCS=/usr/bin/mono-csc MCS=/usr/bin/mono-csc
 
 # disable "make check"
@@ -27,5 +15,3 @@ override_dh_clistrip:
 
 .DEFAULT:
 	dh --with quilt $@
-
-.PHONY: $(PATCH_LIST_FILE)

-- 
smuxi