r14210 - in packages/trunk/alienblaster/debian: . patches source
Barry deFreese
bdefreese at alioth.debian.org
Mon Jun 3 01:12:40 UTC 2013
Author: bdefreese
Date: 2013-06-03 01:12:40 +0000 (Mon, 03 Jun 2013)
New Revision: 14210
Added:
packages/trunk/alienblaster/debian/alienblaster-data.dirs
packages/trunk/alienblaster/debian/alienblaster.dirs
packages/trunk/alienblaster/debian/alienblaster.install
packages/trunk/alienblaster/debian/patches/07-fix_as_needed_build.patch
packages/trunk/alienblaster/debian/source/
packages/trunk/alienblaster/debian/source/format
Modified:
packages/trunk/alienblaster/debian/alienblaster-data.install
packages/trunk/alienblaster/debian/changelog
packages/trunk/alienblaster/debian/compat
packages/trunk/alienblaster/debian/control
packages/trunk/alienblaster/debian/copyright
packages/trunk/alienblaster/debian/patches/series
packages/trunk/alienblaster/debian/rules
Log:
Integrate Moritz M changes and get ready for new upload.
Added: packages/trunk/alienblaster/debian/alienblaster-data.dirs
===================================================================
--- packages/trunk/alienblaster/debian/alienblaster-data.dirs (rev 0)
+++ packages/trunk/alienblaster/debian/alienblaster-data.dirs 2013-06-03 01:12:40 UTC (rev 14210)
@@ -0,0 +1,3 @@
+usr/share/games/alienblaster/images
+usr/share/games/alienblaster/sound
+usr/share/games/alienblaster/cfg
Modified: packages/trunk/alienblaster/debian/alienblaster-data.install
===================================================================
--- packages/trunk/alienblaster/debian/alienblaster-data.install 2013-06-02 12:08:59 UTC (rev 14209)
+++ packages/trunk/alienblaster/debian/alienblaster-data.install 2013-06-03 01:12:40 UTC (rev 14210)
@@ -1,2 +1,3 @@
-#DOCS#
-
+cfg/* /usr/share/games/alienblaster/cfg
+sound/* /usr/share/games/alienblaster/sound
+images/* /usr/share/games/alienblaster/images
Added: packages/trunk/alienblaster/debian/alienblaster.dirs
===================================================================
--- packages/trunk/alienblaster/debian/alienblaster.dirs (rev 0)
+++ packages/trunk/alienblaster/debian/alienblaster.dirs 2013-06-03 01:12:40 UTC (rev 14210)
@@ -0,0 +1,2 @@
+usr/games
+usr/share/applications
Added: packages/trunk/alienblaster/debian/alienblaster.install
===================================================================
--- packages/trunk/alienblaster/debian/alienblaster.install (rev 0)
+++ packages/trunk/alienblaster/debian/alienblaster.install 2013-06-03 01:12:40 UTC (rev 14210)
@@ -0,0 +1,2 @@
+alienblaster /usr/games
+debian/alienblaster.desktop /usr/share/applications
Modified: packages/trunk/alienblaster/debian/changelog
===================================================================
--- packages/trunk/alienblaster/debian/changelog 2013-06-02 12:08:59 UTC (rev 14209)
+++ packages/trunk/alienblaster/debian/changelog 2013-06-03 01:12:40 UTC (rev 14210)
@@ -1,9 +1,37 @@
-alienblaster (1.1.0-5) UNRELEASED; urgency=low
+alienblaster (1.1.0-8) UNRELEASED; urgency=low
- * Remove myself from Uploaders:
+ [ Gonéri Le Bouder ]
+ * Remove myself from Uploaders.
- -- Gonéri Le Bouder <goneri at rulezlan.org> Sun, 19 Apr 2009 16:02:39 +0200
+ [ Barry deFreese ]
+ * Add hardening flags.
+ * Bump compat to 7.
+ * Add misc:Depends to -data package for debhelper.
+ * Replace path to BSD license with actual license text in debian/copyright.
+ * Bump Standards Version to 3.9.4.
+ -- Barry deFreese <bdefreese at debian.org> Sun, 02 Jun 2013 13:49:47 -0400
+
+alienblaster (1.1.0-7) unstable; urgency=low
+
+ * Fix build with --as-needed. Patch by Julian Taylor, thanks.
+ (Closes: #632093)
+
+ -- Moritz Muehlenhoff <jmm at debian.org> Sun, 24 Jul 2011 19:22:58 +0200
+
+alienblaster (1.1.0-6) unstable; urgency=low
+
+ * Minimise rules with dh
+
+ -- Moritz Muehlenhoff <jmm at debian.org> Wed, 13 Jul 2011 21:47:35 +0200
+
+alienblaster (1.1.0-5) unstable; urgency=low
+
+ * Switch to source format 3
+ * Update standards version (no changes necessary)
+
+ -- Moritz Muehlenhoff <jmm at debian.org> Wed, 04 May 2011 22:29:40 +0200
+
alienblaster (1.1.0-4) unstable; urgency=low
* Install the manpage only in alienblaster (Closes: #514403)
Modified: packages/trunk/alienblaster/debian/compat
===================================================================
--- packages/trunk/alienblaster/debian/compat 2013-06-02 12:08:59 UTC (rev 14209)
+++ packages/trunk/alienblaster/debian/compat 2013-06-03 01:12:40 UTC (rev 14210)
@@ -1 +1 @@
-5
+7
Modified: packages/trunk/alienblaster/debian/control
===================================================================
--- packages/trunk/alienblaster/debian/control 2013-06-02 12:08:59 UTC (rev 14209)
+++ packages/trunk/alienblaster/debian/control 2013-06-03 01:12:40 UTC (rev 14210)
@@ -3,8 +3,8 @@
Priority: extra
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Moritz Muehlenhoff <jmm at debian.org>, Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 5), libsdl1.2-dev, libsdl-mixer1.2-dev, quilt
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.16.1~), libsdl1.2-dev, libsdl-mixer1.2-dev
+Standards-Version: 3.9.4
Homepage: http://www.schwardtnet.de/alienblaster/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/alienblaster/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/alienblaster/
@@ -23,6 +23,7 @@
Package: alienblaster-data
Architecture: all
+Depends: ${misc:Depends}
Description: Game data for Alien Blaster
Your mission is simple: Stop the invasion of the aliens and blast them!
.
Modified: packages/trunk/alienblaster/debian/copyright
===================================================================
--- packages/trunk/alienblaster/debian/copyright 2013-06-02 12:08:59 UTC (rev 14209)
+++ packages/trunk/alienblaster/debian/copyright 2013-06-03 01:12:40 UTC (rev 14210)
@@ -39,13 +39,33 @@
The Debian packaging is (C) 2008, Moritz Muehlenhoff <jmm at debian.org> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
geometry.cc and geometry.h are copyright by Jelle Kok, University of
Amsterdam and licensed under a three-clause BSD license, see
-/usr/share/common-licenses/BSD
+License:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ 2. 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.
+ 3. Neither the name of the University of Amsterdam 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.
Added: packages/trunk/alienblaster/debian/patches/07-fix_as_needed_build.patch
===================================================================
--- packages/trunk/alienblaster/debian/patches/07-fix_as_needed_build.patch (rev 0)
+++ packages/trunk/alienblaster/debian/patches/07-fix_as_needed_build.patch 2013-06-03 01:12:40 UTC (rev 14210)
@@ -0,0 +1,16 @@
+Description: fix build with --as-needed
+ the libraries must be behind the object files needing them
+Author: Julian Taylor <jtaylor.debian at googlemail.com>
+Index: alienblaster-1.1.0/src/Makefile
+===================================================================
+--- alienblaster-1.1.0.orig/src/Makefile 2011-06-29 17:46:42.126858807 +0200
++++ alienblaster-1.1.0/src/Makefile 2011-06-29 17:46:57.836858813 +0200
+@@ -47,7 +47,7 @@
+ @echo ""
+ @echo ""
+ @echo "Linking $@"
+- @$(COMPILER) $(GAME_LIBS) -o $(GAME_NAME) $(OBJECT_FILES)
++ @$(COMPILER) -o $(GAME_NAME) $(OBJECT_FILES) $(GAME_LIBS)
+ mv $(GAME_NAME) ../
+
+ %.o: %.cc
Modified: packages/trunk/alienblaster/debian/patches/series
===================================================================
--- packages/trunk/alienblaster/debian/patches/series 2013-06-02 12:08:59 UTC (rev 14209)
+++ packages/trunk/alienblaster/debian/patches/series 2013-06-03 01:12:40 UTC (rev 14210)
@@ -4,4 +4,5 @@
04-cflags.patch
05-fix-exec-name.patch
06-fix-highscore.patch
+07-fix_as_needed_build.patch
Modified: packages/trunk/alienblaster/debian/rules
===================================================================
--- packages/trunk/alienblaster/debian/rules 2013-06-02 12:08:59 UTC (rev 14209)
+++ packages/trunk/alienblaster/debian/rules 2013-06-03 01:12:40 UTC (rev 14210)
@@ -1,93 +1,12 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
-include /usr/share/quilt/quilt.make
+%:
+ dh $@
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- touch configure-stamp
-
-build: patch build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
-
- $(MAKE)
- touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
-
- touch $@
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-arch-stamp build-indep-stamp configure-stamp
-
- $(MAKE) clean
+override_dh_clean:
rm -f ./alienblaster
rm -f src/Makefile.dep
-
- dh_clean
-
-install: install-indep install-arch
-install-indep:
- dh_testdir
- dh_testroot
- dh_clean -k -i
-
- mkdir -p ./debian/alienblaster-data/usr/share/games/alienblaster/images
- mkdir -p ./debian/alienblaster-data/usr/share/games/alienblaster/sound
- mkdir -p ./debian/alienblaster-data/usr/share/games/alienblaster/cfg
-
- cp ./cfg/* ./debian/alienblaster-data/usr/share/games/alienblaster/cfg
- cp ./sound/* ./debian/alienblaster-data/usr/share/games/alienblaster/sound
- cp ./images/* ./debian/alienblaster-data/usr/share/games/alienblaster/images
-
- dh_install -i
-
-install-arch:
- dh_testdir
- dh_testroot
- dh_clean -k -s
-
- mkdir -p ./debian/alienblaster/usr/games
- mkdir -p ./debian/alienblaster/usr/share/applications
- cp ./alienblaster ./debian/alienblaster/usr/games
- cp ./debian/alienblaster.desktop ./debian/alienblaster/usr/share/applications
-
- dh_install -s
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
- dh_testdir
- dh_testroot
- dh_installchangelogs CHANGELOG
- dh_installdocs
- dh_installmenu
- dh_installman
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+ dh_clean
Added: packages/trunk/alienblaster/debian/source/format
===================================================================
--- packages/trunk/alienblaster/debian/source/format (rev 0)
+++ packages/trunk/alienblaster/debian/source/format 2013-06-03 01:12:40 UTC (rev 14210)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-games-commits
mailing list