r3031 - packages/trunk/prboom/debian

[Jon Dowland]

Author: jmtd-guest
Date: 2007-06-20 18:48:43 +0000 (Wed, 20 Jun 2007)
New Revision: 3031

Added:
   packages/trunk/prboom/debian/base.sng
   packages/trunk/prboom/debian/fix_upstream.sh
Modified:
   packages/trunk/prboom/debian/bad_menu_lumps.txt
Log:
fix a typo in bad_menu_lumps
add base.sng; a blank canvas SNG
add fix_upstream.sh, converts an upstream tarball to a DFSG one


Modified: packages/trunk/prboom/debian/bad_menu_lumps.txt
===================================================================
--- packages/trunk/prboom/debian/bad_menu_lumps.txt	2007-06-20 18:46:58 UTC (rev 3030)
+++ packages/trunk/prboom/debian/bad_menu_lumps.txt	2007-06-20 18:48:43 UTC (rev 3031)
@@ -6,7 +6,7 @@
 m_demos.gif	74	12	demos
 m_enem.gif	91	15	enemies
 m_feat.gif	108	15	features
-m_generl.gif	96	15	generael
+m_generl.gif	96	15	general
 m_horsen.gif	256	16	horizontal
 m_hud.gif	205	12	heads up display
 m_keybnd.gif	152	15	key bindings

Added: packages/trunk/prboom/debian/base.sng
===================================================================
--- packages/trunk/prboom/debian/base.sng	                        (rev 0)
+++ packages/trunk/prboom/debian/base.sng	2007-06-20 18:48:43 UTC (rev 3031)
@@ -0,0 +1,26 @@
+#SNG: from stdin
+IHDR {
+    width: 8; height: 8; bitdepth: 8;
+    using color;
+}
+pHYs {xpixels: 2835; ypixels: 2835; per: meter;}  # (72 dpi)
+tIME {
+    # 31 Dec 2006 14:52:15 GMT
+    year:   2006
+    month:  12
+    day:    31
+    hour:   14
+    minute: 52
+    second: 15
+}
+IMAGE {
+    pixels hex
+    00ffff 00ffff 00ffff 00ffff 00ffff 00ffff 00ffff 00ffff
+    00ffff 00ffff 00ffff 00ffff 00ffff 00ffff 00ffff 00ffff
+    00ffff 00ffff 00ffff 00ffff 00ffff 00ffff 00ffff 00ffff
+    00ffff 00ffff 00ffff 00ffff 00ffff 00ffff 00ffff 00ffff
+    00ffff 00ffff 00ffff 00ffff 00ffff 00ffff 00ffff 00ffff
+    00ffff 00ffff 00ffff 00ffff 00ffff 00ffff 00ffff 00ffff
+    00ffff 00ffff 00ffff 00ffff 00ffff 00ffff 00ffff 00ffff
+    00ffff 00ffff 00ffff 00ffff 00ffff 00ffff 00ffff 00ffff
+}

Added: packages/trunk/prboom/debian/fix_upstream.sh
===================================================================
--- packages/trunk/prboom/debian/fix_upstream.sh	                        (rev 0)
+++ packages/trunk/prboom/debian/fix_upstream.sh	2007-06-20 18:48:43 UTC (rev 3031)
@@ -0,0 +1,121 @@
+#!/bin/sh
+set -u
+set -e
+
+# fix_upstream.sh: take a prboom tarball as an argument, strip out
+# the non-dfsg free stuff.
+
+# requires deutex, sng and imagemagick to be installed
+
+usage() { echo "usage: $0 tarball" >&2; }
+
+if [ $# -ne 1 ]; then
+	usage
+	exit 1
+fi
+if [ ! -r "$1" ]; then
+	echo "cannot read '$1'" >&2
+	exit 1
+fi
+ORIG="$1"
+
+# orig should be prboom-x.y.z.tar.gz
+ORIGRE='prboom-[0-9]\+\.[0-9]\+\.[0-9]\+\.tar\.gz'
+if ! echo "$ORIG" | grep -q "$ORIGRE"; then
+	echo "input file should match the regexp '$ORIGRE'" >&2
+	exit 1
+fi
+ORIGVERSION=`echo "$ORIG" | sed 's!prboom-\(.*\)\.tar\.gz!\1!'`
+DFSGVERSION="$ORIGVERSION+dfsg"
+ORIGDIR=`pwd`
+WD=`mktemp -t -d prboom_fix_upstream.XXXXXX`
+trap 'echo "working directory was \"$WD\""' INT QUIT
+
+(
+	cp -p "$ORIG" "$WD"
+	ORIG=`basename "$ORIG"`
+	cd "$WD"
+
+	tar -xf "$ORIG"
+	if [ ! -d "prboom-$ORIGVERSION" ]; then
+		echo "the tarball did not unpack to "\
+		     "\"prboom-$ORIGVERSION\" as expected" >&2
+		exit 1
+	fi
+
+	( # fix the prboom.wad file
+
+		# input files for graphics regeneration
+
+		# we'll assume the input files are in debian/* unless
+		# we're already in a directory called debian
+		# WD is "debian" in which case
+		BASE=base.png 
+		BADLUMPS=bad_menu_lumps.txt
+		if [ `basename "$ORIGDIR"` != "debian" ]; then
+			BADLUMPS="debian/$BADLUMPS"
+			BASE="debian/$BASE"
+		fi
+		BADLUMPS="$ORIGDIR/$BADLUMPS"
+		BASE="$ORIGDIR/$BASE"
+
+		mkdir wad
+		mv "prboom-$ORIGVERSION/data/prboom.wad" wad/prboom.wad
+		mv "prboom-$ORIGVERSION/data/prboom.txt" wad/prboom.txt
+		cd wad
+
+		deutex -gif -rgb 0 255 255 -xtract prboom.wad >/dev/null
+		# these psuedo-lumps are used as markers in prboom but
+		# deutex forgets about them on extract
+		touch lumps/{c,b}_{start,end}.lmp
+
+		# remove the DOG resources
+		<prboom.txt \
+			grep -v DOG  |
+			grep -v DSDG \
+		>wadinfo.txt
+
+		# substitute the menu graphics with imagemagick
+		while read line; do
+			set -- $line
+			output=$1
+			width=$2
+			height=$3
+			shift 3
+			text=`echo "$*" | tr a-z A-Z`
+
+			convert \
+				-resize "${width}x${height}!" \
+				"$BASE" tmpfile.png
+
+			convert -fill red -font Helvetica-Bold \
+				-pointsize 16                  \
+				-gravity west                  \
+				+antialias                     \
+				-draw "text 0,0 '$text'"       \
+				tmpfile.png "graphics/$output"
+
+
+		done < "$BADLUMPS"
+		# generate ones
+
+		# repack the wad
+		mv prboom.wad prboom.wad.old
+		deutex -gif -rgb 0 255 255 -build prboom.wad >/dev/null
+
+		# move the fixed wad back over
+		cd ..
+		mv wad/prboom.wad "prboom-$ORIGVERSION/data/prboom.wad"
+		rm -r wad
+	) || exit 1
+
+	# repack
+	mv "prboom-$ORIGVERSION" "prboom-$DFSGVERSION"
+	tar -czf "prboom_$DFSGVERSION.orig.tar.gz" "prboom-$DFSGVERSION"
+	rm -r "prboom-$DFSGVERSION"
+
+	rm "$ORIG"
+)
+mv "$WD/prboom_$DFSGVERSION.orig.tar.gz" .
+echo "created prboom_$DFSGVERSION.orig.tar.gz"
+rmdir "$WD"


Property changes on: packages/trunk/prboom/debian/fix_upstream.sh
___________________________________________________________________
Name: svn:executable
   + *