[Pkg-cli-apps-commits] r4815 - in /packages/smuxi/trunk/debian: changelog control patches/00list patches/fix_infinite_build_po_loop.dpatch rules

meebey at users.alioth.debian.org meebey at users.alioth.debian.org
Sun Apr 5 22:23:09 UTC 2009 

Author: meebey
Date: Sun Apr  5 22:23:09 2009
New Revision: 4815

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4815
Log:
  * debian/control:
    + Added lsb-release to build-deps as it's used in debian/rules.
    + Bumped debhelper build-dep to >= 7.0.50 as we use the rules target
      override feature.
  * debian/rules:
    + Fixed the debian/patches/00list file generation by using a target.
    + Migrated from dh sequence injection interface to override targets.
    + Added missing .PHONY target.
  * debian/patches/fix_infinite_build_po_loop.dpatch:
    + Fixes endless build loops when building on xfs or tmpfs filesystems.
      (patch taken from upstream's git repo)


Added:
    packages/smuxi/trunk/debian/patches/fix_infinite_build_po_loop.dpatch   (with props)
Modified:
    packages/smuxi/trunk/debian/changelog
    packages/smuxi/trunk/debian/control
    packages/smuxi/trunk/debian/patches/00list
    packages/smuxi/trunk/debian/rules

Modified: packages/smuxi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/smuxi/trunk/debian/changelog?rev=4815&op=diff
==============================================================================
--- packages/smuxi/trunk/debian/changelog (original)
+++ packages/smuxi/trunk/debian/changelog Sun Apr  5 22:23:09 2009
@@ -1,3 +1,19 @@
+smuxi (0.6.3-5) unstable; urgency=low
+
+  * debian/control:
+    + Added lsb-release to build-deps as it's used in debian/rules.
+    + Bumped debhelper build-dep to >= 7.0.50 as we use the rules target
+      override feature.
+  * debian/rules:
+    + Fixed the debian/patches/00list file generation by using a target.
+    + Migrated from dh sequence injection interface to override targets.
+    + Added missing .PHONY target.
+  * debian/patches/fix_infinite_build_po_loop.dpatch:
+    + Fixes endless build loops when building on xfs or tmpfs filesystems.
+      (patch taken from upstream's git repo)
+
+ -- Mirco Bauer <meebey at debian.org>  Sun, 05 Apr 2009 23:23:11 +0200
+
 smuxi (0.6.3-4) unstable; urgency=low
 
   [ Jo Shields ]

Modified: packages/smuxi/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/smuxi/trunk/debian/control?rev=4815&op=diff
==============================================================================
--- packages/smuxi/trunk/debian/control (original)
+++ packages/smuxi/trunk/debian/control Sun Apr  5 22:23:09 2009
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Mirco Bauer <meebey at debian.org>
-Build-Depends: debhelper (>= 7), dpatch
+Build-Depends: debhelper (>= 7.0.50), dpatch
 Build-Depends-Indep: cli-common-dev (>= 0.5.7),
  pkg-config,
  mono-devel (>= 2.0),
@@ -18,6 +18,7 @@
  libgconf2.0-cil (>= 2.8) | libgconf2.24-cil,
  libglade2.0-cil (>= 2.8),
  libglib2.0-cil (>= 2.8),
+ lsb-release,
  gettext,
  intltool,
  libtool,

Modified: packages/smuxi/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/smuxi/trunk/debian/patches/00list?rev=4815&op=diff
==============================================================================
--- packages/smuxi/trunk/debian/patches/00list (original)
+++ packages/smuxi/trunk/debian/patches/00list Sun Apr  5 22:23:09 2009
@@ -1,1 +1,2 @@
+fix_infinite_build_po_loop
 debian_default_settings

Added: packages/smuxi/trunk/debian/patches/fix_infinite_build_po_loop.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/smuxi/trunk/debian/patches/fix_infinite_build_po_loop.dpatch?rev=4815&op=file
==============================================================================
--- packages/smuxi/trunk/debian/patches/fix_infinite_build_po_loop.dpatch (added)
+++ packages/smuxi/trunk/debian/patches/fix_infinite_build_po_loop.dpatch Sun Apr  5 22:23:09 2009
@@ -1,0 +1,71 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_infinite_build_po_loop.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch taken from upstream's git repo revision: 81669b0fcb404562d9d0da99d9605b3f64c07af2
+## DP: set subdir variable to "po" in all po-*/Makefile.in.in files
+## DP:         
+## DP: This doesn't really make sense to me as that causes to always stamp the same file (po/stamp-it) instead of each po directory, but this is how intltoolize wants it.
+## DP: At the same time this finally fixes the endless build loop if the source files are laying on xfs or tmpfs (which support more precise timestamps). (closes: #156)
+                
+ at DPATCH@
+diff -urNad smuxi-0.6.3~/po-Engine/Makefile.in.in smuxi-0.6.3/po-Engine/Makefile.in.in
+--- smuxi-0.6.3~/po-Engine/Makefile.in.in	2008-07-27 21:58:41.000000000 +0200
++++ smuxi-0.6.3/po-Engine/Makefile.in.in	2009-04-05 23:27:15.000000000 +0200
+@@ -35,7 +35,7 @@
+ libdir = @libdir@
+ DATADIRNAME = @DATADIRNAME@
+ itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+-subdir = po-Engine
++subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p at .
+ # Until it can be supposed, use the safe fallback:
+diff -urNad smuxi-0.6.3~/po-Engine-IRC/Makefile.in.in smuxi-0.6.3/po-Engine-IRC/Makefile.in.in
+--- smuxi-0.6.3~/po-Engine-IRC/Makefile.in.in	2008-07-27 22:02:26.000000000 +0200
++++ smuxi-0.6.3/po-Engine-IRC/Makefile.in.in	2009-04-05 23:27:15.000000000 +0200
+@@ -35,7 +35,7 @@
+ libdir = @libdir@
+ DATADIRNAME = @DATADIRNAME@
+ itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+-subdir = po-Engine-IRC
++subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p at .
+ # Until it can be supposed, use the safe fallback:
+diff -urNad smuxi-0.6.3~/po-Frontend-GNOME/Makefile.in.in smuxi-0.6.3/po-Frontend-GNOME/Makefile.in.in
+--- smuxi-0.6.3~/po-Frontend-GNOME/Makefile.in.in	2008-07-27 22:02:46.000000000 +0200
++++ smuxi-0.6.3/po-Frontend-GNOME/Makefile.in.in	2009-04-05 23:27:15.000000000 +0200
+@@ -35,7 +35,7 @@
+ libdir = @libdir@
+ DATADIRNAME = @DATADIRNAME@
+ itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+-subdir = po-Frontend-GNOME
++subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p at .
+ # Until it can be supposed, use the safe fallback:
+diff -urNad smuxi-0.6.3~/po-Frontend-GNOME-IRC/Makefile.in.in smuxi-0.6.3/po-Frontend-GNOME-IRC/Makefile.in.in
+--- smuxi-0.6.3~/po-Frontend-GNOME-IRC/Makefile.in.in	2008-07-27 22:02:40.000000000 +0200
++++ smuxi-0.6.3/po-Frontend-GNOME-IRC/Makefile.in.in	2009-04-05 23:27:15.000000000 +0200
+@@ -35,7 +35,7 @@
+ libdir = @libdir@
+ DATADIRNAME = @DATADIRNAME@
+ itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+-subdir = po-Frontend-GNOME-IRC
++subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p at .
+ # Until it can be supposed, use the safe fallback:
+diff -urNad smuxi-0.6.3~/po-Server/Makefile.in.in smuxi-0.6.3/po-Server/Makefile.in.in
+--- smuxi-0.6.3~/po-Server/Makefile.in.in	2008-07-27 22:02:51.000000000 +0200
++++ smuxi-0.6.3/po-Server/Makefile.in.in	2009-04-05 23:27:15.000000000 +0200
+@@ -35,7 +35,7 @@
+ libdir = @libdir@
+ DATADIRNAME = @DATADIRNAME@
+ itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+-subdir = po-Server
++subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p at .
+ # Until it can be supposed, use the safe fallback:

Propchange: packages/smuxi/trunk/debian/patches/fix_infinite_build_po_loop.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/smuxi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/smuxi/trunk/debian/rules?rev=4815&op=diff
==============================================================================
--- packages/smuxi/trunk/debian/rules (original)
+++ packages/smuxi/trunk/debian/rules Sun Apr  5 22:23:09 2009
@@ -6,34 +6,31 @@
 
 DISTRO = "$(shell lsb_release -si)"
 PATCH_LIST_FILE = $(CURDIR)/debian/patches/00list
-$(shell egrep -v '(ubuntu|debian)_default_settings' $(PATCH_LIST_FILE) > $(PATCH_LIST_FILE))
+
+$(PATCH_LIST_FILE):
+	$(shell egrep -v '(ubuntu|debian)_default_settings' $(PATCH_LIST_FILE) > $(PATCH_LIST_FILE))
 ifeq ($(DISTRO),"Ubuntu")
-$(shell echo ubuntu_default_settings >> $(PATCH_LIST_FILE))
+	$(shell echo ubuntu_default_settings >> $(PATCH_LIST_FILE))
 else
-$(shell echo debian_default_settings >> $(PATCH_LIST_FILE))
+	$(shell echo debian_default_settings >> $(PATCH_LIST_FILE))
 endif
 
-build: patch-stamp
-	dh $@ --before configure
-	libtoolize
+autogen: $(PATCH_LIST_FILE) patch-stamp
+	libtoolize --automake
 	aclocal -I.
 	autoconf
 	automake --add-missing --copy
+	
+override_dh_auto_configure: autogen
 	dh_auto_configure -- --enable-engine-irc --enable-frontend-gnome GMCS=/usr/bin/csc MCS=/usr/bin/csc
-	dh $@ --after configure
 
-install: build
-	dh $@
-
-binary: binary-indep
-binary-indep: build install
-	dh $@
-
-clean: clean-patched unpatch
+override_dh_clean: clean-patched unpatch
 clean-patched:
-	dh clean
+	dh_clean
 	rm -rf configure config.sub config.guess ltmain.sh aclocal.m4 autom4te.cache/
 	find . -name "Makefile.in" -delete
 
 %:
 	dh $@
+
+.PHONY: autogen clean-patched

More information about the Pkg-cli-apps-commits mailing list