The following commit has been merged in the master branch:
commit 94e7bd6bfbcf86f7b7261076e7b509d8d57e9509
Author: Felix Geyer <[email protected]>
Date: Sun Feb 13 00:21:37 2011 +0100
Drop 01_dont_remove_stamp_po.patch and don't backup/restore config.h and
warmux.pot.
diff --git a/debian/changelog b/debian/changelog
index 4a32a93..6fe5c38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ warmux (1:11.01-1) UNRELEASED; urgency=low
- Changed name to WarMUX.
* Refresh patches.
* Add transitional packages for the old name "wormux".
+ * Drop 01_dont_remove_stamp_po.patch and don't backup/restore config.h
+ and warmux.pot, not needed anymore.
- -- Felix Geyer <[email protected]> Sat, 12 Feb 2011 23:55:37 +0100
+ -- Felix Geyer <[email protected]> Sun, 13 Feb 2011 00:20:22 +0100
wormux (1:0.9.2.1-1) experimental; urgency=low
diff --git a/debian/patches/01_dont_remove_stamp_po.patch
b/debian/patches/01_dont_remove_stamp_po.patch
deleted file mode 100644
index 65dc423..0000000
--- a/debian/patches/01_dont_remove_stamp_po.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Make sure the po files are not regenerated.
-Author: Eddy Petrișor <[email protected]>
-
-diff --git a/po/Makefile.in b/po/Makefile.in
-index 052f0f7..148595c 100644
---- a/po/Makefile.in
-+++ b/po/Makefile.in
-@@ -188,7 +188,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
-
- #MAINTAINERCLEANFILES = Makefile.in
--MAINTAINERCLEANFILES = stamp-po $(GMOFILES)
-+MAINTAINERCLEANFILES = $(GMOFILES)
- POTFILES = \
- src/character/body.cpp \
- src/character/body.h \
diff --git a/debian/patches/series b/debian/patches/series
index 4321bc4..289e14a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01_dont_remove_stamp_po.patch
02_desktop_file.patch
03_respect_build_flags_from_env.patch
04_fix_build_kfreebsd.patch
diff --git a/debian/rules b/debian/rules
index 266717a..ef40dec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,6 @@ CXXFLAGS += -Wall -Wextra
dh --parallel --with autoreconf $@
override_dh_auto_configure:
- [ -f src/config.h.clean ] || cp src/config.h src/config.h.clean
- [ -f po/warmux.pot.clean ] || cp po/warmux.pot po/warmux.pot.clean
-
dh_auto_configure -- --with-datadir-name=\$${prefix}/share/games/warmux
\
--bindir=\$${prefix}/games --enable-servers --enable-fribidi
@@ -22,12 +19,6 @@ override_dh_auto_install:
cp debian/tmp/usr/share/games/warmux/warmux_32x32.xpm
debian/tmp/usr/share/pixmaps/warmux.xpm
-override_dh_auto_clean:
- dh_auto_clean
-
- [ -f src/config.h.clean ] && mv src/config.h.clean src/config.h || :
- [ -f po/warmux.pot ] || mv po/warmux.pot.clean po/warmux.pot
-
override_dh_install:
dh_install --list-missing
--
WarMUX PKG
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
