r5508 - in packages/trunk/sauerbraten/debian: . patches

Bruno Fuddl-guestquot; Fuddl" Kleinert fuddl-guest at alioth.debian.org
Sun Jan 27 15:56:51 UTC 2008


Author: fuddl-guest
Date: 2008-01-27 15:56:50 +0000 (Sun, 27 Jan 2008)
New Revision: 5508

Added:
   packages/trunk/sauerbraten/debian/patches/
   packages/trunk/sauerbraten/debian/patches/fix-clean-target.diff
   packages/trunk/sauerbraten/debian/patches/series
Modified:
   packages/trunk/sauerbraten/debian/NEWS.Debian
   packages/trunk/sauerbraten/debian/changelog
   packages/trunk/sauerbraten/debian/control
   packages/trunk/sauerbraten/debian/rules
Log:
* using quilt, now
+ commit patch for makefile
* modify rules file. it looks as if it's working, now...
* fix format of debian's NEWS file


Modified: packages/trunk/sauerbraten/debian/NEWS.Debian
===================================================================
--- packages/trunk/sauerbraten/debian/NEWS.Debian	2008-01-27 12:50:13 UTC (rev 5507)
+++ packages/trunk/sauerbraten/debian/NEWS.Debian	2008-01-27 15:56:50 UTC (rev 5508)
@@ -1,9 +1,11 @@
-sauerbraten (0.0.20070819dfsg-2)
+sauerbraten (0.0.20071222.dfsg-1) unstable; urgency=low
 
   * Build sauerbraten-dbg to help tracking down libGL bugs
 
-sauerbraten (0.0.20070819dfsg)
+ -- Bruno "Fuddl" Kleinert <fuddl at gmx.de>  Sun, 27 Jan 2008 16:25:52 +0100
 
+sauerbraten (0.0.20070819.dfsg-1) unstable; urgency=low
+
   * $HOME/.sauerbraten upstream support
 
   The patches to make the Sauerbraten engine partially $HOME-aware were
@@ -14,3 +16,5 @@
   you experience any problems, try to backup and remove or rename that
   directory. This will make Sauerbraten create fresh clean configuration
   files.
+
+ -- Bruno "Fuddl" Kleinert <fuddl at gmx.de>  Sun, 26 Aug 2007 17:45:25 +0200

Modified: packages/trunk/sauerbraten/debian/changelog
===================================================================
--- packages/trunk/sauerbraten/debian/changelog	2008-01-27 12:50:13 UTC (rev 5507)
+++ packages/trunk/sauerbraten/debian/changelog	2008-01-27 15:56:50 UTC (rev 5508)
@@ -6,12 +6,13 @@
   * Build debug package sauerbraten-dbg
   * Placed a description in README.Debian how to generate a backtrace if
     sauerbraten crashes.
-  * Add NEWS.Debian
+  * Fix format of NEWS.Debian
   * Depend on a particular version of sauerbraten-data to avoid incompatible
     installations of the engine and game-data package (Closes: #440246)
   * Updated README.Debian
     * Document removal of some precompiled/header files in the engine's
       sources
+  * Switch from dpatch to quilt
 
   [ Marco Rodrigues ]
   * Add Homepage field in the control file.

Modified: packages/trunk/sauerbraten/debian/control
===================================================================
--- packages/trunk/sauerbraten/debian/control	2008-01-27 12:50:13 UTC (rev 5507)
+++ packages/trunk/sauerbraten/debian/control	2008-01-27 15:56:50 UTC (rev 5508)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Bruno "Fuddl" Kleinert <fuddl at gmx.de>
-Build-Depends: debhelper (>= 5), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, zlib1g-dev, sharutils, imagemagick
+Build-Depends: debhelper (>= 5), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, zlib1g-dev, sharutils, imagemagick, quilt
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/sauerbraten/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/sauerbraten/?op=log
@@ -25,6 +25,7 @@
  This package installs the game client and map editor.
 
 Package: sauerbraten-dbg
+Priority: extra
 Architecture: any
 Depends: sauerbraten (= ${binary:Version})
 Description: Debug symbols for the Sauerbraten game engine

Added: packages/trunk/sauerbraten/debian/patches/fix-clean-target.diff
===================================================================
--- packages/trunk/sauerbraten/debian/patches/fix-clean-target.diff	                        (rev 0)
+++ packages/trunk/sauerbraten/debian/patches/fix-clean-target.diff	2008-01-27 15:56:50 UTC (rev 5508)
@@ -0,0 +1,22 @@
+=== modified file 'sauerbraten-0.0.20071222.dfsg/Makefile'
+Index: sauerbraten-0.0.20071222.dfsg/Makefile
+===================================================================
+--- sauerbraten-0.0.20071222.dfsg.orig/Makefile	2008-01-27 16:46:26.000000000 +0100
++++ sauerbraten-0.0.20071222.dfsg/Makefile	2008-01-27 16:47:20.000000000 +0100
+@@ -58,12 +58,13 @@
+ enet/Makefile:
+ 	cd enet; ./configure
+ 	
+-libenet: enet/Makefile
++libenet:
++	cd enet; ./configure; cd ..
+ 	$(MAKE)	-C enet/ all
+ 
+-clean: enet/Makefile
++clean:
+ 	-$(RM) $(SERVER_OBJS) $(CLIENT_OBJS) $(DPROVIDER) sauer_server sauer_client
+-	$(MAKE)	-C enet/ clean
++	-$(MAKE)	-C enet/ distclean
+ 
+ %-standalone.o:
+ 	$(CXX) $(CXXFLAGS) -DSTANDALONE -c -o $@ $(subst -standalone.o,.cpp,$@)

Added: packages/trunk/sauerbraten/debian/patches/series
===================================================================
--- packages/trunk/sauerbraten/debian/patches/series	                        (rev 0)
+++ packages/trunk/sauerbraten/debian/patches/series	2008-01-27 15:56:50 UTC (rev 5508)
@@ -0,0 +1 @@
+fix-clean-target.diff

Modified: packages/trunk/sauerbraten/debian/rules
===================================================================
--- packages/trunk/sauerbraten/debian/rules	2008-01-27 12:50:13 UTC (rev 5507)
+++ packages/trunk/sauerbraten/debian/rules	2008-01-27 15:56:50 UTC (rev 5508)
@@ -6,7 +6,18 @@
 	$(error powerpc builds disabled. See http://bugs.debian.org/432666 for details)
 endif
 
-build: build-stamp
+patch-stamp: patch
+	touch patch-stamp
+
+patch:
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+
+unpatch:
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	rm -f patch-stamp
+	rm -rf .pc
+
+build: patch-stamp build-stamp
 build-stamp:
 	dh_testdir
 	uudecode -o sauerbraten.png debian/sauerbraten.png.uu
@@ -14,14 +25,16 @@
 	$(MAKE)
 	touch $@
 
-clean:
+clean: patch-stamp clean-patched unpatch
+clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	$(MAKE) clean
 	rm -f sauerbraten.png sauerbraten.xpm
-	#rm -rf	enet/config.log \
-	#	enet/config.status
+	rm -f	enet/config.log \
+		enet/config.status \
+		enet/Makefile
 	dh_clean 
 
 install: build




More information about the Pkg-games-commits mailing list