tags 595448 + patch pending
thanks

Dear maintainer,

I've prepared an NMU for glob2 (versioned as 0.9.4.4-2.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
  .''`.
 :  :' :   Luca Falavigna <dktrkr...@debian.org>
 `.  `'
   `-
diff -u glob2-0.9.4.4/debian/rules glob2-0.9.4.4/debian/rules
--- glob2-0.9.4.4/debian/rules
+++ glob2-0.9.4.4/debian/rules
@@ -44,6 +44,7 @@
 	scons -c
 
 	rm -rf .sconf_temp/ .sconsign.dblite options_cache.py config.log config.h scons/*.pyc
+	rm -f debian/patches/tutorial-part4.map.bspatch
 
 install: build
 	dh_testdir
@@ -55,6 +56,10 @@
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/games/glob2 $(CURDIR)/debian/tmp/usr/games
 
 	cp -a campaigns/ data/ maps/ scripts/ $(CURDIR)/debian/tmp/usr/share/games/glob2
+	uudecode -o debian/patches/tutorial-part4.map.bspatch debian/patches/tutorial-part4.map.uuencode
+	bspatch campaigns/tutorial-part4.map \
+		`find $(CURDIR)/debian/tmp -name "*tutorial-part4.map"` \
+		debian/patches/tutorial-part4.map.bspatch
 	cp -a src/glob2 $(CURDIR)/debian/tmp/usr/games/
 	find $(CURDIR)/debian/tmp/usr/share/games/glob2 -type f -exec chmod 664 {} \;
 	find $(CURDIR)/debian/tmp/usr/share/games/glob2 -name SConscript -o -name \*.py -o -name \*.sh -o -name \*.perl | xargs rm
diff -u glob2-0.9.4.4/debian/control glob2-0.9.4.4/debian/control
--- glob2-0.9.4.4/debian/control
+++ glob2-0.9.4.4/debian/control
@@ -2,7 +2,7 @@
 Section: games
 Priority: optional
 Maintainer: David Martínez Moreno <en...@debian.org>
-Build-Depends: debhelper (>> 6.0.0), quilt (>= 0.40), scons, libsdl1.2-dev (>=1.2.0), libsdl-image1.2-dev (>=1.2.0), libsdl-net1.2-dev (>=1.2.0), libsdl-ttf2.0-dev, libglu1-mesa-dev | libglu-dev, libvorbis-dev, libspeex-dev, libfreetype6-dev, libboost-dev, libboost-thread-dev, libboost-date-time-dev, libfribidi-dev, portaudio19-dev, libboost-math-dev
+Build-Depends: debhelper (>> 6.0.0), quilt (>= 0.40), scons, libsdl1.2-dev (>=1.2.0), libsdl-image1.2-dev (>=1.2.0), libsdl-net1.2-dev (>=1.2.0), libsdl-ttf2.0-dev, libglu1-mesa-dev | libglu-dev, libvorbis-dev, libspeex-dev, libfreetype6-dev, libboost-dev, libboost-thread-dev, libboost-date-time-dev, libfribidi-dev, portaudio19-dev, libboost-math-dev, bsdiff, sharutils
 Standards-Version: 3.8.4
 Homepage: http://globulation2.org
 
diff -u glob2-0.9.4.4/debian/changelog glob2-0.9.4.4/debian/changelog
--- glob2-0.9.4.4/debian/changelog
+++ glob2-0.9.4.4/debian/changelog
@@ -1,3 +1,16 @@
+glob2 (0.9.4.4-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/tutorial-part4.map.uuencode:
+    - Patch tutorial-part4.map to adjust size of the map in order to fix
+      a runtime crash during the game (Closes: #595448).
+  * debian/control:
+    - Build-depend on bspatch and sharutils, bspatch and uudecode needed.
+  * debian/rules:
+    - UUdecode patch and apply to binary file.
+
+ -- Luca Falavigna <dktrkr...@debian.org>  Tue, 24 Aug 2011 00:29:16 +0200
+
 glob2 (0.9.4.4-2) unstable; urgency=low
 
   * Acknowledged NMU.  Thank you, Gregor!
only in patch2:
unchanged:
--- glob2-0.9.4.4.orig/debian/patches/tutorial-part4.map.uuencode
+++ glob2-0.9.4.4/debian/patches/tutorial-part4.map.uuencode
@@ -0,0 +1,6 @@
+begin-base64 644 /dev/stdout
+QlNESUZGNDA3AAAAAAAAADYAAAAAAAAAnPkJAAAAAABCWmg5MUFZJlNZiIOM
+KQAAB8pgwCAAIAABQAAABAAgIAAxDAEZqaaPGkUkOvi7kinChIREHGFIQlpo
+OTFBWSZTWTWRPX4AAMDAINAAAAQAKCAAMM0AUpMnQFuQEN0oFXYQE+LuSKcK
+EgayJ6/AQlpoORdyRThQkAAAAAA=
+====

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to