[pkg-java] r19267 - trunk/plexus-container-default/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2017-09-05 09:11:03 +0000 (Tue, 05 Sep 2017)
New Revision: 19267

Modified:
   trunk/plexus-container-default/debian/changelog
   trunk/plexus-container-default/debian/control
   trunk/plexus-container-default/debian/maven.rules
   trunk/plexus-container-default/debian/rules
Log:
Depend on libplexus-classworlds-java instead of libclassworlds-java



Modified: trunk/plexus-container-default/debian/changelog
===================================================================
--- trunk/plexus-container-default/debian/changelog	2017-08-30 10:46:44 UTC (rev 19266)
+++ trunk/plexus-container-default/debian/changelog	2017-09-05 09:11:03 UTC (rev 19267)
@@ -1,3 +1,9 @@
+plexus-container-default (1.0-alpha-9-stable-1-8) UNRELEASED; urgency=medium
+
+  * Depend on libplexus-classworlds-java instead of libclassworlds-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 05 Sep 2017 11:09:26 +0200
+
 plexus-container-default (1.0-alpha-9-stable-1-7) unstable; urgency=low
 
   * debian/control:

Modified: trunk/plexus-container-default/debian/control
===================================================================
--- trunk/plexus-container-default/debian/control	2017-08-30 10:46:44 UTC (rev 19266)
+++ trunk/plexus-container-default/debian/control	2017-09-05 09:11:03 UTC (rev 19267)
@@ -7,20 +7,20 @@
                      junit,
                      junit-doc,
                      default-jdk-doc,
-                     libclassworlds-java (>=1.1-alpha-2),
+                     libplexus-classworlds-java,
                      libplexus-utils-java (>=1:1),
                      libplexus-utils-java-doc (>=1:1),
                      libxalan2-java                     
 Build-Depends: debhelper (>= 9), cdbs (>= 0.4.5.3), default-jdk
 Standards-Version: 3.9.4
-Vcs-Svn: http://anonscm.debian.org/viewvc/pkg-java/trunk/plexus-container-default
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/plexus-container-default
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/plexus-container-default
 Homepage: http://plexus.codehaus.org
 
 Package: libplexus-container-default-java
 Architecture: all
 Depends: ${misc:Depends}, libplexus-utils-java,
-         libclassworlds-java (>=1.1-alpha-2)
+         libplexus-classworlds-java
 Suggests: libplexus-container-default-java-doc
 Description: utilities for the Plexus framework
  The Plexus project provides a full software stack for creating and executing

Modified: trunk/plexus-container-default/debian/maven.rules
===================================================================
--- trunk/plexus-container-default/debian/maven.rules	2017-08-30 10:46:44 UTC (rev 19266)
+++ trunk/plexus-container-default/debian/maven.rules	2017-09-05 09:11:03 UTC (rev 19267)
@@ -1,2 +1,3 @@
 org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/
 junit junit jar s/3\..*/3.x/
+s/classworlds/org.codehaus.plexus/ s/classworlds/plexus-classworlds/* s/.*/debian/ * *

Modified: trunk/plexus-container-default/debian/rules
===================================================================
--- trunk/plexus-container-default/debian/rules	2017-08-30 10:46:44 UTC (rev 19266)
+++ trunk/plexus-container-default/debian/rules	2017-09-05 09:11:03 UTC (rev 19267)
@@ -6,7 +6,7 @@
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant-trax ant-nodeps xalan2 classworlds plexus-utils junit
+DEB_JARS             := ant-trax ant-nodeps xalan2 plexus-classworlds plexus-utils junit
 DEB_ANT_BUILD_TARGET := package javadoc
 DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
 DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)