[Pkg-cli-apps-commits] [SCM] smuxi branch, master, updated. upstream/0.7.1-5-g096f4f9

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 096f4f9ae5ed717a8bcb79020a6e2803ff6a7e43
Author: Mirco Bauer <meebey at debian.org>
Date:   Mon Jan 11 23:52:45 2010 +0000

      * debian/rules:
        + Fixed debian/series file patcher.
        + Disabled "make check" as gettext fails on sources in .pc/ from quilt.

diff --git a/debian/changelog b/debian/changelog
index 2067fa6..db83659 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ smuxi (0.7.1-2~pre1) unstable; urgency=low
   * NOT RELEASED YET
   * debian/control:
     + Updated Vcs-* fields for the new git repository.
+  * debian/rules:
+    + Fixed debian/series file patcher.
+    + Disabled "make check" as gettext fails on sources in .pc/ from quilt.
 
- -- Mirco Bauer <meebey at debian.org>  Wed, 03 Feb 2010 00:38:43 +0100
+ -- Mirco Bauer <meebey at debian.org>  Tue, 12 Jan 2010 00:51:43 +0100
 
 smuxi (0.7.1-1) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index be9174a..9c125cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,16 +8,19 @@ 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) || true
+	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); \
+		echo ubuntu_default_settings.patch >> $(PATCH_LIST_FILE).new; \
 	else \
-		echo debian_default_settings.patch >> $(PATCH_LIST_FILE); \
+		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
 	dh_auto_configure -- --enable-engine-irc --enable-frontend-gnome GMCS=/usr/bin/mono-csc MCS=/usr/bin/mono-csc
 
+# disable "make check"
+override_dh_auto_test:
 
 .DEFAULT:
 	dh --with-quilt $@

-- 
smuxi