[Pkg-cli-apps-commits] r5237 - in /packages/smuxi/branches/0.7-1~jaunty/debian: changelog rules

[meebey at users.alioth.debian.org]

Author: meebey
Date: Mon Jan 11 23:52:45 2010
New Revision: 5237

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=5237
Log:
  * debian/rules:
    + Fixed debian/series file patcher.
    + Disabled "make check" as gettext fails on sources in .pc/ from quilt.


Modified:
    packages/smuxi/branches/0.7-1~jaunty/debian/changelog
    packages/smuxi/branches/0.7-1~jaunty/debian/rules

Modified: packages/smuxi/branches/0.7-1~jaunty/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/smuxi/branches/0.7-1%7Ejaunty/debian/changelog?rev=5237&op=diff
==============================================================================
--- packages/smuxi/branches/0.7-1~jaunty/debian/changelog (original)
+++ packages/smuxi/branches/0.7-1~jaunty/debian/changelog Mon Jan 11 23:52:45 2010
@@ -10,8 +10,11 @@
       libmono-system-runtime2.0-cil to build-deps.
   * debian/patches/mono_2.0_compat.patch:
     + Fixes failing build on Mono 2.0
-
- -- Mirco Bauer <meebey at debian.org>  Mon, 11 Jan 2010 23:22:08 +0100
+  * 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>  Tue, 12 Jan 2010 00:51:43 +0100
 
 smuxi (0.7-1) unstable; urgency=low
 

Modified: packages/smuxi/branches/0.7-1~jaunty/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/smuxi/branches/0.7-1%7Ejaunty/debian/rules?rev=5237&op=diff
==============================================================================
--- packages/smuxi/branches/0.7-1~jaunty/debian/rules (original)
+++ packages/smuxi/branches/0.7-1~jaunty/debian/rules Mon Jan 11 23:52:45 2010
@@ -8,16 +8,19 @@
 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 $@