The following commit has been merged in the master branch:
commit 40b347f953dc6c983e8d6e86b86dae975433fd44
Author: Bruno Kleinert <[email protected]>
Date:   Fri Nov 20 17:01:36 2009 +0100

    Drop build dependency on quilt
    
    Purge quilt calls from rules file. Format 3.0 quilt applies patches
    automagically for us.

diff --git a/debian/changelog b/debian/changelog
index 5d2643d..e8059ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 nexuiz-data (2.5.2-3) unstable; urgency=low
 
   * Convert to debian format 3.0 quilt
+    * Drop build dependency on quilt
+    * Purge quilt calls from rules file
 
- -- Bruno "Fuddl" Kleinert <[email protected]>  Fri, 20 Nov 2009 16:55:04 +0100
+ -- Bruno "Fuddl" Kleinert <[email protected]>  Fri, 20 Nov 2009 17:01:12 +0100
 
 nexuiz-data (2.5.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 03a13bf..8d61a67 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Games Team <[email protected]>
 Uploaders: Bruno "Fuddl" Kleinert <[email protected]>,
   GonĂ©ri Le Bouder <[email protected]>, Gerfried Fuchs <[email protected]>
-Build-Depends: debhelper (>= 5.0.0), quilt, fteqcc (>= 3343+svn3400)
+Build-Depends: debhelper (>= 5.0.0), fteqcc (>= 3343+svn3400)
 Build-Depends-Indep: p7zip-full
 Standards-Version: 3.8.3
 Homepage: http://www.nexuiz.com/
diff --git a/debian/rules b/debian/rules
index 87404c4..61b827a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,32 +1,21 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
-patch-stamp: patch
-       touch patch-stamp
-
-patch:
-       QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-
-unpatch:
-       QUILT_PATCHES=debian/patches quilt pop -a || test $$? = 2
-       rm -f patch-stamp
-       rm -rf .pc
 
 build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
        dh_testdir
        touch build-stamp
        # Builds QuakeC and the uge data.zip archive. In case of emergency, 
i.e. if
        # Nexuiz complains about wrong cvar checksums also call the 
update-cvarcount
-       # target, but be careful with modifies in-tree files!
+       # target, but be careful: It will modify in-tree files!
        make -C data pk3here
        mkdir -p tmp/sound
        cp -r data/sound/cdtracks tmp/sound
        cd tmp && 7za a -tzip -mx=0 music.pk3 sound
        touch build-stamp
 
-clean: clean-patched unpatch
-clean-patched:
+clean:
        dh_testdir
        dh_testroot
        $(MAKE) -C data clean

-- 
Packaging of the Nexuiz game data

_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

Reply via email to