[Pkg-cli-apps-commits] [SCM] smuxi branch, lenny-backports, updated. debian/0.7.2.1-1-20-gfecf245

[Mirco Bauer]

The following commit has been merged in the lenny-backports branch:
commit f389d30231c55c5a1e85255e883b1363254ae5c6
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 43036ba..5f0d995 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,11 @@ smuxi (0.7.1-1~jaunty+1) jaunty; urgency=low
       libmono-system-runtime2.0-cil to build-deps.
   * debian/patches/mono_2.0_compat.patch:
     + Fixes failing build on Mono 2.0
+  * 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>  Mon, 11 Jan 2010 23:22:08 +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 266eead..c7502a6 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
 
+# disable "make check"
+override_dh_auto_test:
 
 .DEFAULT:
 	dh --with-quilt $@

-- 
smuxi