[SCM] ballz (platform/puzzle game) branch, master, updated. debian/1.0.1-1-2-gdc4c5ab
Sylvain Beucler
beuc at beuc.net
Sun May 23 11:57:24 UTC 2010
The following commit has been merged in the master branch:
commit dc4c5ab44e220ce2d2c50d2a1ba9c4492a650a49
Author: Sylvain Beucler <beuc at beuc.net>
Date: Sun May 23 13:46:26 2010 +0200
NM clean-up ;)
diff --git a/debian/changelog b/debian/changelog
index 5ddcd18..d6e7ee5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+ballz (1.0.1-2) unstable; urgency=low
+
+ * Use debhelper 7
+ * Use 3.0 source format
+ * Mention that 'BSD-license' has a slightly different wording than the
+ canonical BSD license (namely, references to the university or to the
+ regents were changed to match the developers team)
+ * Precise GPL version used for the packaging
+ * Don't build ballz.xpm which was never used, and so drop build-depends
+ to imagemagick
+ * Ignore 'ancien-libtool' lintian warning, caused by unused ltmain.sh
+ lying around
+
+ -- Sylvain Beucler <beuc at beuc.net> Sun, 23 May 2010 13:35:50 +0200
+
ballz (1.0.1-1) unstable; urgency=low
* Initial release (Closes: #500467)
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..66898f7
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+ltmain.sh
diff --git a/debian/control b/debian/control
index 89fbf20..c50c6a5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Sylvain Beucler <beuc at beuc.net>
-Build-Depends: debhelper (>= 7), autotools-dev, imagemagick, libguichan-dev, libdumb1-dev, libaldmb1-dev
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libguichan-dev, libdumb1-dev, libaldmb1-dev
+Standards-Version: 3.8.4
Homepage: http://www.allegro.cc/forums/thread/590831
Package: ballz
Architecture: any
-Depends: ${shlibs:Depends}, ballz-data (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ballz-data (= ${source:Version})
Description: B.A.L.L.Z. - platform/puzzle game where you control a rolling ball
The game is a platformer with some puzzle elements. You take control
of a ball which is genetically modifed by the British secret
@@ -21,15 +21,17 @@ Description: B.A.L.L.Z. - platform/puzzle game where you control a rolling ball
acronym for 'TINS is not Speedhack'.
Package: ballz-data
-Recommends: ballz
Architecture: all
+Depends: ${misc:Depends}
+Recommends: ballz
Description: B.A.L.L.Z. - game data
This package contains data files required by the game B.A.L.L.Z.
Package: ballz-dbg
-Architecture: any
+Section: debug
Priority: extra
-Depends: ballz (= ${binary:Version})
+Architecture: any
+Depends: ${misc:Depends}, ballz (= ${binary:Version})
Description: debugging symbols for ballz
The game is a platformer with some puzzle elements. You take control
of a ball which is genetically modifed by the British secret
diff --git a/debian/copyright b/debian/copyright
index 0ff6d61..2a27ee3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,27 +17,40 @@ Copyright:
License:
- Redistribution and use in source and binary forms, with or without
- modification, are permitted under the terms of the BSD License.
-
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
-On Debian systems, the complete text of the BSD License can be
-found in `/usr/share/common-licenses/BSD'.
-
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of the Darkbits nor the names of its contributors may be
+ used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+(This is the same wording than `/usr/share/common-licenses/BSD' except
+that references to the university or to the regents were changed to
+match the developers team).
Packaging
=========
-The Debian packaging is (C) 2008, Sylvain Beucler <beuc at beuc.net> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is (C) 2008, 2010, Sylvain Beucler
+<beuc at beuc.net> and is licensed under the GPL, either version 3, or
+(at your option) any later version, see
+`/usr/share/common-licenses/GPL-3'.
diff --git a/debian/rules b/debian/rules
index 1a6c92b..83000d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,92 +1,27 @@
#!/usr/bin/make -f
# -*- makefile -*-
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets by Bill Allombert 2001
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
-# 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)
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-else
-CROSS= --build $(DEB_BUILD_GNU_TYPE)
-endif
-config.status: configure
- dh_testdir
-# $(MAKE) -f /usr/share/quilt/quilt.make patch
+%:
+ dh --with autotools_dev $@
- ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --bindir=/usr/games --datadir=/usr/share/games CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+override_dh_auto_configure:
+ dh_auto_configure -- --bindir=/usr/games --datadir=/usr/share/games --mandir=/usr/share/man
-
-build: build-stamp
-
-build-stamp: config.status
- dh_testdir
- $(MAKE)
- convert desktop/ballz.png debian/ballz.xpm
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Remove files changed by 'autoreconf' to prevent them showing in the diff.gz
- [ ! -f Makefile ] || $(MAKE) distclean
-# Install autotools-dev's config.sub and config.guess, if newer:
- chmod 755 debian/update-autotools-config.sh
- debian/update-autotools-config.sh .
- rm -f debian/ballz.xpm
-
-# $(MAKE) -f /usr/share/quilt/quilt.make unpatch
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/ballz.
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_install -i --sourcedir=debian/tmp
- dh_installchangelogs -i
- dh_installdocs -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
- dh_install -a --sourcedir=debian/tmp
- dh_installchangelogs -a
- dh_installdocs -a
- dh_installmenu -a
- dh_installman -a
- dh_icons -a
- dh_desktop -a
- dh_strip -a --dbg-package=ballz-dbg
- dh_compress -a
- dh_fixperms -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_strip:
+ # Create -dbg package with debug symbols for gdb
+ dh_strip --dbg-package=ballz-dbg
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..8115902
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,7 @@
+# ltmain.sh is not used: that file must have been lying in the
+# upstream working directory and included by Automake automatically,
+# despite not being used. To prove this, ltmain.sh is removed during
+# the build process without impact (cf. 'debian/clean'), though that
+# doesn't remove it from the source package, since the Debian source
+# package doesn't support removing upstream files.
+ancient-libtool
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/update-autotools-config.sh b/debian/update-autotools-config.sh
deleted file mode 100644
index d30c5c5..0000000
--- a/debian/update-autotools-config.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2006 Sylvain Beucler
-
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-
-# Updates config.guess and config.sub in the target directory only if
-# the autotools-dev version is newer
-
-# http://bugs.debian.org/380481
-
-dest="$1"
-# strip trailing slash for nicer output
-dest=$(echo $dest | sed 's:/$::')
-
-if [ -z $dest ]; then
- echo "Usage: $0 destination"
- exit 1;
-fi
-
-for ext in sub guess; do
- # --version output looks like "GNU config.sub (2006-02-23)"
- v_autotools=$(/usr/share/misc/config.$ext --version | head -1 | grep -o -E '[0-9]{4}-[0-9]{2}-[0-9]{2}')
- v_upstream=$($dest/config.$ext --version | head -1 | grep -o -E '[0-9]{4}-[0-9]{2}-[0-9]{2}')
- if dpkg --compare-versions "$v_autotools" '>>' "$v_upstream"; then
- echo "Updating $dest/config.$ext"
- cp -f /usr/share/misc/config.$ext $dest
- fi
-done
--
ballz (platform/puzzle game)
More information about the Pkg-games-commits
mailing list