r4284 - in packages/trunk/freedoom: . debian debian/patches

Jon Dowland jmtd-guest at alioth.debian.org
Tue Sep 25 14:46:56 UTC 2007 

Author: jmtd-guest
Date: 2007-09-25 14:46:56 +0000 (Tue, 25 Sep 2007)
New Revision: 4284

Added:
   packages/trunk/freedoom/debian/patches/
   packages/trunk/freedoom/debian/patches/makefile.patch
   packages/trunk/freedoom/debian/patches/series
   packages/trunk/freedoom/debian/patches/version.patch
Removed:
   packages/trunk/freedoom/Makefile
   packages/trunk/freedoom/VERSION
Modified:
   packages/trunk/freedoom/debian/changelog
   packages/trunk/freedoom/debian/control
   packages/trunk/freedoom/debian/rules
Log:
move changes into patch files, use quilt to apply


Deleted: packages/trunk/freedoom/Makefile
===================================================================
--- packages/trunk/freedoom/Makefile	2007-09-24 11:02:19 UTC (rev 4283)
+++ packages/trunk/freedoom/Makefile	2007-09-25 14:46:56 UTC (rev 4284)
@@ -1,154 +0,0 @@
-
-WADS=wads
-CPP=/usr/bin/cpp
-DEUTEX=/usr/games/deutex
-DEUTEX_BASIC_ARGS=-fullsnd -rate accept -rgb 0 255 255
-DEUTEX_ARGS=$(DEUTEX_BASIC_ARGS) -doom2 bootstrap/
-
-OBJS = \
-	$(WADS)/freedoom.wad          \
-	$(WADS)/freedoom_graphics.wad \
-	$(WADS)/freedoom_levels.wad   \
-	$(WADS)/freedoom_sprites.wad  \
-	$(WADS)/freedoom_sounds.wad   \
-	$(WADS)/freedoom_textures.wad \
-	$(WADS)/doom1.wad	          \
-	$(WADS)/doom2.wad             \
-	$(WADS)/freedm.wad
-
-# disable this for now
-#	$(WADS)/freedoom_hires.zip
-
-all : $(OBJS)
-
-subdirs:
-	make -C graphics/titlepic
-	make -C lumps
-	make -C sprites/jond/placeholder
-
-# this is a useless dependency to force builds
-
-force:
-
-# build texture1.txt for different builds
-
-textures/doom2/texture1.txt: textures/combined.txt
-	$(CPP) -DDOOM1 -DDOOM2 < $< > $@
-textures/doom/texture1.txt: textures/combined.txt
-	$(CPP) -DDOOM1 < $< > $@
-textures/freedm/texture1.txt: textures/combined.txt
-	$(CPP) -DFREEDM < $< > $@
-textures/shareware/texture1.txt: textures/combined.txt
-	$(CPP) -DSHAREWARE < $< > $@
-
-textures/%/pnames.txt: textures/%/texture1.txt
-	./extract-pnames.pl < $< > $@
-
-# update wadinfo.txt
-
-wadinfo.txt: buildcfg.txt force textures/doom2/pnames.txt
-	$(CPP) -P -DDOOM2 < $< | ./wadinfo-builder.pl > $@
-wadinfo_sw.txt: buildcfg.txt force textures/shareware/pnames.txt
-	$(CPP) -P -DSHAREWARE < $< | ./wadinfo-builder.pl -dummy > $@
-wadinfo_iwad.txt: buildcfg.txt force textures/doom2/pnames.txt
-	$(CPP) -P -DDOOM2 < $< | ./wadinfo-builder.pl -dummy > $@
-wadinfo_freedm.txt : buildcfg.txt force textures/freedm/pnames.txt
-	$(CPP) -P -DFREEDM < $< | ./wadinfo-builder.pl -dummy > $@
-
-%.wad.gz: %.wad
-	gzip < $< > $@
-	chmod o-r $<
-	md5sum $<.gz > $<.md5sum
-	rm -f $<
-
-#---------------------------------------------------------
-# build wad
-
-$(WADS)/freedoom.wad: wadinfo.txt subdirs force 
-	ln -sf doom2/texture1.txt textures/texture1.txt
-	rm -f $@
-	$(DEUTEX) $(DEUTEX_ARGS) -textures -lumps -patch -flats -sounds -musics -graphics -sprites -build wadinfo.txt $@
-
-#---------------------------------------------------------
-# freedm iwad
-
-$(WADS)/freedm.wad: wadinfo_freedm.txt subdirs force 
-	ln -sf freedm/texture1.txt textures/texture1.txt
-	rm -f $@
-	$(DEUTEX) $(DEUTEX_ARGS) -iwad -build wadinfo_freedm.txt $@
-
-#---------------------------------------------------------
-# iwad
-
-$(WADS)/doom2.wad: wadinfo_iwad.txt subdirs force 
-	ln -sf doom2/texture1.txt textures/texture1.txt
-	rm -f $@
-	$(DEUTEX) $(DEUTEX_ARGS) -iwad -textures -lumps -patch -flats -sounds -musics -graphics -sprites -levels -build wadinfo_iwad.txt $@
-
-#---------------------------------------------------------
-# graphics wad
-
-$(WADS)/freedoom_graphics.wad : wadinfo.txt subdirs force 
-	rm -f $@
-	$(DEUTEX) $(DEUTEX_ARGS) -graphics -lumps -build wadinfo.txt $@
-
-#---------------------------------------------------------
-# build levels wad
-
-$(WADS)/freedoom_levels.wad : wadinfo.txt force 
-	rm -f $@
-	$(DEUTEX) $(DEUTEX_ARGS) -levels -build wadinfo.txt $@
-
-#---------------------------------------------------------
-# build texture wad
-
-$(WADS)/freedoom_textures.wad : wadinfo.txt force 
-	ln -sf doom2/texture1.txt textures/texture1.txt
-	rm -f $@
-	$(DEUTEX) $(DEUTEX_ARGS) -textures -patch -flats -build wadinfo.txt $@
-
-#---------------------------------------------------------
-# build sprites wad
-
-$(WADS)/freedoom_sprites.wad : wadinfo.txt force 
-	rm -f $@
-	$(DEUTEX) $(DEUTEX_ARGS) -sprites -build wadinfo.txt $@
-
-#---------------------------------------------------------
-# build sounds wad
-
-$(WADS)/freedoom_sounds.wad : wadinfo.txt force 
-	rm -f $@
-	$(DEUTEX) $(DEUTEX_ARGS) -sounds -musics -build wadinfo.txt $@
-
-#---------------------------------------------------------
-# shareware iwad
-# 
-# deutex doesnt allow redirects for the filenames in the texture
-# entries, so we have to change the texture1 symlink to point
-# to the shareware wad
-
-$(WADS)/doom1.wad : wadinfo_sw.txt force
-	ln -sf shareware/texture1.txt textures/texture1.txt
-	rm -f $@
-	$(DEUTEX) $(DEUTEX_ARGS) -iwad -build wadinfo_sw.txt $@
-
-dist : $(OBJS)
-	./makepkgs $(OBJS)
-
-clean:
-	rm -f	deutex.log $(OBJS) \
-		./wadinfo.txt ./wadinfo_sw.txt \
-		./wadinfo_freedm.txt ./wadinfo_iwad.txt \
-		 ./lumps/freedoom.lmp \
-		./textures/doom2/pnames.txt \
-		./textures/doom2/texture1.txt \
-		./textures/freedm/pnames.txt \
-		./textures/freedm/texture1.txt \
-		./textures/shareware/pnames.txt \
-		./textures/shareware/texture1.txt \
-		./textures/texture1.txt
-
-	make -C lumps clean
-	make -C graphics/titlepic clean
-	make -C sprites/jond/placeholder clean

Deleted: packages/trunk/freedoom/VERSION
===================================================================
--- packages/trunk/freedoom/VERSION	2007-09-24 11:02:19 UTC (rev 4283)
+++ packages/trunk/freedoom/VERSION	2007-09-25 14:46:56 UTC (rev 4284)
@@ -1 +0,0 @@
-0.5

Modified: packages/trunk/freedoom/debian/changelog
===================================================================
--- packages/trunk/freedoom/debian/changelog	2007-09-24 11:02:19 UTC (rev 4283)
+++ packages/trunk/freedoom/debian/changelog	2007-09-25 14:46:56 UTC (rev 4284)
@@ -6,8 +6,11 @@
   [ Cyril Brulebois ]
   * Added XS-Vcs-Svn and XS-Vcs-Browser fields in the control file.
 
- -- Jon Dowland <jon at alcopop.org>  Sat, 30 Jun 2007 16:24:08 +0100
+  [ Jon Dowland ]
+  * move to quilt for patch management
 
+ -- Jon Dowland <jon at alcopop.org>  Tue, 25 Sep 2007 15:31:39 +0100
+
 freedoom (0.5-1) unstable; urgency=low
 
   [ Jon Dowland ]

Modified: packages/trunk/freedoom/debian/control
===================================================================
--- packages/trunk/freedoom/debian/control	2007-09-24 11:02:19 UTC (rev 4283)
+++ packages/trunk/freedoom/debian/control	2007-09-25 14:46:56 UTC (rev 4284)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Moritz Muehlenhoff <jmm at debian.org>, Jon Dowland <jon at alcopop.org>
-Build-Depends: debhelper (>= 4)
+Build-Depends: debhelper (>= 4), quilt
 Build-Depends-Indep: deutex, imagemagick, gsfonts
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/freedoom/

Added: packages/trunk/freedoom/debian/patches/makefile.patch
===================================================================
--- packages/trunk/freedoom/debian/patches/makefile.patch	                        (rev 0)
+++ packages/trunk/freedoom/debian/patches/makefile.patch	2007-09-25 14:46:56 UTC (rev 4284)
@@ -0,0 +1,11 @@
+--- freedoom-0.5.orig/Makefile
++++ freedoom-0.5/Makefile
+@@ -1,7 +1,7 @@
+ 
+ WADS=wads
+ CPP=/usr/bin/cpp
+-DEUTEX=deutex
++DEUTEX=/usr/games/deutex
+ DEUTEX_BASIC_ARGS=-fullsnd -rate accept -rgb 0 255 255
+ DEUTEX_ARGS=$(DEUTEX_BASIC_ARGS) -doom2 bootstrap/
+ 

Added: packages/trunk/freedoom/debian/patches/series
===================================================================
--- packages/trunk/freedoom/debian/patches/series	                        (rev 0)
+++ packages/trunk/freedoom/debian/patches/series	2007-09-25 14:46:56 UTC (rev 4284)
@@ -0,0 +1,2 @@
+makefile.patch
+version.patch

Added: packages/trunk/freedoom/debian/patches/version.patch
===================================================================
--- packages/trunk/freedoom/debian/patches/version.patch	                        (rev 0)
+++ packages/trunk/freedoom/debian/patches/version.patch	2007-09-25 14:46:56 UTC (rev 4284)
@@ -0,0 +1,4 @@
+--- freedoom-0.5.orig/VERSION
++++ freedoom-0.5/VERSION
+@@ -0,0 +1 @@
++0.5

Modified: packages/trunk/freedoom/debian/rules
===================================================================
--- packages/trunk/freedoom/debian/rules	2007-09-24 11:02:19 UTC (rev 4283)
+++ packages/trunk/freedoom/debian/rules	2007-09-25 14:46:56 UTC (rev 4284)
@@ -6,8 +6,14 @@
 # This is the debhelper compatability version to use.
 #export DH_COMPAT=3
 
-build: build-stamp
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	$(MAKE) -f /usr/share/quilt/quilt.make patch
+	touch configure-stamp
 
+build: configure-stamp build-stamp
+
 build-stamp:
 	dh_testdir
 	$(MAKE) wads/doom2.wad
@@ -17,9 +23,10 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
+	rm -f build-stamp configure-stamp
 	dh_clean
 	$(MAKE) clean
+	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 
 install: build
 	dh_testdir

More information about the Pkg-games-commits mailing list