Author: alfie
Date: 2008-04-08 12:12:34 +0000 (Tue, 08 Apr 2008)
New Revision: 6496
Removed:
packages/trunk/wesnoth/debian/patches/01disable-rpath
Modified:
packages/trunk/wesnoth/debian/changelog
packages/trunk/wesnoth/debian/control
packages/trunk/wesnoth/debian/copyright
packages/trunk/wesnoth/debian/patches/02wesnoth-nolog-desktop-file
packages/trunk/wesnoth/debian/patches/04no-campaign-fix
packages/trunk/wesnoth/debian/patches/series
packages/trunk/wesnoth/debian/rules
Log:
- disable-rpath patch not needed anymore, configure fixed upstream.
* Update debian/copyright with respect to that wesnoth is GPLv2 or later,
not GPLv2 only.
* Also symlink the english manpage for wesnoth-smallgui properly.
* Call dh_pysupport for the python parts in the wesnoth-tools package and
make it Depend on ${python:Depends}.
* Only do the doc symlink in wesnoth, wesnoth-editor and wesnoth-all
packages which directly versioned depend on wesnoth-data, not from the
campaign packages.
* Fix a typo in wesnoth-tools package description.
Modified: packages/trunk/wesnoth/debian/changelog
===================================================================
--- packages/trunk/wesnoth/debian/changelog 2008-04-08 10:40:41 UTC (rev
6495)
+++ packages/trunk/wesnoth/debian/changelog 2008-04-08 12:12:34 UTC (rev
6496)
@@ -1,9 +1,19 @@
-wesnoth (1:1.4.1-1) experimental; urgency=low
+wesnoth (1:1.4.1-1) unstable; urgency=low
* New upstream release:
- sample.py-fix made it into the 1.4 branch, removed.
+ - disable-rpath patch not needed anymore, configure fixed upstream.
+ * Update debian/copyright with respect to that wesnoth is GPLv2 or later,
+ not GPLv2 only.
+ * Also symlink the english manpage for wesnoth-smallgui properly.
+ * Call dh_pysupport for the python parts in the wesnoth-tools package and
+ make it Depend on ${python:Depends}.
+ * Only do the doc symlink in wesnoth, wesnoth-editor and wesnoth-all
+ packages which directly versioned depend on wesnoth-data, not from the
+ campaign packages.
+ * Fix a typo in wesnoth-tools package description.
- -- Gerfried Fuchs <[EMAIL PROTECTED]> Sun, 06 Apr 2008 17:05:18 +0200
+ -- Gerfried Fuchs <[EMAIL PROTECTED]> Tue, 08 Apr 2008 14:11:04 +0200
wesnoth (1:1.4-2) experimental; urgency=low
Modified: packages/trunk/wesnoth/debian/control
===================================================================
--- packages/trunk/wesnoth/debian/control 2008-04-08 10:40:41 UTC (rev
6495)
+++ packages/trunk/wesnoth/debian/control 2008-04-08 12:12:34 UTC (rev
6496)
@@ -105,12 +105,12 @@
Package: wesnoth-tools
Architecture: any
-Depends: ${shlibs:Depends}, wesnoth-data (= ${source:Version})
+Depends: ${shlibs:Depends}, ${python:Depends}, wesnoth-data (=
${source:Version})
Description: tools for campaign developers for Wesnoth
This package contains various tools for Wesnoth that are especially useful for
campaign developers, including but not limted to scripts supporting the
- generation and checking of of WML (Wesnoth Markup Language). You can find them
- in the directory /usr/share/games/wesnoth/data/tools after installation of the
+ generation and checking of WML (Wesnoth Markup Language). You can find them in
+ the directory /usr/share/games/wesnoth/data/tools after installation of the
package.
.
Battle for control of villages, using variety of units which have advantages
Modified: packages/trunk/wesnoth/debian/copyright
===================================================================
--- packages/trunk/wesnoth/debian/copyright 2008-04-08 10:40:41 UTC (rev
6495)
+++ packages/trunk/wesnoth/debian/copyright 2008-04-08 12:12:34 UTC (rev
6496)
@@ -27,12 +27,14 @@
Copyright (C) 2003 - 2007 by David White <[EMAIL PROTECTED]>
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2.
+ it under the terms of the GNU General Public License version 2
+ or at your option any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY.
On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL-2 file.
+License can be found in /usr/share/common-licenses/GPL-2 file,
+later versions can be found in the same directory.
-----
@@ -49,7 +51,8 @@
Library General Public License for more details.
On Debian systems, the complete text of the GNU Library General
-Public License can be found in /usr/share/common-licenses/LGPL-2 file.
+Public License can be found in /usr/share/common-licenses/LGPL-2 file,
+later versions can be found in the same directory.
-----
Deleted: packages/trunk/wesnoth/debian/patches/01disable-rpath
===================================================================
--- packages/trunk/wesnoth/debian/patches/01disable-rpath 2008-04-08
10:40:41 UTC (rev 6495)
+++ packages/trunk/wesnoth/debian/patches/01disable-rpath 2008-04-08
12:12:34 UTC (rev 6496)
@@ -1,25 +0,0 @@
-Author: Gerfried Fuchs <[EMAIL PROTECTED]> vim:ft=diff:
-Description: disable rpath for real
-
-Index: wesnoth-1.4/configure
-===================================================================
---- wesnoth-1.4.orig/configure
-+++ wesnoth-1.4/configure
-@@ -14467,7 +14467,7 @@ rm -f core conftest.err conftest_ipa8_co
- ac_objext=$boost_save_ac_objext
- LDFLAGS=$boost_save_LDFLAGS
- if test x"$boost_cv_lib_iostreams" = xyes; then
-- boost_cv_lib_iostreams_LDFLAGS="-L$boost_ldpath -R$boost_ldpath"
-+ boost_cv_lib_iostreams_LDFLAGS="-L$boost_ldpath"
- boost_cv_lib_iostreams_LIBS="-l$boost_lib"
- LIBS=$boost_save_LIBS
- break 6
-@@ -14807,7 +14807,7 @@ rm -f core conftest.err conftest_ipa8_co
- ac_objext=$boost_save_ac_objext
- LDFLAGS=$boost_save_LDFLAGS
- if test x"$boost_cv_lib_unit_test_framework" = xyes; then
-- boost_cv_lib_unit_test_framework_LDFLAGS="-L$boost_ldpath
-R$boost_ldpath"
-+ boost_cv_lib_unit_test_framework_LDFLAGS="-L$boost_ldpath"
- boost_cv_lib_unit_test_framework_LIBS="-l$boost_lib"
- LIBS=$boost_save_LIBS
- break 6
Modified: packages/trunk/wesnoth/debian/patches/02wesnoth-nolog-desktop-file
===================================================================
--- packages/trunk/wesnoth/debian/patches/02wesnoth-nolog-desktop-file
2008-04-08 10:40:41 UTC (rev 6495)
+++ packages/trunk/wesnoth/debian/patches/02wesnoth-nolog-desktop-file
2008-04-08 12:12:34 UTC (rev 6496)
@@ -1,10 +1,10 @@
Author: Gerfried Fuchs <[EMAIL PROTECTED]> vim:ft=diff:
Description: call wesnoth-nolog from desktop file, too
-Index: wesnoth-1.4/icons/wesnoth.desktop
+Index: wesnoth-1.4.1/icons/wesnoth.desktop
===================================================================
---- wesnoth-1.4.orig/icons/wesnoth.desktop
-+++ wesnoth-1.4/icons/wesnoth.desktop
+--- wesnoth-1.4.1.orig/icons/wesnoth.desktop
++++ wesnoth-1.4.1/icons/wesnoth.desktop
@@ -44,6 +44,6 @@ Comment[sk]=Ťahová strategická hra z
Comment[sr]=Фантазијска стратешка игра на потезе
[EMAIL PROTECTED] strateška igra na poteze
Modified: packages/trunk/wesnoth/debian/patches/04no-campaign-fix
===================================================================
--- packages/trunk/wesnoth/debian/patches/04no-campaign-fix 2008-04-08
10:40:41 UTC (rev 6495)
+++ packages/trunk/wesnoth/debian/patches/04no-campaign-fix 2008-04-08
12:12:34 UTC (rev 6496)
@@ -1,11 +1,11 @@
Author: Eric S. Raymond <[EMAIL PROTECTED]> vim:ft=diff:
Description: display an error message if no campaign is available
-Index: wesnoth-1.4/src/game.cpp
+Index: wesnoth-1.4.1/src/game.cpp
===================================================================
---- wesnoth-1.4.orig/src/game.cpp
-+++ wesnoth-1.4/src/game.cpp
-@@ -895,10 +895,11 @@ bool game_controller::new_campaign()
+--- wesnoth-1.4.1.orig/src/game.cpp
++++ wesnoth-1.4.1/src/game.cpp
+@@ -896,10 +896,11 @@ bool game_controller::new_campaign()
campaign_desc.push_back(std::pair<std::string,std::string>(desc,image));
}
Modified: packages/trunk/wesnoth/debian/patches/series
===================================================================
--- packages/trunk/wesnoth/debian/patches/series 2008-04-08 10:40:41 UTC
(rev 6495)
+++ packages/trunk/wesnoth/debian/patches/series 2008-04-08 12:12:34 UTC
(rev 6496)
@@ -1,3 +1,2 @@
-01disable-rpath
02wesnoth-nolog-desktop-file
04no-campaign-fix
Modified: packages/trunk/wesnoth/debian/rules
===================================================================
--- packages/trunk/wesnoth/debian/rules 2008-04-08 10:40:41 UTC (rev 6495)
+++ packages/trunk/wesnoth/debian/rules 2008-04-08 12:12:34 UTC (rev 6496)
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
# debian/rules for wesnoth
+# copyright 2007++ by Gerfried Fuchs <[EMAIL PROTECTED]>
+# Licenced the same way as wesnoth itself
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -98,6 +100,7 @@
dh_testroot
dh_clean -k -s
dh_installdirs -s
+
# Add here commands to install the arch part of the package into
# debian/tmp.
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
@@ -105,8 +108,10 @@
$(MAKE) install-exec
DESTDIR=$(CURDIR)/debian/tmp \
$(MAKE) -C doc/man install
+
dh_install -s
+
# Must not depend on anything. This is to be called by
# binary-arch/binary-indep
# in another 'make' thread.
@@ -117,7 +122,7 @@
dh_installdocs
dh_installexamples
dh_installmenu
-# dh_python
+ dh_pysupport
dh_installinit
dh_installman
dh_strip
@@ -143,12 +148,8 @@
ln -s /usr/share/games/wesnoth/images/wesnoth-icon.png \
debian/wesnoth-data/usr/share/icons/wesnoth-icon.png
- for i in wesnoth-all wesnoth-httt wesnoth-tsg wesnoth-trow wesnoth-ttb \
- wesnoth-ei wesnoth-utbs wesnoth-did wesnoth-nr wesnoth-sof \
- wesnoth-sotbe wesnoth-l wesnoth-aoi wesnoth-thot; do \
- install -p -d -m755 debian/$$i/usr/share/doc; \
- ln -s wesnoth-data debian/$$i/usr/share/doc/$$i; \
- done
+ install -p -d -m755 debian/wesnoth-all/usr/share/doc
+ ln -s wesnoth-data debian/wesnoth-all/usr/share/doc/wesnoth-all
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
@@ -163,6 +164,7 @@
ln -s wesnoth.6.gz `dirname $$i`/wesnoth-smallgui.6.gz; \
done
ln -s wesnoth.6.gz debian/wesnoth/usr/share/man/man6/wesnoth-nolog.6.gz
+ ln -s wesnoth.6.gz
debian/wesnoth/usr/share/man/man6/wesnoth-smallgui.6.gz
for i in wesnoth wesnoth-editor; do \
install -p -d -m755 debian/$$i/usr/share/doc; \
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
