[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn2561-2-5-ga7d3982
The following commit has been merged in the master branch:
commit 121c57be0e1ecfd40db3e936381a8f58169a
Author: David Paleino da...@debian.org
Date: Sat Mar 6 19:39:40 2010 +0100
debian/patches/*: converted from dpatch to quilt
diff --git a/debian/changelog b/debian/changelog
index 3910cc0..69e1f82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+josm (0.0.svn2561-3) UNRELEASED; urgency=low
+
+ * debian/patches/*:
+- converted from dpatch to quilt
+
+ -- David Paleino da...@debian.org Sat, 06 Mar 2010 19:38:43 +0100
+
josm (0.0.svn2561-2) unstable; urgency=low
* debian/watch fixed: implemented a redirector for uscan on Alioth.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1db8396..000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-10_build
-20_bts
-40_elemstyles
-50_preferences_world_readable.dpatch
diff --git a/debian/patches/10_build.dpatch b/debian/patches/10-build.patch
old mode 100755
new mode 100644
similarity index 88%
rename from debian/patches/10_build.dpatch
rename to debian/patches/10-build.patch
index 050e28e..7a18b35
--- a/debian/patches/10_build.dpatch
+++ b/debian/patches/10-build.patch
@@ -1,129 +1,130 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_build.dpatch by Andreas Putzo andr...@putzo.net
-##
-## DP: Adjustments to the ant build file, mainly to not include
-## DP: the dependencies into the target jar file.
+From: Andreas Putzo andr...@putzo.net
+Subject: adjustments to the ant build file, mainly to not include
+ the dependencies into the target jar file.
+Forwarded: no
-...@dpatch@
-diff -urNad josm~/build.xml josm/build.xml
josm~/build.xml2009-12-04 15:46:42.0 +0100
-+++ josm/build.xml 2009-12-05 00:12:43.0 +0100
+---
+ build.xml | 51 ---
+ i18n/build.xml | 23 +++
+ 2 files changed, 39 insertions(+), 35 deletions(-)
+
+--- josm.orig/build.xml
josm/build.xml
@@ -21,9 +21,10 @@
- /condition
-
- !-- Java classpath addition (all jar files to compile tests with this)
--
-- path id=classpath
-- fileset dir=lib
-- include name=**/*.jar/
+ /condition
+
+ !-- Java classpath addition (all jar files to compile tests with this)
--
+- path id=classpath
+- fileset dir=lib
+- include name=**/*.jar/
+ path id=classpath
+ fileset dir=/usr/share/java
+ include name=gettext-commons.jar/
-+ include name=metadata-extractor.jar/
- /fileset
- /path
-
++ include name=metadata-extractor.jar/
+ /fileset
+ /path
+
@@ -42,14 +43,7 @@
- --
- target name=create-revision
- property name=revision.dir value=${build.dir}/
-- exec append=false output=REVISION.XML executable=svn
failifexecutionfails=false
-- env key=LANG value=C/
-- arg value=info/
-- arg value=--xml/
-- arg value=./
-- /exec
-- xmlproperty file=REVISION.XML prefix=version
keepRoot=false collapseAttributes=true/
-- delete file=REVISION.XML /
-+ xmlproperty file=REVISION prefix=version keepRoot=false
collapseAttributes=true/
- tstamp
- format property=build.tstamp pattern=-MM-dd
HH:mm:ss/
- /tstamp
+ --
+ target name=create-revision
+ property name=revision.dir value=${build.dir}/
+- exec append=false output=REVISION.XML executable=svn
failifexecutionfails=false
+- env key=LANG value=C/
+- arg value=info/
+- arg value=--xml/
+- arg value=./
+- /exec
+- xmlproperty file=REVISION.XML prefix=version
keepRoot=false collapseAttributes=true/
+- delete file=REVISION.XML /
++ xmlproperty file=REVISION prefix=version keepRoot=false
collapseAttributes=true/
+ tstamp
+ format property=build.tstamp pattern=-MM-dd
HH:mm:ss/
+ /tstamp
@@ -60,51 +54,44 @@
- # automatically generated by JOSM build.xml - do not edit
- Revision: ${version.entry.commit.revision}
- Is-Local-Build: true
--Build-Date: ${build.tstamp}
-+Build-Date: ${build.tstamp}
-+Debian-Release: ${debian.version}
- /echo
- /target
-
-
- target name=dist depends=compile,create-revision
--
-- exec append=false output=REVISION executable=svn
failifexecutionfails=false
-- env key=LANG value=C/
--
[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn2561-2-5-ga7d3982
The following commit has been merged in the master branch: commit 2a7f9279b2500219c428c91d3936373da203159d Author: David Paleino da...@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 da...@debian.org Sat, 06 Mar 2010 19:38:43 +0100 + -- David Paleino da...@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 andr...@putzo.net, David Paleino da...@debian.org, Debian OpenStreetMap Team pkg-osm-ma...@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 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn2561-2-5-ga7d3982
The following commit has been merged in the master branch: commit a7d3982ef77763bae96a3d129b5274b03c03cb2c Author: David Paleino da...@debian.org Date: Sat Mar 6 20:19:04 2010 +0100 Fix CDBS quilt snippet diff --git a/debian/rules b/debian/rules index 45422c5..6bab6be 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/quilt.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk JAVA_HOME := /usr/lib/jvm/default-java ANT_HOME := /usr/share/ant -- Java OpenStreetMap editor ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
