* Remove dpatch dependency and references in debian/rules (no upstream

  patches right now, and when I need some, I'll probably be using quilt)

diff --git a/debian/changelog b/debian/changelog
index 98ef41e..97b804b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,12 @@ fmit (0.97.7-2) UNRELEASED; urgency=low
   * Promote XS-Vcs-* fields to Vcs-* fields, since they are now natively
     supported by dpkg.
   * Use a Homepage field instead of a pseudo-field in the Description
+  * Remove dpatch dependency and references in debian/rules (no upstream
+    patches right now, and when I need some, I'll probably be using quilt)
   * Don't ignore a make clean error (check for the existance of Makefile
     instead)
 
- -- John Wright <jsw@debian.org>  Wed, 02 Jan 2008 12:52:09 -0700
+ -- John Wright <jsw@debian.org>  Wed, 02 Jan 2008 13:19:11 -0700
 
 fmit (0.97.7-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index a104384..d833a61 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: fmit
 Section: sound
 Priority: optional
 Maintainer: John Wright <jsw@debian.org>
-Build-Depends: debhelper (>= 4), autotools-dev, dpatch, libqt3-mt-dev, fftw3-dev, freeglut3-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libjack-dev
+Build-Depends: debhelper (>= 4), autotools-dev, libqt3-mt-dev, fftw3-dev, freeglut3-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libjack-dev
 Standards-Version: 3.7.3
 Homepage: http://home.gna.org/fmit/
 Vcs-Hg: http://debian.johnwright.org/hg/fmit

diff --git a/debian/rules b/debian/rules
index 6cb5132..4186fec 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# include file for dpatch system
-include /usr/share/dpatch/dpatch.make
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -34,7 +31,7 @@ else
        CFLAGS += -O2
 endif
 
-config.status: patch configure
+config.status: configure
        dh_testdir
        # Add here commands to configure the package.
        ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-Qt-dir=/usr/share/qt3 $(DEB_CONFIGURE_ALSA) CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
@@ -51,7 +48,7 @@ build-stamp:  config.status
 
        touch $@
 
-clean: unpatch
+clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp 
@@ -121,4 +118,4 @@ binary-arch: build install
        dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install