[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn2561-2-5-ga7d3982

[David Paleino]

The following commit has been merged in the master branch:
commit 2a7f9279b2500219c428c91d3936373da203159d
Author: David Paleino <dapal at debian.org>
Date:   Sat Mar 6 19:40:39 2010 +0100

    debian/rules, debian/control: use quilt for patch management.

diff --git a/debian/changelog b/debian/changelog
index 69e1f82..d1791bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ josm (0.0.svn2561-3) UNRELEASED; urgency=low
 
   * debian/patches/*:
     - converted from dpatch to quilt
+  * debian/rules, debian/control: use quilt for patch management.
 
- -- David Paleino <dapal at debian.org>  Sat, 06 Mar 2010 19:38:43 +0100
+ -- David Paleino <dapal at debian.org>  Sat, 06 Mar 2010 19:40:22 +0100
 
 josm (0.0.svn2561-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 003a121..4531325 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Andreas Putzo <andreas at putzo.net>,
  David Paleino <dapal at debian.org>,
  Debian OpenStreetMap Team <pkg-osm-maint at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), gettext, default-jdk,
+Build-Depends: ant, cdbs, quilt, debhelper (>= 5), gettext, default-jdk,
  libgettext-commons-java (>= 0.9.6), libmetadata-extractor-java
 Standards-Version: 3.8.4
 Homepage: http://josm.openstreetmap.de
diff --git a/debian/rules b/debian/rules
index 526f55f..45422c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
   
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/quilt.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
 ANT_HOME  := /usr/share/ant

-- 
Java OpenStreetMap editor