Author: twerner
Date: 2008-12-05 09:26:17 +0000 (Fri, 05 Dec 2008)
New Revision: 7521

Added:
   trunk/plexus-containers/debian/README.Debian
Modified:
   trunk/plexus-containers/debian/ant.properties
   trunk/plexus-containers/debian/changelog
   trunk/plexus-containers/debian/control
   trunk/plexus-containers/debian/rules
Log:
do not install fully unversioned symlink and remove conflicts to
existing packages


Added: trunk/plexus-containers/debian/README.Debian
===================================================================
--- trunk/plexus-containers/debian/README.Debian                                
(rev 0)
+++ trunk/plexus-containers/debian/README.Debian        2008-12-05 09:26:17 UTC 
(rev 7521)
@@ -0,0 +1,8 @@
+This package installs versioned jar files into /usr/share/java/ and some
+less versioned symlinks:
+
+component-api-1.0.jar
+container-default-1.0.jar
+
+The unversioned symlinks are already used by other packages with older
+upstream releases of the jars and they might be installed in parallel.

Modified: trunk/plexus-containers/debian/ant.properties
===================================================================
--- trunk/plexus-containers/debian/ant.properties       2008-12-04 23:20:09 UTC 
(rev 7520)
+++ trunk/plexus-containers/debian/ant.properties       2008-12-05 09:26:17 UTC 
(rev 7521)
@@ -1,7 +1,2 @@
-classpath.compile=/usr/share/java/classworlds.jar:\
-                  /usr/share/java/plexus-utils.jar:\
-                  /usr/share/java/plexus-component-api.jar:\
-                  /usr/share/java/junit.jar
-classpath.test=
 javadoc.dir=build/api
 maven.test.skip=true

Modified: trunk/plexus-containers/debian/changelog
===================================================================
--- trunk/plexus-containers/debian/changelog    2008-12-04 23:20:09 UTC (rev 
7520)
+++ trunk/plexus-containers/debian/changelog    2008-12-05 09:26:17 UTC (rev 
7521)
@@ -1,11 +1,5 @@
-plexus-containers (1.0~beta2-2) unstable; urgency=low
-
-  * Fix debian/copyright.
-
- -- Torsten Werner <[EMAIL PROTECTED]>  Sun, 30 Nov 2008 11:21:37 +0100
-
 plexus-containers (1.0~beta2-1) unstable; urgency=low
 
   * Initial release. (Closes: #507272)
 
- -- Torsten Werner <[EMAIL PROTECTED]>  Sat, 29 Nov 2008 17:32:07 +0100
+ -- Torsten Werner <[EMAIL PROTECTED]>  Fri, 05 Dec 2008 10:10:34 +0100

Modified: trunk/plexus-containers/debian/control
===================================================================
--- trunk/plexus-containers/debian/control      2008-12-04 23:20:09 UTC (rev 
7520)
+++ trunk/plexus-containers/debian/control      2008-12-05 09:26:17 UTC (rev 
7521)
@@ -13,9 +13,6 @@
 
 Package: libplexus-containers-java
 Architecture: all
-Conflicts: libplexus-container-default-java
-Replaces: libplexus-container-default-java
-Provides: libplexus-container-default-java
 Description: utilities for the Plexus framework
  The Plexus project provides a full software stack for creating and executing
  software projects. Based on the Plexus container, the applications can
@@ -41,8 +38,6 @@
 Architecture: all
 Section: doc
 Suggests: libplexus-containers-java
-Conflicts: libplexus-container-default-java-doc
-Replaces: libplexus-container-default-java-doc
 Description: API Documentation for plexus-container-default
  The Plexus project provides a full software stack for creating and executing
  software projects. Based on the Plexus container, the applications can

Modified: trunk/plexus-containers/debian/rules
===================================================================
--- trunk/plexus-containers/debian/rules        2008-12-04 23:20:09 UTC (rev 
7520)
+++ trunk/plexus-containers/debian/rules        2008-12-05 09:26:17 UTC (rev 
7521)
@@ -20,7 +20,7 @@
 binary-post-install/lib$(PACKAGE)-java::
        for MODULE in $(MODULES); do \
          dh_install -plib$(PACKAGE)-java 
plexus-$$MODULE/build/plexus-$$MODULE-$(VERSION).jar usr/share/java; \
-         dh_link -plib$(PACKAGE)-java 
usr/share/java/plexus-$$MODULE-$(VERSION).jar 
usr/share/java/plexus-$$MODULE.jar; \
+         dh_link -plib$(PACKAGE)-java 
usr/share/java/plexus-$$MODULE-$(VERSION).jar 
usr/share/java/plexus-$$MODULE-1.0.jar; \
        done
 
 binary-post-install/lib$(PACKAGE)-java-doc::


_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits

Reply via email to