[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3208-1-19-g14aac9f

[David Paleino]

The following commit has been merged in the master branch:
commit 89691643cde3148d3e440f2437ed1790c2ad2428
Author: David Paleino <dapal at debian.org>
Date:   Thu Jul 15 14:18:45 2010 +0200

    debian/patches/series: 60-disable_oauth.patch disabled

diff --git a/debian/changelog b/debian/changelog
index 1c01774..04ac0b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,12 @@ josm (0.0.svn3329-2) UNRELEASED; urgency=low
   * OAuth support is now enabled
     - debian/control: added Build-Depends on liboauth-signpost-java
     - debian/rules: add signpost-core.jar to the CLASSPATH
+    - debian/patches/:
+      - series: 60-disable_oauth.patch disabled
   * debian/README.Debian deleted, josm is a wrapper that uses the
     alternatives system
 
- -- David Paleino <dapal at debian.org>  Thu, 15 Jul 2010 14:16:16 +0200
+ -- David Paleino <dapal at debian.org>  Thu, 15 Jul 2010 14:18:20 +0200
 
 josm (0.0.svn3329-1) unstable; urgency=low
 
diff --git a/debian/patches/series b/debian/patches/series
index 0d72e85..6d571f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@
 20-bts.patch
 40-elemstyles.patch
 50-preferences_world_readable.patch
-60-disable_oauth.patch
+#60-disable_oauth.patch
+60-port_oauth_1.2.patch
 70-default_look_and_feel.patch
 80-fix_images.patch

-- 
Java OpenStreetMap editor