[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn6115+dfsg1-1-12-g001e1a4

2014-01-15 Thread Andrew Shadura
The following commit has been merged in the master branch:
commit 4f2060d1016549c1758a4536130a1736755b11ff
Author: Andrew Shadura 
Date:   Wed Jan 15 16:48:54 2014 +0100

Specify libmetadata-extractor-java version.

diff --git a/debian/control b/debian/control
index 843e991..d647a64 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  , default-jdk
  , libcommons-codec-java
  , libgettext-commons-java (>= 0.9.6)
- , libmetadata-extractor-java
+ , libmetadata-extractor-java (<< 2.4.0)
  , libgettext-ant-tasks-java
  , liboauth-signpost-java (>= 1.2)
  , libsvgsalamander-java
@@ -31,7 +31,7 @@ Depends:
  openjdk-6-jre | sun-java6-jre | openjdk-7-jre
  , libcommons-codec-java
  , libgettext-commons-java (>= 0.9.6)
- , libmetadata-extractor-java
+ , libmetadata-extractor-java (<< 2.4.0)
  , liboauth-signpost-java (>= 1.2)
  , libsvgsalamander-java
  , openstreetmap-map-icons-classic

-- 
Editor for OpenStreetMap

___
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] josm branch, master, updated. debian/0.0.svn6115+dfsg1-1-12-g001e1a4

2014-01-15 Thread Andrew Shadura
The following commit has been merged in the master branch:
commit 001e1a47fe2df7550f96252553e9822645aab1ef
Author: Andrew Shadura 
Date:   Wed Jan 15 16:49:20 2014 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index bfc8b41..10f53f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-josm (0.0.svn6502+dfsg1-1) UNRELEASED; urgency=medium
+josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
 
+  [ David Paleino ]
   * New tested snapshot (Closes: #725011)
   * Patches refreshed to apply to new upstream source
 
- -- David Paleino   Fri, 20 Dec 2013 23:00:53 +0100
+  [ Andrew Shadura ]
+  * Build against libmetadata-extractor-java 2.3.1.
+
+ -- Andrew Shadura   Wed, 15 Jan 2014 16:46:44 +0100
 
 josm (0.0.svn6115+dfsg1-1) unstable; urgency=low
 

-- 
Editor for OpenStreetMap

___
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] josm branch, master, updated. debian/0.0.svn6115+dfsg1-1-12-g001e1a4

2014-01-15 Thread Andrew Shadura
The following commit has been merged in the master branch:
commit 123bb46dcefae6b03090ee0103972f30dff2d1bf
Author: Andrew Shadura 
Date:   Wed Jan 15 16:46:23 2014 +0100

Valencian translation doesn't work currently; disable it.

diff --git a/debian/clean b/debian/clean
index 0de62c4..13b51b4 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,3 +1,6 @@
 data/*.lang
 src/org/openstreetmap/josm/data/imagery/types/*
 src/org/w3/_2001/xmlschema/*
+
+# can't build this now
+i18n/po/c...@valencia.po

-- 
Editor for OpenStreetMap

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