[Pkg-wmaker-commits] [wmfire] 13/61: Imported Debian patch 1.2.3-2

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmfire.

commit 6eb02f68fa8cd1497fad03d11144bf570db662d7
Author: Charles Fry <cfry at debian.org>
Date:   Wed Jul 5 11:15:25 2006 -0400

    Imported Debian patch 1.2.3-2
---
 debian/changelog                                         | 7 +++++++
 debian/control                                           | 6 +++---
 debian/patches/00list                                    | 1 -
 debian/patches/{01_resource.dpatch => 01_resource.patch} | 7 -------
 debian/rules                                             | 5 +----
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8dbf872..1aa3a77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wmfire (1.2.3-2) unstable; urgency=low
+
+  * Update to standards version 3.7.2
+  * New maintainer email address
+
+ -- Charles Fry <cfry at debian.org>  Wed,  5 Jul 2006 11:15:25 -0400
+
 wmfire (1.2.3-1) unstable; urgency=low
 
   * New upstream release. (Closes: #341255)
diff --git a/debian/control b/debian/control
index 7ffb573..5ce9109 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: wmfire
 Section: x11
 Priority: optional
-Maintainer: Charles Fry <debian at frogcircus.org>
-Build-Depends: cdbs, debhelper (>=4.1.0), libgtop2-dev (>= 2.10.0-1), libgtk2.0-dev, dpatch, autotools-dev
-Standards-Version: 3.6.2
+Maintainer: Charles Fry <cfry at debian.org>
+Build-Depends: cdbs, debhelper (>=4.1.0), libgtop2-dev (>= 2.10.0-1), libgtk2.0-dev, autotools-dev
+Standards-Version: 3.7.2
 
 Package: wmfire
 Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 94e86cc..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_resource.dpatch
diff --git a/debian/patches/01_resource.dpatch b/debian/patches/01_resource.patch
similarity index 90%
rename from debian/patches/01_resource.dpatch
rename to debian/patches/01_resource.patch
index 6845d65..b4bc145 100644
--- a/debian/patches/01_resource.dpatch
+++ b/debian/patches/01_resource.patch
@@ -1,10 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_resource.dpatch by  <debian at frogcircus.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: add -r option to specify resource name
-
- at DPATCH@
 diff -urNad wmfire~/src/wmfire.c wmfire/src/wmfire.c
 --- wmfire~/src/wmfire.c	2005-12-04 05:39:16.000000000 -0500
 +++ wmfire/src/wmfire.c	2005-12-06 10:52:31.055785408 -0500
diff --git a/debian/rules b/debian/rules
index 7fb9de7..466609d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 #-*- makefile -*-
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
 # remove dependency on libglib2.0-0, libpango1.0-0 and libxext6
@@ -10,6 +10,3 @@ DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make -C $(DEB_BUILDDIR) LDFLAGS="-lgdk-x11
 
 # don't need upstream AUTHORS
 DEB_INSTALL_DOCS_ALL = ./README ./NEWS
-
-# allow dpatch-edit-patch to work (since dpatch.mk is broken, see bug #284231)
-unpatch: deapply-dpatches

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmfire.git