[osmosis] 12/28: Refresh patches.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository osmosis.

commit 30364a78de4945ef2d9a4740070d33c2159375a5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Mar 16 15:35:30 2014 +0100

    Refresh patches.
---
 debian/patches/01-fix_launcher.patch | 8 +++-----
 debian/patches/02-fix_plexus.patch   | 6 ++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/debian/patches/01-fix_launcher.patch b/debian/patches/01-fix_launcher.patch
index 8e6b3d6..596ede8 100644
--- a/debian/patches/01-fix_launcher.patch
+++ b/debian/patches/01-fix_launcher.patch
@@ -6,10 +6,8 @@ Forwarded: not-needed
  package/bin/osmosis |   18 ++++++++++--------
  1 file changed, 10 insertions(+), 8 deletions(-)
 
-Index: osmosis/package/bin/osmosis
-===================================================================
---- osmosis.orig/package/bin/osmosis	2012-01-11 16:33:29.000000000 +0100
-+++ osmosis/package/bin/osmosis	2012-01-11 16:46:53.000000000 +0100
+--- a/package/bin/osmosis
++++ b/package/bin/osmosis
 @@ -5,8 +5,8 @@
  # JAVACMD_OPTIONS - The options to append to the java command, typically used to modify jvm settings such as max memory.
  # OSMOSIS_OPTIONS - The options to apply to all osmosis invocations, typically used to add plugins or make quiet operation the default.
@@ -21,7 +19,7 @@ Index: osmosis/package/bin/osmosis
  fi
  
  if [ -f "$HOME/.osmosis" ] ; then
-@@ -80,15 +80,17 @@
+@@ -80,15 +80,17 @@ exit 1
  fi
  
  # make it fully qualified
diff --git a/debian/patches/02-fix_plexus.patch b/debian/patches/02-fix_plexus.patch
index d51d7b0..ad88b36 100644
--- a/debian/patches/02-fix_plexus.patch
+++ b/debian/patches/02-fix_plexus.patch
@@ -6,10 +6,8 @@ Forwarded: not-needed
  package/config/plexus.conf |   18 ++++++++++++++++--
  1 file changed, 16 insertions(+), 2 deletions(-)
 
-Index: osmosis/package/config/plexus.conf
-===================================================================
---- osmosis.orig/package/config/plexus.conf	2012-06-15 12:18:41.000000000 +0200
-+++ osmosis/package/config/plexus.conf	2012-06-15 12:42:47.000000000 +0200
+--- a/package/config/plexus.conf
++++ b/package/config/plexus.conf
 @@ -1,5 +1,19 @@
  main is org.openstreetmap.osmosis.core.Osmosis from osmosis.core
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmosis.git