The following commit has been merged in the master branch:
commit 2008927160c101927c0e239cd5eb43a9edde228c
Author: Bruno Kleinert <[email protected]>
Date:   Wed Nov 18 17:18:25 2009 +0100

    Make nexuiz be a 3.0 quilt package
    
    Drop build dependency on quilt. dpkg does everything for us.
    Remove quilt calls in debian/rules.

diff --git a/debian/changelog b/debian/changelog
index 0aaf0e7..0de0112 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nexuiz (2.5.2-3) unstable; urgency=low
+
+  * Use dpkg 3.0 quilt format for packaging
+    * Drop build dependency on quilt. dpkg does everything for us
+
+ -- Bruno "Fuddl" Kleinert <[email protected]>  Wed, 18 Nov 2009 17:17:19 +0100
+
 nexuiz (2.5.2-2) unstable; urgency=low
 
   * Add debian/get-nexuiz-orig.sh to fetch and strip the .orig.tar.gz from the
diff --git a/debian/control b/debian/control
index 3932c17..11d1665 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 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 (>= 7), libsdl1.2-dev, imagemagick, quilt
+Build-Depends: debhelper (>= 7), libsdl1.2-dev, imagemagick
 Standards-Version: 3.8.3
 Homepage: http://www.nexuiz.com/
 Vcs-Git: git://git.debian.org/pkg-games/nexuiz
diff --git a/debian/rules b/debian/rules
index 4de8dca..1633041 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,21 +6,15 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
     MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-patch: patch-stamp
-patch-stamp:
-       $(MAKE) -f /usr/share/quilt/quilt.make patch
-       touch $@
-
 build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
        dh_testdir
        $(MAKE) CFLAGS_DEBUG="$(CFLAGS)" \
                        DP_FS_BASEDIR=/usr/share/games/nexuiz \
                        sdl-debug sv-debug
        touch build-stamp
 
-clean: clean-patched unpatch
-clean-patched:
+clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
@@ -28,10 +22,6 @@ clean-patched:
        $(MAKE) clean
        dh_clean
 
-unpatch:
-       $(MAKE) -f /usr/share/quilt/quilt.make unpatch
-       rm -rf patch-stamp .pc
-
 install: build
        dh_testdir
        dh_testroot
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Packaging for the Nexuiz engine

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

Reply via email to