[Git][debian-gis-team/osmosis][master] 2 commits: Apply patch by Emmanuel Bourg to fix FTBFS with updates plexus-classworlds. (closes: #923564)

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / osmosis


Commits:
ec93d47a by Bas Couwenberg at 2019-03-02T07:05:48Z
Apply patch by Emmanuel Bourg to fix FTBFS with updates plexus-classworlds. (closes: #923564)

- - - - -
4d021d29 by Bas Couwenberg at 2019-03-02T07:12:14Z
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/maven.rules
- debian/patches/01-fix_launcher.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,10 @@
-osmosis (0.47-4) UNRELEASED; urgency=medium
+osmosis (0.47-4) unstable; urgency=medium
 
   * Bump Standards-Version to 4.3.0, no changes.
+  * Apply patch by Emmanuel Bourg to fix FTBFS with updates plexus-classworlds.
+    (closes: #923564)
 
- -- Bas Couwenberg <sebastic at debian.org>  Tue, 25 Dec 2018 22:50:27 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 02 Mar 2019 08:12:06 +0100
 
 osmosis (0.47-3) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -27,7 +27,7 @@ Build-Depends: debhelper (>= 9),
                libspring-transaction-java,
                libstax2-api-java,
                libosmpbf-java,
-               libplexus-classworlds2-java,
+               libplexus-classworlds-java,
                libprotobuf-java (>= 3.6.1),
                libwoodstox-java,
                libxerces2-java,
@@ -57,7 +57,7 @@ Depends: default-jre-headless | java8-runtime-headless,
          libspring-jdbc-java,
          libspring-transaction-java,
          libosmpbf-java,
-         libplexus-classworlds2-java,
+         libplexus-classworlds-java,
          libprotobuf-java,
          libxerces2-java,
          libxz-java,


=====================================
debian/maven.rules
=====================================
@@ -1,6 +1,5 @@
 
 junit junit * s/.*/4.x/ * *
-org.codehaus.plexus plexus-classworlds * s/.*/2.x/ * *
 org.springframework spring-jdbc * s/.*/debian/ * *
 #s/org.jboss.netty/io.netty/ netty * s/.*/debian/ * *
 s/org.postgis/net.postgis/ postgis-jdbc * s/.*/debian/ * *


=====================================
debian/patches/01-fix_launcher.patch
=====================================
@@ -28,7 +28,7 @@ Forwarded: not-needed
  
  # Build up the classpath of required jar files via classworlds launcher.
 -MYAPP_CLASSPATH=$MYAPP_HOME/lib/default/plexus-classworlds-*.jar
-+MYAPP_CLASSPATH=$LIBRARIES_HOME/plexus-classworlds2.jar
++MYAPP_CLASSPATH=$LIBRARIES_HOME/plexus-classworlds.jar
  
  MAINCLASS=org.codehaus.classworlds.Launcher
 -EXEC="$JAVACMD $JAVACMD_OPTIONS -cp $MYAPP_CLASSPATH -Dapp.home=$MYAPP_HOME -Dclassworlds.conf=$MYAPP_HOME/config/plexus.conf  $MAINCLASS $OSMOSIS_OPTIONS"



View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/compare/4019a53622f87001cc4bfeddf4798686be809ba1...4d021d297e80f233f8645fff27ef945fe739be90

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/compare/4019a53622f87001cc4bfeddf4798686be809ba1...4d021d297e80f233f8645fff27ef945fe739be90
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190302/fbfc2b87/attachment-0001.html>