[blockattack] 23/88: blockattack 1.3, remove better_scons.patch, compress_manpage_with_better_compression.patch, merged_desktopfile.patch
Markus Koschany
apo-guest at moszumanska.debian.org
Wed Jan 6 11:53:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository blockattack.
commit 2cc4625ced009379510bbfb86a7e02ecc32f7cd2
Author: Gonéri Le Bouder <goneri at rulezlan.org>
Date: Fri Sep 15 08:41:50 2006 +0000
blockattack 1.3, remove better_scons.patch, compress_manpage_with_better_compression.patch, merged_desktopfile.patch
---
debian/changelog | 4 +-
debian/patches/better_scons.patch | 170 ---------------------
debian/patches/build_with_enet1_0.diff | 13 ++
.../compress_manpage_with_better_compression.patch | 8 -
debian/patches/merged_desktopfile.patch | 21 ---
debian/patches/series | 4 +-
debian/rules | 5 +-
7 files changed, 17 insertions(+), 208 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f17a37c..c0ea46d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-blockattack (1.2.2-1) unstable; urgency=low
+blockattack (1.3.0-1) unstable; urgency=low
* Initial release Closes: #368395
- -- Gonéri Le Bouder <goneri at rulezlan.org> Thu, 17 Aug 2006 20:12:08 +0200
+ -- Gonéri Le Bouder <goneri at rulezlan.org> Thu, 14 Sep 2006 11:55:00 +0200
diff --git a/debian/patches/better_scons.patch b/debian/patches/better_scons.patch
deleted file mode 100644
index e42d027..0000000
--- a/debian/patches/better_scons.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Index: blockattack-1.2.2/SConstruct
-===================================================================
---- blockattack-1.2.2.orig/SConstruct 2006-06-29 22:49:44.000000000 +0200
-+++ blockattack-1.2.2/SConstruct 2006-08-20 19:53:44.000000000 +0200
-@@ -1,7 +1,10 @@
- # Option #
- opts = Options(ARGUMENTS)
-+opts.Add('destdir', 'Staging area to install BlockAttack to. Useful for packagers.', '')
- opts.Add('prefix', 'Destination directory', '/usr/local')
- opts.Add('sharedir', 'Directory to use to store data file', '$prefix/share/blockattack')
-+opts.Add('bindir', 'Directory to use to store data file', '$prefix/bin')
-+opts.Add('mandir', 'Directory to use to store data file', '$prefix/share/man')
-
- # Sources #
- src = Split("""main.cpp
-@@ -34,12 +37,12 @@
- # manpage
- SConscript('man/SConscript')
- # icons menu
--env.Install ('$prefix/pixmaps/',['blockattack32.xpm','blockattack64.xpm'])
--env.Alias('install', ['$prefix/pixmaps'])
-+env.Install ('$destdir/$prefix/share/pixmaps/',['blockattack32.xpm','blockattack64.xpm'])
-+env.Alias('install', ['$destdir/$prefix/share/pixmaps/'])
-
--env.Install ('$prefix/applications/',['blockattack.desktop'])
--env.Alias('install', ['$prefix/applications'])
-+env.Install ('$destdir/$prefix/share/applications/',['blockattack.desktop'])
-+env.Alias('install', ['$destdir/$prefix/share/applications'])
-
--# Install #
--env.Install('$prefix/games/', blockattack)
--env.Alias('install', ['$prefix/games/'])
-+# Install blockattack itself
-+env.Install('$destdir/$bindir/', blockattack)
-+env.Alias('install', ['$destdir/$bindir/'])
-Index: blockattack-1.2.2/Game/SConscript
-===================================================================
---- blockattack-1.2.2.orig/Game/SConscript 2006-06-25 18:39:01.000000000 +0200
-+++ blockattack-1.2.2/Game/SConscript 2006-08-20 19:51:20.000000000 +0200
-@@ -3,7 +3,7 @@
- #-------------#
- Import('*')
-
--env.Install ('$sharedir/gfx/garbage/',[
-+env.Install ('$destdir/$sharedir/gfx/garbage/',[
- 'gfx/garbage/garbageB.png',
- 'gfx/garbage/garbageBL.png',
- 'gfx/garbage/garbageBR.png',
-@@ -16,15 +16,15 @@
- 'gfx/garbage/garbageT.png',
- 'gfx/garbage/garbageTL.png',
- 'gfx/garbage/garbageTR.png'])
--env.Alias('install', ['$sharedir/gfx/garbage'])
-+env.Alias('install', ['$destdir/$sharedir/gfx/garbage'])
-
--env.Install ('$sharedir/gfx/counter/',[
-+env.Install ('$destdir/$sharedir/gfx/counter/',[
- 'gfx/counter/1.png',
- 'gfx/counter/2.png',
- 'gfx/counter/3.png'])
--env.Alias('install', ['$sharedir/gfx/counter'])
-+env.Alias('install', ['$destdir/$sharedir/gfx/counter'])
-
--env.Install ('$sharedir/gfx/balls/',[
-+env.Install ('$destdir/$sharedir/gfx/balls/',[
- 'gfx/balls/ballYellow.png',
- 'gfx/balls/ballTurkish.png',
- 'gfx/balls/ballRed.png',
-@@ -32,33 +32,33 @@
- 'gfx/balls/ballGreen.png',
- 'gfx/balls/ballGray.png',
- 'gfx/balls/ballBlue.png'])
--env.Alias('install', ['$sharedir/gfx/balls'])
-+env.Alias('install', ['$destdir/$sharedir/gfx/balls'])
-
--env.Install ('$sharedir/gfx/animations/bomb/',[
-+env.Install ('$destdir/$sharedir/gfx/animations/bomb/',[
- 'gfx/animations/bomb/bomb_1.png',
- 'gfx/animations/bomb/bomb_2.png'])
--env.Alias('install', ['$sharedir/gfx/animations'])
-+env.Alias('install', ['$destdir/$sharedir/gfx/animations'])
-
--env.Install ('$sharedir/gfx/animations/explosion/',[
-+env.Install ('$destdir/$sharedir/gfx/animations/explosion/',[
- 'gfx/animations/explosion/3.png',
- 'gfx/animations/explosion/2.png',
- 'gfx/animations/explosion/1.png',
- 'gfx/animations/explosion/0.png'])
--env.Alias('install', ['$sharedir/gfx/animations/explosion'])
-+env.Alias('install', ['$destdir/$sharedir/gfx/animations/explosion'])
-
-
--env.Install ('$sharedir/gfx/animations/cursor/',[
-+env.Install ('$destdir/$sharedir/gfx/animations/cursor/',[
- 'gfx/animations/cursor/2.png',
- 'gfx/animations/cursor/1.png'])
--env.Alias('install', ['$sharedir/gfx/animations/cursor'])
-+env.Alias('install', ['$destdir/$sharedir/gfx/animations/cursor'])
-
-
--env.Install ('$sharedir/gfx/animations/ready/',[
-+env.Install ('$destdir/$sharedir/gfx/animations/ready/',[
- 'gfx/animations/ready/ready_2.png',
- 'gfx/animations/ready/ready_1.png'])
--env.Alias('install', ['$sharedir/gfx/animations/ready'])
-+env.Alias('install', ['$destdir/$sharedir/gfx/animations/ready'])
-
--env.Install ('$sharedir/gfx/nyBrikker/',[
-+env.Install ('$destdir/$sharedir/gfx/nyBrikker/',[
- 'gfx/nyBrikker/yellow.png',
- 'gfx/nyBrikker/turkish.png',
- 'gfx/nyBrikker/red.png',
-@@ -66,10 +66,10 @@
- 'gfx/nyBrikker/grey.png',
- 'gfx/nyBrikker/green.png',
- 'gfx/nyBrikker/blue.png'])
--env.Alias('install', ['$sharedir/gfx/nyBrikker'])
-+env.Alias('install', ['$destdir/$sharedir/gfx/nyBrikker'])
-
-
--env.Install ('$sharedir/gfx/',[
-+env.Install ('$destdir/$sharedir/gfx/',[
- 'gfx/bSave.png',
- 'gfx/bReplays.png',
- 'gfx/bLoad.png',
-@@ -137,9 +137,9 @@
- 'gfx/iDraw.png',
- 'gfx/bOff.png',
- 'gfx/mouse.png'])
--env.Alias('install', ['$sharedir/gfx'])
-+env.Alias('install', ['$destdir/$sharedir/gfx'])
-
--env.Install ('$sharedir/sound/',[
-+env.Install ('$destdir/$sharedir/sound/',[
- 'sound/applause.ogg',
- 'sound/whistleblow.ogg',
- 'sound/heartbeat3.ogg',
-@@ -148,14 +148,14 @@
- 'sound/cameraclick.ogg',
- 'sound/pop.ogg',
- 'sound/counter.ogg'])
--env.Alias('install', ['$sharedir/sound'])
-+env.Alias('install', ['$destdir/$sharedir/sound'])
-
--env.Install ('$sharedir/res/',[
-+env.Install ('$destdir/$sharedir/res/',[
- 'res/testPuzzles',
- 'res/copy',
- 'res/puzzle.levels'])
--env.Alias('install', ['$sharedir/res'])
-+env.Alias('install', ['$destdir/$sharedir/res'])
-
--env.Install ('$sharedir/music/',[
-+env.Install ('$destdir/$sharedir/music/',[
- 'music/bgMusic.ogg'])
--env.Alias('install', ['$sharedir/music'])
-+env.Alias('install', ['$destdir/$sharedir/music'])
-Index: blockattack-1.2.2/man/SConscript
-===================================================================
---- blockattack-1.2.2.orig/man/SConscript 2006-06-26 15:54:23.000000000 +0200
-+++ blockattack-1.2.2/man/SConscript 2006-08-20 19:53:05.000000000 +0200
-@@ -3,6 +3,6 @@
- #-------------#
- Import('*')
-
--env.Install ('$prefix/man/man6/','blockattack.6.gz')
--env.Alias('install', '$prefix/man/man6/')
-+env.Install ('$destdir/$mandir/man6/','blockattack.6.gz')
-+env.Alias('install', '$destdir/$mandir/man6/')
-
diff --git a/debian/patches/build_with_enet1_0.diff b/debian/patches/build_with_enet1_0.diff
new file mode 100644
index 0000000..5afa6a9
--- /dev/null
+++ b/debian/patches/build_with_enet1_0.diff
@@ -0,0 +1,13 @@
+Index: blockattack-1.3.0/main.cpp
+===================================================================
+--- blockattack-1.3.0.orig/main.cpp 2006-09-15 10:17:10.000000000 +0200
++++ blockattack-1.3.0/main.cpp 2006-09-15 10:17:21.000000000 +0200
+@@ -2524,7 +2524,7 @@
+ {
+ if(weAreAClient)
+ {
+- enet_peer_disconnect (peer);
++ enet_peer_disconnect (peer,0);
+ SDL_Delay(20);
+ enet_host_destroy(client);
+ weAreAClient = false;
diff --git a/debian/patches/compress_manpage_with_better_compression.patch b/debian/patches/compress_manpage_with_better_compression.patch
deleted file mode 100644
index b7b1917..0000000
--- a/debian/patches/compress_manpage_with_better_compression.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-Index: blockattack-1.2.2/man/README
-===================================================================
---- blockattack-1.2.2.orig/man/README 2006-08-20 20:54:41.000000000 +0200
-+++ blockattack-1.2.2/man/README 2006-08-20 20:54:48.000000000 +0200
-@@ -1,2 +1,2 @@
- to regenerate the manpage:
--docbook-to-man blockattack.sgml|gzip > blockattack.6.gz
-+docbook-to-man blockattack.sgml|gzip -9 > blockattack.6.gz
diff --git a/debian/patches/merged_desktopfile.patch b/debian/patches/merged_desktopfile.patch
deleted file mode 100644
index ce2fbf4..0000000
--- a/debian/patches/merged_desktopfile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: blockattack-1.2.2/blockattack.desktop
-===================================================================
---- blockattack-1.2.2.orig/blockattack.desktop 2006-08-20 19:59:01.000000000 +0200
-+++ blockattack-1.2.2/blockattack.desktop 2006-08-20 20:00:12.000000000 +0200
-@@ -4,11 +4,11 @@
- Name=Block Attack - Rise of the Blocks
- Comment=Switch blocks so they match
- GenericName=Block Attack
-+Comment[ro_RO]=Ridicarea blocurilor
-+Comment[da_DK]=Byt blokke så de passer sammen
-+Comment[fr_FR]=Empilez les blocks
- Exec=blockattack
--Icon=/usr/share/pixmaps/blockattack.xpm
-+Icon=blockattack32
- Terminal=false
- Type=Application
--Categories=Application;Game;BlocksGame;
--GenericName[da_DK]=Block Attack
--Comment[da_DK]=Byt blokke så de passer sammen
--Name[da_DK]=Block Attack - Rise of the Blocks
-+Categories=Application;Game;ArcadeGame
diff --git a/debian/patches/series b/debian/patches/series
index b6c15cf..89d0639 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-better_scons.patch
-merged_desktopfile.patch
-compress_manpage_with_better_compression.patch
+build_with_enet1_0.diff
diff --git a/debian/rules b/debian/rules
index d6507b0..c87646a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,7 @@ build-stamp:
clean:
dh_testdir
scons -c
+ rm -f .sconsign.dblite
- QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
dh_clean
@@ -23,10 +24,6 @@ install: build
dh_installdirs
find Game -type f -exec chmod 644 {} \;
scons prefix=/usr bindir=/usr/games mandir=/usr/share/man sharedir=/usr/share/games/bockattack destdir=$(PWD)/debian/blockattack install
- # E: blockattack; Manual page /usr/share/man/man6/blockattack.6.gz is not compressed with max compression.
- # Upstream may have fix this for the next release
- gunzip debian/blockattack/usr/share/man/man6/blockattack.6.gz
- gzip -9 debian/blockattack/usr/share/man/man6/blockattack.6
binary-indep: build install
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/blockattack.git
More information about the Pkg-games-commits
mailing list