[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.40.1+ds1-3-6-gb69bad0

2012-03-07 Thread David Paleino 
The following commit has been merged in the master branch:
commit b69bad0f973b8968ebcd5dde509c059a234d98d1
Author: David Paleino 
Date:   Thu Mar 8 08:23:46 2012 +0100

Releasing to sid

diff --git a/debian/changelog b/debian/changelog
index a862115..3abb463 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-osmosis (0.40.1+ds1-4) UNRELEASED; urgency=low
+osmosis (0.40.1+ds1-4) unstable; urgency=low
 
   * Switch dependency from libpg-java to libpostgresql-jdbc-java
 (Closes: #659399)
@@ -6,7 +6,7 @@ osmosis (0.40.1+ds1-4) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.3, no changes needed
   * Updated debian/copyright
 
- -- David Paleino   Thu, 08 Mar 2012 08:18:23 +0100
+ -- David Paleino   Thu, 08 Mar 2012 08:23:40 +0100
 
 osmosis (0.40.1+ds1-3) unstable; urgency=low
 

-- 
Osmosis, an OSM data processor

___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits

[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.40.1+ds1-3-6-gb69bad0

2012-03-07 Thread David Paleino 
The following commit has been merged in the master branch:
commit 4cb76844030657036f79d55c2b52aa3e5f1b4186
Author: David Paleino 
Date:   Thu Mar 8 08:18:44 2012 +0100

Updated debian/copyright

diff --git a/debian/changelog b/debian/changelog
index 76207d4..a862115 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ osmosis (0.40.1+ds1-4) UNRELEASED; urgency=low
 (Closes: #659399)
   * Drop junit4 workaround: now Debian has 4.10
   * Bump Standards-Version to 3.9.3, no changes needed
+  * Updated debian/copyright
 
- -- David Paleino   Thu, 08 Mar 2012 08:17:27 +0100
+ -- David Paleino   Thu, 08 Mar 2012 08:18:23 +0100
 
 osmosis (0.40.1+ds1-3) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 32a718d..9f87626 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
-Format-Specification: 
http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=428
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: osmosis
-Upstream-Maintainer: Brett Henderson
 Upstream-Source: http://www.bretth.com/osmosis/
 
-Files: src/*, test/*
+Files: src/*
+ test/*
 Copyright: © 2007-2008, Bretth Henderson  and other 
contributors
 License: PD
  Osmosis is placed into the public domain and where this is not legally
@@ -21,7 +21,7 @@ License: PD
 
 Files: debian/*
 Copyright: © 2008-2009, Giovanni Mascellani 
- © 2009-2010, David Paleino 
+ © 2009-2012, David Paleino 
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -37,4 +37,3 @@ License: GPL-3+
  along with this program.  If not, see .
 X-Comment: on Debian systems, the complete text of the GNU General Public
  License version 3 can be found in /usr/share/common-licenses/GPL-3.
-

-- 
Osmosis, an OSM data processor

___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits

[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.40.1+ds1-3-6-gb69bad0

2012-03-07 Thread David Paleino 
The following commit has been merged in the master branch:
commit 4c2539b8383cfdfc5782eca9b929ce43015f8d75
Author: David Paleino 
Date:   Thu Mar 8 08:10:50 2012 +0100

Drop junit4 workaround: now Debian has 4.10

diff --git a/debian/changelog b/debian/changelog
index f994577..5657b58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ osmosis (0.40.1+ds1-4) UNRELEASED; urgency=low
 
   * Switch dependency from libpg-java to libpostgresql-jdbc-java
 (Closes: #659399)
+  * Drop junit4 workaround: now Debian has 4.10
 
- -- David Paleino   Fri, 10 Feb 2012 21:19:12 +0100
+ -- David Paleino   Thu, 08 Mar 2012 08:10:34 +0100
 
 osmosis (0.40.1+ds1-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a1a6761..706987b 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Build-Depends:
  , libxerces2-java
  , checkstyle
  , ivy
- , junit4
+ , junit4 (>= 4.10)
  , default-jdk
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-osm/osmosis.git
diff --git a/debian/patches/05-workaround_missing_junit4.10.patch 
b/debian/patches/05-workaround_missing_junit4.10.patch
deleted file mode 100644
index 9d5f16c..000
--- a/debian/patches/05-workaround_missing_junit4.10.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-From: David Paleino 
-Subject: Debian doesn't have junit 4.10 yet, so make it useless :)
-Origin: vendor
-Forwarded: not-needed
-

- apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApiDbTest.java   
 |2 -
- 
apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbFileReplicatorTest.java
  |6 +++--
- 
areafilter/src/test/java/org/openstreetmap/osmosis/areafilter/v0_6/AreaFilterTest.java
 |   12 +-
- 
dataset/src/test/java/org/openstreetmap/osmosis/dataset/v0_6/CustomDbTest.java  
   |4 ++-
- 
pgsnapshot/src/test/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/PostgreSqlTest.java
 |8 +++---
- set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeAppenderTest.java  
 |2 -
- 
set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeSimplifierTest.java  
   |2 -
- 
tagfilter/src/test/java/org/openstreetmap/osmosis/tagfilter/v0_6/TagRemoverTest.java
   |4 +--
- 
testutil/src/main/java/org/openstreetmap/osmosis/testutil/TestDataUtilities.java
   |2 -
- 
xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlChangeReaderWriterTest.java
|2 -
- xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlReaderWriterTest.java 
 |6 +++--
- 11 files changed, 28 insertions(+), 22 deletions(-)
-
-Index: 
osmosis/testutil/src/main/java/org/openstreetmap/osmosis/testutil/TestDataUtilities.java
-===
 
osmosis.orig/testutil/src/main/java/org/openstreetmap/osmosis/testutil/TestDataUtilities.java
  2012-01-11 16:33:29.0 +0100
-+++ 
osmosis/testutil/src/main/java/org/openstreetmap/osmosis/testutil/TestDataUtilities.java
   2012-01-11 16:46:53.0 +0100
-@@ -51,7 +51,7 @@
-   "/data/template/" + dataFileName), 
UTF8));
- 
-   // Create a temporary file and open it.
--  tmpFile = newFile();
-+  tmpFile = File.createTempFile("junit", null);
-   dataWriter = new BufferedWriter(new 
OutputStreamWriter(new FileOutputStream(tmpFile), UTF8));
- 
-   // Copy all data into the temp file replacing the 
version string.
-Index: 
osmosis/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlChangeReaderWriterTest.java
-===
 
osmosis.orig/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlChangeReaderWriterTest.java
   2012-01-11 16:33:29.0 +0100
-+++ 
osmosis/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlChangeReaderWriterTest.java
2012-01-11 16:46:53.0 +0100
-@@ -32,7 +32,7 @@
-   File outputFile;
-   
-   inputFile = 
dataUtils.createDataFile("v0_6/xml-task-tests-v0_6.osc");
--  outputFile = dataUtils.newFile();
-+  outputFile = File.createTempFile("junit", null);
-   
-   // Create and connect the xml tasks.
-   xmlReader = new XmlChangeReader(inputFile, true, 
CompressionMethod.None);
-Index: 
osmosis/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlReaderWriterTest.java
-===
 
osmosis.orig/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlReaderWriterTest.java
 2012-01-11 16:33:29.0 +0100
-+++ 
osmosis/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlReaderWriterTest.java
  2012-01-11 16:46:53.0 +0100
-@@ -30,7 +30,7 @@
-   
-   // Generate input files.
-   inputFile = 
dataUtils.createDataFile("v0_6/xml-t

[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.40.1+ds1-3-6-gb69bad0

2012-03-07 Thread David Paleino 
The following commit has been merged in the master branch:
commit 4df7800f054ec86b596c727bb4d8ec5efc795626
Author: David Paleino 
Date:   Thu Mar 8 08:23:37 2012 +0100

Add DEP-3 header

diff --git a/debian/patches/06-no-woodstox.patch 
b/debian/patches/06-no-woodstox.patch
index a446bda..80656d3 100644
--- a/debian/patches/06-no-woodstox.patch
+++ b/debian/patches/06-no-woodstox.patch
@@ -1,7 +1,13 @@
-Index: osmosis/core/ivy.xml
-===
 osmosis.orig/core/ivy.xml  2012-01-11 16:52:28.0 +0100
-+++ osmosis/core/ivy.xml   2012-01-11 17:08:41.0 +0100
+From: David Paleino 
+Subject: fix missing woodstox dependency
+Forwarded: no
+
+---
+ core/ivy.xml |4 
+ 1 file changed, 4 deletions(-)
+
+--- osmosis.orig/core/ivy.xml
 osmosis/core/ivy.xml
 @@ -25,10 +25,6 @@
  
  

-- 
Osmosis, an OSM data processor

___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits

[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.40.1+ds1-3-6-gb69bad0

2012-03-07 Thread David Paleino 
The following commit has been merged in the master branch:
commit ee2ca01134b27b77e581129ad271b6c31323ef91
Author: David Paleino 
Date:   Thu Mar 8 08:17:38 2012 +0100

Bump Standards-Version to 3.9.3, no changes needed

diff --git a/debian/changelog b/debian/changelog
index 5657b58..76207d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ osmosis (0.40.1+ds1-4) UNRELEASED; urgency=low
   * Switch dependency from libpg-java to libpostgresql-jdbc-java
 (Closes: #659399)
   * Drop junit4 workaround: now Debian has 4.10
+  * Bump Standards-Version to 3.9.3, no changes needed
 
- -- David Paleino   Thu, 08 Mar 2012 08:10:34 +0100
+ -- David Paleino   Thu, 08 Mar 2012 08:17:27 +0100
 
 osmosis (0.40.1+ds1-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 706987b..07d4905 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Build-Depends:
  , ivy
  , junit4 (>= 4.10)
  , default-jdk
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-osm/osmosis.git
 Vcs-Browser: http://git.debian.org/?p=pkg-osm/osmosis.git
 Homepage: http://wiki.openstreetmap.org/wiki/Osmosis

-- 
Osmosis, an OSM data processor

___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits