Bug#617265: wesnoth-1.9: New version 1.9.4 is out for a long time already. PLEASE update.
On Sat, Apr 2, 2011 at 1:47 AM, Vincent Cheng vincentc1...@gmail.comwrote: On Fri, Apr 1, 2011 at 2:42 AM, Gerfried Fuchs rho...@deb.at wrote: Hi! * Vincent Cheng vincentc1...@gmail.com [2011-04-01 03:52:54 CEST]: I've taken a closer look at this and I've tried to package the latest dev release of Wesnoth (1.9.5). I've been using my own PPA to test it [1], and it seems to build and run fine now. I've also attached a patch of my changes, if that helps any. Sorry, I don't see the need or requirement to switch to cdbs to make it work properly again. If cdbs is able to make it work, so must debhelper be able to do it. And actually, such changes definitely should be documented in debian/changelog, that's actually what it's there for. I admit I don't really understand how cdbs works myself, so I ended up going back to debhelper and building off of your debian/rules instead of trying to write one from scratch. Just a sidenote: Did you check where the files end up after your patch? Do they appear in the same place as they were before? Including translations? Yes; see attached text file for the output of dpkg -L on my wesnoth-1.9 packages. - $(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install + $(MAKE) -C build DESTDIR=$(CURDIR) install Uh, *really* install into the current directory and not debian/tmp? That looks pretty much like an error to me, at least it it's totally counter-intuitive if it would end up in debian/tmp in the end? - cd $(CURDIR)/debian/tmp/usr/share/games/wesnoth/$(BRANCH_VERSION)/data/tools \ + cd $(CURDIR)/usr/share/games/wesnoth/$(BRANCH_VERSION)/data/tools \ chmod +x extractbindings unit_tree/TeamColorizer \ wesnoth/wescamp.py wesnoth/wmldata.py wesnoth/wmlparser.py \ wmlindent wmlflip wmllint wmlscope wesnoth_addon_manager \ @@ -178,10 +177,10 @@ done Sorry, this is totally weird, why did you go that approach? # move binaries to their proper name - mv debian/wesnoth-$(BRANCH_VERSION)-core/usr/games/wesnoth \ - debian/wesnoth-$(BRANCH_VERSION)-core/usr/games/wesnoth-$(BRANCH_VERSION) - mv debian/wesnoth-$(BRANCH_VERSION)-server/usr/games/wesnothd \ - debian/wesnoth-$(BRANCH_VERSION)-server/usr/games/wesnothd-$(BRANCH_VERSION) + #mv debian/wesnoth-$(BRANCH_VERSION)-core/usr/games/wesnoth \ + # debian/wesnoth-$(BRANCH_VERSION)-core/usr/games/wesnoth-$(BRANCH_VERSION) + #mv debian/wesnoth-$(BRANCH_VERSION)-server/usr/games/wesnothd \ + # debian/wesnoth-$(BRANCH_VERSION)-server/usr/games/wesnothd-$(BRANCH_VERSION) So it looks you are changing the install structure of the package? Your patch seems to completely rewriting the whole thing, actually I don't really see the benefit or rationale for that, could you elaborate why this is needed? Actually, I'm not entirely sure why my patches are even necessary to get Wesnoth to build (sorry, I'm still relatively new to Debian packaging). I changed the install structure after taking a look at Launchpad's build log after one of my earlier failed builds [1]. Here's a snippet: -- Installing: /build/buildd/wesnoth-1.9-1.9.5/usr/include/ana/predicates.hpp -- Installing: /build/buildd/wesnoth-1.9-1.9.5/usr/include/ana/binary_streams.hpp make[1]: Leaving directory `/build/buildd/wesnoth-1.9-1.9.5/build' cd /build/buildd/wesnoth-1.9-1.9.5/usr/share/games/wesnoth/1.9/data/tools \ chmod +x extractbindings unit_tree/TeamColorizer \ wesnoth/wescamp.py wesnoth/wmldata.py wesnoth/wmlparser.py \ wmlindent wmlflip wmllint wmlscope wesnoth_addon_manager \ wmlvalidator hexometer/hexometer wmlxgettext imgcheck dh_install cp: cannot stat `debian/tmp/debian/tmp/usr/share/games/wesnoth/1.9/data/advanced_preferences.cfg': No such file or directory dh_install: cp -a debian/tmp/debian/tmp/usr/share/games/wesnoth/1.9/data/advanced_preferences.cfg debian/wesnoth-1.9-data//usr/share/games/wesnoth/1.9/data/ returned exit code 1 make: *** [debian/stamp-install] Error 2 dpkg-buildpackage: error: /usr/bin/fakeroot debian/rules binary-arch gave error exit status 2 dh_install tried to copy a file from debian/tmp/debian/tmp/..., which is why I changed Wesnoth's install structure the way I did. I'm not sure if this was the right thing to do, but it did finally lead to a successful build in the end. Unfortunately, I just tried building Wesnoth 1.9 with pbuilder on my laptop (running Debian testing) with the exact same debian/ structure from my successful Launchpad build, and it doesn't even get to the point of building itself. make[3]: *** No rule to make target `../usr/share/games/wesnoth/1.9/locale/zh_TW/LC_MESSAGES/wesnoth-manual.mo', needed by `po/CMakeFiles/mo-update'. Stop. I have no clue why it builds successfully in Launchpad, in Lucid, Maverick, and Natty chroots, yet it fails unexpectedly when I try to build it myself in
Bug#617265: wesnoth-1.9: New version 1.9.4 is out for a long time already. PLEASE update.
Hi! * Vincent Cheng vincentc1...@gmail.com [2011-04-01 03:52:54 CEST]: I've taken a closer look at this and I've tried to package the latest dev release of Wesnoth (1.9.5). I've been using my own PPA to test it [1], and it seems to build and run fine now. I've also attached a patch of my changes, if that helps any. Sorry, I don't see the need or requirement to switch to cdbs to make it work properly again. If cdbs is able to make it work, so must debhelper be able to do it. And actually, such changes definitely should be documented in debian/changelog, that's actually what it's there for. Just a sidenote: Did you check where the files end up after your patch? Do they appear in the same place as they were before? Including translations? - $(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install + $(MAKE) -C build DESTDIR=$(CURDIR) install Uh, *really* install into the current directory and not debian/tmp? That looks pretty much like an error to me, at least it it's totally counter-intuitive if it would end up in debian/tmp in the end? - cd $(CURDIR)/debian/tmp/usr/share/games/wesnoth/$(BRANCH_VERSION)/data/tools \ + cd $(CURDIR)/usr/share/games/wesnoth/$(BRANCH_VERSION)/data/tools \ chmod +x extractbindings unit_tree/TeamColorizer \ wesnoth/wescamp.py wesnoth/wmldata.py wesnoth/wmlparser.py \ wmlindent wmlflip wmllint wmlscope wesnoth_addon_manager \ @@ -178,10 +177,10 @@ done Sorry, this is totally weird, why did you go that approach? # move binaries to their proper name - mv debian/wesnoth-$(BRANCH_VERSION)-core/usr/games/wesnoth \ - debian/wesnoth-$(BRANCH_VERSION)-core/usr/games/wesnoth-$(BRANCH_VERSION) - mv debian/wesnoth-$(BRANCH_VERSION)-server/usr/games/wesnothd \ - debian/wesnoth-$(BRANCH_VERSION)-server/usr/games/wesnothd-$(BRANCH_VERSION) + #mv debian/wesnoth-$(BRANCH_VERSION)-core/usr/games/wesnoth \ + # debian/wesnoth-$(BRANCH_VERSION)-core/usr/games/wesnoth-$(BRANCH_VERSION) + #mv debian/wesnoth-$(BRANCH_VERSION)-server/usr/games/wesnothd \ + # debian/wesnoth-$(BRANCH_VERSION)-server/usr/games/wesnothd-$(BRANCH_VERSION) So it looks you are changing the install structure of the package? Your patch seems to completely rewriting the whole thing, actually I don't really see the benefit or rationale for that, could you elaborate why this is needed? Thanks, Rhonda -- Fühlst du dich mutlos, fass endlich Mut, los | Fühlst du dich hilflos, geh raus und hilf, los| Wir sind Helden Fühlst du dich machtlos, geh raus und mach, los | 23.55: Alles auf Anfang Fühlst du dich haltlos, such Halt und lass los| -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#617265: wesnoth-1.9: New version 1.9.4 is out for a long time already. PLEASE update.
I've taken a closer look at this and I've tried to package the latest dev
release of Wesnoth (1.9.5). I've been using my own PPA to test it [1], and
it seems to build and run fine now. I've also attached a patch of my
changes, if that helps any.
Regards,
- Vincent
[1] https://launchpad.net/~vincent-c/+archive/wesnoth
diff -Nru a//debian/changelog b//debian/changelog
--- a//debian/changelog 2011-01-27 01:51:47.0 -0800
+++ b//debian/changelog 2011-03-31 18:38:15.689134611 -0700
@@ -1,3 +1,9 @@
+wesnoth-1.9 (1:1.9.5-1) unstable; urgency=low
+
+ * New upstream devel release.
+
+ -- Vincent Cheng vincentc1...@gmail.com Sun, 27 Mar 2011 19:38:02 -0700
+
wesnoth-1.9 (1:1.9.4-1) unstable; urgency=low
* New upstream devel release.
diff -Nru a//debian/control b//debian/control
--- a//debian/control 2011-01-27 01:51:47.0 -0800
+++ b//debian/control 2011-03-31 18:43:22.433299780 -0700
@@ -7,7 +7,7 @@
libsdl-ttf2.0-dev (= 2.0.8), python-support, libdbus-1-dev,
libboost-iostreams-dev, libboost-test-dev, libboost-regex-dev,
libboost-serialization-dev, libboost-system-dev, libboost-thread-dev,
- libpango1.0-dev, cmake (= 2.6), liblua5.1-0-dev
+ libpango1.0-dev, cmake (= 2.6), liblua5.1-0-dev, cdbs
Standards-Version: 3.9.1
Uploaders: Gerfried Fuchs rho...@debian.org
Homepage: http://wesnoth.org/
diff -Nru a//debian/rules b//debian/rules
--- a//debian/rules 2011-01-27 01:51:47.0 -0800
+++ b//debian/rules 2011-03-31 02:33:48.0 -0700
@@ -45,10 +45,9 @@
## used for package name extension
BRANCH_VERSION = $(STRIP_MAJOR).$(MINOR_VERSION)
-CONFIGURE_SWITCHES = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --disable-strict-compilation --disable-maintainer-mode --disable-rpath --prefix=/usr --mandir=\$${prefix}/share/man --bindir=\$${prefix}/games --with-datadir-name=wesnoth/$(BRANCH_VERSION) --with-localedir=\$${prefix}/share/games/wesnoth/$(BRANCH_VERSION)/locale --with-fifodir=/var/run/wesnothd --datadir=\$${prefix}/share/games --enable-server --with-fribidi --enable-python-install
-
-CMAKE_SWITCHES = -DBINARY_SUFFIX=-$(BRANCH_VERSION) -DCMAKE_INSTALL_PREFIX=/usr/ -DBINDIR=/usr/games -DDATAROOTDIR=/usr/share/games -DDATADIRNAME=wesnoth/$(BRANCH_VERSION) -DDESKTOPDIR=/usr/share/applications -DDOCDIR=/usr/share/doc/wesnoth-$(BRANCH_VERSION)-data -DLOCALEDIR=wesnoth/$(BRANCH_VERSION)/locale -DMANDIR=/usr/share/man
+# CONFIGURE_SWITCHES = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --disable-strict-compilation --disable-maintainer-mode --disable-rpath --prefix=/usr --mandir=\$${prefix}/share/man --bindir=\$${prefix}/games --with-datadir-name=wesnoth/$(BRANCH_VERSION) --with-localedir=\$${prefix}/share/games/wesnoth/$(BRANCH_VERSION)/locale --with-fifodir=/var/run/wesnothd --datadir=\$${prefix}/share/games --enable-server --with-fribidi --enable-python-install
+CMAKE_SWITCHES = -DBINARY_SUFFIX=-$(BRANCH_VERSION) -DCMAKE_INSTALL_PREFIX=/usr/ -DBINDIR=/usr/games -DDATAROOTDIR=/usr/share/games -DDATADIRNAME=wesnoth/$(BRANCH_VERSION) -DDESKTOPDIR=/usr/share/applications -DDOCDIR=/usr/share/doc/wesnoth-$(BRANCH_VERSION)-data -DLOCALEDIR=/usr/share/games/wesnoth/$(BRANCH_VERSION)/locale -DMANDIR=/usr/share/man -DFIFO_DIR=/var/run/wesnothd -DENABLE_CAMPAIGN_SERVER=ON -DENABLE_TOOLS=ON -DENABLE_STRICT_COMPILATION=OFF
clean:
dh_testdir
@@ -83,9 +82,9 @@
dh_prep
dh_installdirs
- $(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install
+ $(MAKE) -C build DESTDIR=$(CURDIR) install
- cd $(CURDIR)/debian/tmp/usr/share/games/wesnoth/$(BRANCH_VERSION)/data/tools \
+ cd $(CURDIR)/usr/share/games/wesnoth/$(BRANCH_VERSION)/data/tools \
chmod +x extractbindings unit_tree/TeamColorizer \
wesnoth/wescamp.py wesnoth/wmldata.py wesnoth/wmlparser.py \
wmlindent wmlflip wmllint wmlscope wesnoth_addon_manager \
@@ -178,10 +177,10 @@
done
# move binaries to their proper name
- mv debian/wesnoth-$(BRANCH_VERSION)-core/usr/games/wesnoth \
- debian/wesnoth-$(BRANCH_VERSION)-core/usr/games/wesnoth-$(BRANCH_VERSION)
- mv debian/wesnoth-$(BRANCH_VERSION)-server/usr/games/wesnothd \
- debian/wesnoth-$(BRANCH_VERSION)-server/usr/games/wesnothd-$(BRANCH_VERSION)
+ #mv debian/wesnoth-$(BRANCH_VERSION)-core/usr/games/wesnoth \
+ # debian/wesnoth-$(BRANCH_VERSION)-core/usr/games/wesnoth-$(BRANCH_VERSION)
+ #mv debian/wesnoth-$(BRANCH_VERSION)-server/usr/games/wesnothd \
+ # debian/wesnoth-$(BRANCH_VERSION)-server/usr/games/wesnothd-$(BRANCH_VERSION)
# move the desktop files to their proper name
mv debian/wesnoth-$(BRANCH_VERSION)-core/usr/share/applications/wesnoth.desktop \
diff -Nru a//debian/source/format b//debian/source/format
--- a//debian/source/format 1969-12-31 16:00:00.0 -0800
+++ b//debian/source/format 2011-03-27 19:40:50.0 -0700
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru a//debian/wesnoth-1.9-aoi.install b//debian/wesnoth-1.9-aoi.install
--- a//debian/wesnoth-1.9-aoi.install 2011-01-27 01:51:47.0 -0800
+++
Bug#617265: wesnoth-1.9: New version 1.9.4 is out for a long time already. PLEASE update.
If you're willing to use cdbs, it should be doable to work around upstream's removal of autotools support. Example debian/rules file: #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/class/makefile.mk cdbs and cmake would also have to be added to Build-Depends in debian/control. Ideally, Wesnoth would continue to support autotools, but that looks unlikely at the moment. :(
Bug#617265: wesnoth-1.9: New version 1.9.4 is out for a long time already. PLEASE update.
Package: wesnoth-1.9 Version: 1:1.9.3-1 Severity: wishlist Good dear wesnoth maintainer. First of all I'm really happy that development versions of wesnoth are availabe in Debian. Its really nice to have latest and greatest of this excellent game. Version 1.9.4 is out for quite some time. Can you please update current wesnoth-1.9 packages to 1.9.4? Thank you very much in advance, Zaar. -- System Information: Debian Release: 6.0 APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.37-1-amd64 (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages wesnoth-1.9 depends on: ii wesnoth-1.9-aoi 1:1.9.3-1 An Orcish Incursion official cam ii wesnoth-1.9-core 1:1.9.3-1 fantasy turn-based strategy game ( ii wesnoth-1.9-data 1:1.9.3-1 data files for Wesnoth (branch 1.9 ii wesnoth-1.9-did 1:1.9.3-1 Descent Into Darkness official c ii wesnoth-1.9-dm1:1.9.3-1 Delfador's Memoirs official camp ii wesnoth-1.9-dw1:1.9.3-1 Dead Water official campaign for ii wesnoth-1.9-ei1:1.9.3-1 The Eastern Invasion official ca ii wesnoth-1.9-httt 1:1.9.3-1 Heir to the Throne official camp ii wesnoth-1.9-l 1:1.9.3-1 Liberty official campaign for We ii wesnoth-1.9-low 1:1.9.3-1 Legend of Wesmere official campa ii wesnoth-1.9-nr1:1.9.3-1 Northern Rebirth official campai ii wesnoth-1.9-sof 1:1.9.3-1 The Sceptre of Fire official cam ii wesnoth-1.9-sotbe 1:1.9.3-1 Son of the Black-Eye official ca ii wesnoth-1.9-thot 1:1.9.3-1 The Hammer of Thursagan official ii wesnoth-1.9-trow 1:1.9.3-1 The Rise of Wesnoth official cam ii wesnoth-1.9-tsg 1:1.9.3-1 The South Guard official campaig ii wesnoth-1.9-ttb 1:1.9.3-1 A Tale of Two Brothers official ii wesnoth-1.9-utbs 1:1.9.3-1 Under the Burning Suns official Versions of packages wesnoth-1.9 recommends: ii wesnoth-1.9-music 1:1.9.3-1 music files for Wesnoth (branch 1. wesnoth-1.9 suggests no packages. -- no debconf information -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#617265: wesnoth-1.9: New version 1.9.4 is out for a long time already. PLEASE update.
tags 617265 + help thanks * Zaar Hai stronghold.dev.fornova@fornova.net [2011-03-07 18:18:17 CET]: Good dear wesnoth maintainer. First of all I'm really happy that development versions of wesnoth are availabe in Debian. Its really nice to have latest and greatest of this excellent game. Version 1.9.4 is out for quite some time. Can you please update current wesnoth-1.9 packages to 1.9.4? Actually, the update is delayed for several reason: I was busy with the squeeze release from the Webmaster Team point of view, and the aftermath of it. But the most important reason, which made it impossible to just squeeze in the upgrade straight-forward is that upstream decided to remove the autotools support from the package. This means to completely overhaul the build process in the direction of either cmake or scons which both I'm not really familiar with. I tried to go the cmake direction but it seems like that one isn't really packager friendly so far (but I'm in contact with upstream to get that fixed), and I haven't yet had the chance to dig into how scons might actually go. You have to understand that building wesnoth is a job of well over an hour, and it easily starts to get depressing when one missed a tiny detail which only appears at the end of the build to be crucial. Said all that, 1.9 is, as you pointed out yourself, a development branch, so support for it isn't very high on my agenda of things to do when there are other more pressing issues around. Any help is appreciated to get it working, I've started to give it a try in the VCS repository already, so if you want to help out you are invited to give it a shot. Enjoy, Rhonda -- Like what I package? Flattr it! http://flattr.com/thing/51231/Package-Maintenance -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
