This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-containers.
commit 06559e069ed13b53ca0d873223190f43ca3f2438 Author: Torsten Werner <[email protected]> Date: Fri Dec 5 09:26:17 2008 +0000 do not install fully unversioned symlink and remove conflicts to existing packages --- debian/README.Debian | 8 ++++++++ debian/ant.properties | 5 ----- debian/changelog | 8 +------- debian/control | 5 ----- debian/rules | 2 +- 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..fbad221 --- /dev/null +++ b/debian/README.Debian @@ -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. diff --git a/debian/ant.properties b/debian/ant.properties index 1245a19..e2ae10b 100644 --- a/debian/ant.properties +++ b/debian/ant.properties @@ -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 diff --git a/debian/changelog b/debian/changelog index aba59fb..36ebbd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/debian/control b/debian/control index 76840a9..1536860 100644 --- a/debian/control +++ b/debian/control @@ -13,9 +13,6 @@ Homepage: http://plexus.codehaus.org 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 @@ Package: libplexus-containers-java-doc 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 diff --git a/debian/rules b/debian/rules index 0c1adfc..9b265e3 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,7 @@ get-orig-source: 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:: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-containers.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
