[Pkg-sympa-commits] [SCM] sympa Debian packaging branch, master, updated. debian/6.1.1_dfsg-1-5-g2886768

[Stefan Hornburg (Racke)]

The following commit has been merged in the master branch:
commit 6ff0af4dc2d3ebf4df704c5f1a99d9b315c14c25
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Wed Oct 27 12:20:03 2010 +0200

    Remove patch which forces removal of PO stamp files and add them to upstream temporary files in debian/rules.

diff --git a/debian/patches/2006_force_removal_po_stamp_files.patch b/debian/patches/2006_force_removal_po_stamp_files.patch
deleted file mode 100644
index e37f55a..0000000
--- a/debian/patches/2006_force_removal_po_stamp_files.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Description: Remove stamp files which breaks the build of PO files.
-Author: Emmanuel Bouthenot <kolter at openics.org>
-Last-Update: 2010-08-04
---- a/po-wwsympa/stamp-po
-+++ /dev/null
-@@ -1 +0,0 @@
--timestamp
---- a/po/stamp-po
-+++ /dev/null
-@@ -1 +0,0 @@
--timestamp
diff --git a/debian/patches/series b/debian/patches/series
index fd4bd48..b428069 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,4 @@
 1010_db_port_patch
 2004_pg_create_db.patch
 2005_disable_build_non_dfsg_po_files.patch
-2006_force_removal_po_stamp_files.patch
+
diff --git a/debian/rules b/debian/rules
index bc8472f..a1b49bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,6 +81,7 @@ localenames +=  ml nb_NO nl nn_NO oc pl pt pt_BR ro ru sv tr vi zh_CN zh_TW
 upstreamtmpfiles += $(localenames:%=po/%.gmo)
 upstreamtmpfiles += $(localenames:%=po-wwsympa/%.gmo)
 upstreamtmpfiles += src/etc/list_aliases.tt2 src/lib/Sympa/Constants.pm sympa.spec
+upstreamtmpfiles += po-wwsympa/stamp-po po/stamp-po
 pre-build:: debian/stamp-upstreamtmpstuff
 debian/stamp-upstreamtmpstuff:
 	for file in $(upstreamtmpfiles); do \

-- 
sympa Debian packaging