Merge lp:~trldp/supertux/supertux-debian-trunk into lp:~supertux-dev/supertux/supertux-debian-trunk

[trldp]

Clean up packaging, bump version and fix daily builds

I updated the debian files and fixed some errors. In debian/control, I removed some packages that are not used anymore and removed the non-standard field XSBC-Original-Maintainer. I changed debian/rules and debian/changelog to a more standard format (as described on https://www.debian.org/doc/manuals/maint-guide/dreq.en.html#defaultrules and https://www.debian.org/doc/manuals/maint-guide/dreq.en.html#copyright). I also removed some files, since I don't know what they do exactly.

The changes are tested using the receipe https://code.launchpad.net/~trldp/+recipe/supertux-git-daily.

[Liviu Andronic (landronimirc)]

Thanks for working on this! Do I understand correctly that this fixes the build issues that plagued the daily builds during the past weeks?

Also, I notice that you've modified in debian/changelog the versioning scheme:
`supertux (0.3.4-1build1~git)`

Even if not perfectly according to the standard, I very much prefer to have it in a style similar to:
`supertux (0.3.4~git-1build1)`

0.3.4 hasn't yet been released, and the `0.3.4~git` allows for a clear identification of the "daily build" nature of the package. And once 0.3.4 is actually released, then `apt` will play nicely with the update. Can you address this in your patch?

[lp:~trldp/supertux/supertux-debian-trunk]

6. By trldp on 2014-05-15

Change version number

7. By trldp on 2014-05-15

Forgot to add something like -1 to the version number

[trldp (trldp)]

This patch should indeed fix the build issues for the daily builds.

Actually, 0.3.4 has already been released and included in trusty (and utopic). I changed the version number to make sure the git version was newer than the 0.3.4-1build1 in trusty. Now, I changed it now to 0.3.5~git-1, which is also newer than the version included in trusty.

[Liviu Andronic (landronimirc)]

Ooops, I'm clearly out-of-date with Supertux developments.

The revision looks good now. How exactly do I perform the merge? (On github you have a big green Accept Pull Request button, but I'm not sure how things work on Launchpad.)

review: Approve

[trldp (trldp)]

It seems you can't merge using the website (see https://help.launchpad.net/Code/Review). According to http://doc.bazaar.canonical.com/bzr.dev/en/user-guide/merging_changes.html, you have to run a command like
 $ bzr merge lp:~trldp/supertux/supertux-debian-trunk
from your local copy of your bzr branch. Then, commit and push it onto lauchpad.

Oh, and could you also activate Trusty and Utopic in your daily build receipe (so I can remove mine)?

[Liviu Andronic (landronimirc)]

I've now created a SuperTux Team https://launchpad.net/~supertux-dev (not yet associated with SuperTux Project on Launchpad as I don't own that), and added you as a member. I further switched ownership of the relevant branches to `supertux-dev`, so now you should be able to perform the merge yourself. I also activated Trusty and Utopic in the daily build recipe. I also created a new PPA for the daily builds, now owned by `supertux-dev` (in time I will probably disable https://code.launchpad.net/~landronimirc/+archive/supertux-git ). It is a bit inconvenient to change PPAs, but perhaps it is better for the long-term as other contributors could join.

Does this work for you?

=== removed file 'debian/README.source'
--- debian/README.source	2012-12-12 22:11:56 +0000
+++ debian/README.source	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-This package uses dpatch in order to apply patches to the upstream source.
-Patches are stored in debian/patches and their filenames usually end in .dpatch .
-For further details, see the man pages for dpatch and dpatch-edit-patch.
-
-All commands described below should be run from the top directory of the 
-package source tree, unless otherwise stated.
-
- * To generate the fully patched source, in a form ready for
-   editing, that would be built to create Debian packages, run: 
-
-     dpatch apply-all
-
-   Note: This should happen automatically when you run 
-   dpkg-source -x on a dpatch source package.
-
- * To modify the source and save those modifications so that
-   they will be applied when building the package, pick a
-   suitably informative patch file name, for example
-   01_add_README.source_file.dpatch, and then run:
-
-     dpatch-edit-patch 01_add_README.source_file.dpatch
-
-   This will place you in a new shell in a temporary copy of the 
-   source tree.  Make your desired modifications to it, and then 
-   exit the shell to create the patch file containing them (this 
-   file will appear in debian/patches).
-
- * To remove source modifications that are currently being
-   applied when building the package, run:
-
-     dpatch unapply-all

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-12 22:11:56 +0000
+++ debian/changelog	2014-05-15 07:56:28 +0000
@@ -1,3 +1,9 @@
+supertux (0.3.5~git-1) UNRELEASED; urgency=low
+
+  * Update and cleanup of the debian directory
+
+ -- Tobe Deprez <[e-mail]>  Sat, 10 May 2014 12:41:06 +0200
+
 supertux (0.3.4~git-1~precise~ppa1) precise; urgency=low
 
   * Initial import for daily builds.

=== modified file 'debian/compat'
--- debian/compat	2012-12-12 22:11:56 +0000
+++ debian/compat	2014-05-15 07:56:28 +0000
@@ -1,1 +1,1 @@
-5
+9

=== modified file 'debian/control'
--- debian/control	2012-12-12 22:11:56 +0000
+++ debian/control	2014-05-15 07:56:28 +0000
@@ -2,10 +2,10 @@
 Section: games
 Priority: optional
 Maintainer: Liviu Andronic <[e-mail]>
-XSBC-Original-Maintainer: Gürkan Sengün <[e-mail]>
-Uploaders: Bartosz Fenski <[e-mail]>
-Build-Depends: autotools-dev, debhelper (>= 7.0.50~), cmake, quilt (>= 0.46-7~), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libphysfs-dev, libopenal-dev, libvorbis-dev, libogg-dev, libcurl4-gnutls-dev, libboost-dev, libglew-dev
-Standards-Version: 3.8.0
+Uploaders: Bartosz Fenski <[e-mail]>, Tobe Deprez (trldp) <[e-mail]>
+Build-Depends: debhelper (>= 9), cmake, libsdl1.2-dev, libsdl-image1.2-dev, libphysfs-dev, libopenal-dev, 
+               libvorbis-dev, libogg-dev, libboost-dev, libglew-dev
+Standards-Version: 3.9.5
 Homepage: http://supertux.lethargik.org
 
 Package: supertux-git
@@ -17,7 +17,7 @@
  style like the original SuperMario games. This release of SuperTux
  features 9 enemies, 26 playable levels, software and OpenGL rendering
  modes, configurable joystick and keyboard input, new music and
- completly redone graphics.
+ completely redone graphics.
  .
  This is a development snapshot of SuperTux. It may suffer from
  critical bugs and has not been fully tested. Use `supertux-stable',

=== modified file 'debian/copyright'
--- debian/copyright	2012-12-12 22:11:56 +0000
+++ debian/copyright	2014-05-15 07:56:28 +0000
@@ -1,25 +1,38 @@
-This package was debianized by Gürkan Sengün <[e-mail]> on
-Thu,  6 May 2004 10:36:38 +0200.
-
-It was downloaded from http://super-tux.sourceforge.net/
-
-Upstream Authors: Tobias Glaesser <[e-mail]>,
-                  Bill Kendrick <[e-mail]>,
-		  Ricardo Cruz <[e-mail]>,
-		  Ingo Ruhnke <[e-mail]>,
-		  Duong-Khang NGUYEN <[e-mail]>,
-		  Matthias Braun <[e-mail]>,
-		  Ryan Flegel <[e-mail]>
-		  
-		  Graphics:
-		  Ingo Ruhnke <[e-mail]>,
-		  Christopher A. Webber <[e-mail]>
-		  
-		  Level Desgin:
-		  Ingo Ruhnke <[e-mail]>,
-		  Marek Moeckel <[e-mail]>
-
-Copyright by authors mentioned above.
-
-Released under the GNU GPL.
-Please see /usr/share/common-licenses/GPL for the full license.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: supertux
+Source: <http://supertux.lethargik.org/>
+
+Files: *
+Copyright: Tobias Glaesser <[e-mail]>
+ Bill Kendrick <[e-mail]>,
+ Ricardo Cruz <[e-mail]>,
+ Ingo Ruhnke <[e-mail]>,
+ Duong-Khang NGUYEN <[e-mail]>,
+ Matthias Braun <[e-mail]>,
+ Ryan Flegel <[e-mail]>
+ Christopher A. Webber <[e-mail]>
+ Marek Moeckel <[e-mail]>
+License: GPL-3.0+
+
+Files: debian/*
+Copyright: 2004 Gürkan Sengün <[e-mail]>
+ 2012 Liviu Andronic <[e-mail]>
+ 2014 Tobe Deprez <[e-mail]>
+License: GPL-3.0+
+
+License: GPL-3.0+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

=== removed file 'debian/dirs'
--- debian/dirs	2012-12-12 22:11:56 +0000
+++ debian/dirs	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/games
-usr/share/applications

=== removed file 'debian/docs'
--- debian/docs	2012-12-12 22:11:56 +0000
+++ debian/docs	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-README
-WHATSNEW.txt

=== removed file 'debian/menu'
--- debian/menu	2012-12-12 22:11:56 +0000
+++ debian/menu	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-?package(supertux):needs="X11" section="Games/Arcade"\
-  title="SuperTux" command="/usr/games/supertux"\
-  icon="/usr/share/games/supertux/images/icon.xpm"

=== modified file 'debian/rules'
--- debian/rules	2012-12-12 22:11:56 +0000
+++ debian/rules	2014-05-15 07:56:28 +0000
@@ -1,71 +1,30 @@
 #!/usr/bin/make -f
 
+##
+# Debian rules file for supertux
+# Copyright (C) 2014 Tobe Deprez
+#
+# This file is part of supertux
+#
+# Supertux is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# Supertux is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+##
 
-# Uncomment this to turn on verbose mode.
+#Uncomment to turn on verbose mode
 #export DH_VERBOSE=1
 
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-config.status: 
-	dh_testdir
-	cmake . -DCMAKE_BUILD_TYPE=Release -DINSTALL_SUBDIR_BIN=games -DINSTALL_SUBDIR_SHARE=share/games/supertux2 -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG -O2
-
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:  
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	-$(MAKE) clean
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	$(MAKE) PREFIX=/usr DESTDIR=$RPM_BUILD_ROOT DESTDIR=$(CURDIR)/debian/supertux-git/ install
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+%:
+	dh $@
+	
+override_dh_auto_configure:
+	dh_auto_configure --buildsystem=cmake -- -DCMAKE_BUILD_TYPE=Release

=== removed file 'debian/supertux-data.debhelper.log'
--- debian/supertux-data.debhelper.log	2012-12-12 22:11:56 +0000
+++ debian/supertux-data.debhelper.log	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-dh_link
-dh_link
-dh_link

=== removed file 'debian/supertux-data.dirs'
--- debian/supertux-data.dirs	2012-12-12 22:11:56 +0000
+++ debian/supertux-data.dirs	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/share/games/supertux

=== removed file 'debian/supertux-svn-data.debhelper.log'
--- debian/supertux-svn-data.debhelper.log	2012-12-12 22:11:56 +0000
+++ debian/supertux-svn-data.debhelper.log	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-dh_installdirs

=== removed file 'debian/watch'
--- debian/watch	2012-12-12 22:11:56 +0000
+++ debian/watch	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-version=3
-
-opts=downloadurlmangle=s/prdownload/download/ \
-  http://developer.berlios.de/project/showfiles.php?group_id=3467 \
-  http://prdownload.berlios.de/supertux/supertux-([0-9].*)\.tar\.bz2 \
-  debian uupdate