[maven] 01/01: Moved the libraries to a separate libmaven3-core-java package
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Jun 23 21:30:37 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository maven.
commit dbe91ce12a7251cbcd331fd7e9eb7535a40da214
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Jun 23 23:10:30 2015 +0200
Moved the libraries to a separate libmaven3-core-java package
---
debian/changelog | 7 +++
debian/control | 32 +++++++++--
debian/libmaven3-core-java.links | 11 ++++
debian/{maven.poms => libmaven3-core-java.poms} | 0
debian/maven.links | 74 +++++++++++--------------
debian/rules | 32 +++++------
6 files changed, 93 insertions(+), 63 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 308f4e5..7d9ce16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven (3.0.5-7) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Moved the libraries to a separate libmaven3-core-java package
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 23 Jun 2015 23:02:43 +0200
+
maven (3.0.5-6) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 1a826b9..a3cd42e 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,29 @@ Homepage: http://maven.apache.org
Package: maven
Architecture: all
Depends: default-jre (>= 1:1.5) | default-jre-headless (>= 1:1.5) | java5-runtime | java5-runtime-headless,
- libaether-java,
+ libmaven3-core-java (= ${source:Version}),
+ ${misc:Depends}
+Replaces: maven2 (<< 2.2.1-11)
+Breaks: maven2 (<< 2.2.1-11)
+Description: Java software project management and comprehension tool
+ Maven is a software project management and comprehension tool. Based on the
+ concept of a project object model (POM), Maven can manage a project's build,
+ reporting and documentation from a central piece of information.
+ .
+ Maven's primary goal is to allow a developer to comprehend the complete
+ state of a development effort in the shortest period of time. In order to
+ attain this goal there are several areas of concern that Maven attempts
+ to deal with:
+ .
+ * Making the build process easy
+ * Providing a uniform build system
+ * Providing quality project information
+ * Providing guidelines for best practices development
+ * Allowing transparent migration to new features
+
+Package: libmaven3-core-java
+Architecture: all
+Depends: libaether-java,
libcommons-cli-java,
libcommons-codec-java,
libcommons-httpclient-java,
@@ -51,9 +73,9 @@ Depends: default-jre (>= 1:1.5) | default-jre-headless (>= 1:1.5) | java5-runtim
libsisu-ioc-java,
libwagon2-java (>= 2.2-2),
${misc:Depends}
-Replaces: maven2 (<< 2.2.1-11)
-Breaks: maven2 (<< 2.2.1-11)
-Description: Java software project management and comprehension tool
+Replaces: maven (<< 3.0.5-7)
+Breaks: maven (<< 3.0.5-7)
+Description: Core libraries for Maven 3
Maven is a software project management and comprehension tool. Based on the
concept of a project object model (POM), Maven can manage a project's build,
reporting and documentation from a central piece of information.
@@ -68,3 +90,5 @@ Description: Java software project management and comprehension tool
* Providing quality project information
* Providing guidelines for best practices development
* Allowing transparent migration to new features
+ .
+ This package contains the core libraries for Maven 3.
diff --git a/debian/libmaven3-core-java.links b/debian/libmaven3-core-java.links
new file mode 100644
index 0000000..53f1ebf
--- /dev/null
+++ b/debian/libmaven3-core-java.links
@@ -0,0 +1,11 @@
+/usr/share/java/maven3-aether-provider.jar /usr/share/java/maven-aether-provider-3.x.jar
+/usr/share/java/maven3-artifact.jar /usr/share/java/maven-artifact-3.x.jar
+/usr/share/java/maven3-compat.jar /usr/share/java/maven-compat-3.x.jar
+/usr/share/java/maven3-core.jar /usr/share/java/maven-core-3.x.jar
+/usr/share/java/maven3-embedder.jar /usr/share/java/maven-embedder-3.x.jar
+/usr/share/java/maven3-model-builder.jar /usr/share/java/maven-model-builder-3.x.jar
+/usr/share/java/maven3-model.jar /usr/share/java/maven-model-3.x.jar
+/usr/share/java/maven3-plugin-api.jar /usr/share/java/maven-plugin-api-3.x.jar
+/usr/share/java/maven3-repository-metadata.jar /usr/share/java/maven-repository-metadata-3.x.jar
+/usr/share/java/maven3-settings-builder.jar /usr/share/java/maven-settings-builder-3.x.jar
+/usr/share/java/maven3-settings.jar /usr/share/java/maven-settings-3.x.jar
diff --git a/debian/maven.poms b/debian/libmaven3-core-java.poms
similarity index 100%
rename from debian/maven.poms
rename to debian/libmaven3-core-java.poms
diff --git a/debian/maven.links b/debian/maven.links
index f535f5d..94de398 100644
--- a/debian/maven.links
+++ b/debian/maven.links
@@ -4,49 +4,37 @@
/usr/share/java/plexus-classworlds2.jar /usr/share/maven/boot/plexus-classworlds-2.x.jar
-/usr/share/java/aether-api.jar /usr/share/maven/lib/aether-api.jar
-/usr/share/java/aether-connector-wagon.jar /usr/share/maven/lib/aether-connector-wagon.jar
-/usr/share/java/aether-impl.jar /usr/share/maven/lib/aether-impl.jar
-/usr/share/java/aether-spi.jar /usr/share/maven/lib/aether-spi.jar
-/usr/share/java/aether-util.jar /usr/share/maven/lib/aether-util.jar
-/usr/share/java/commons-cli.jar /usr/share/maven/lib/commons-cli.jar
-/usr/share/java/commons-codec.jar /usr/share/maven/lib/commons-codec.jar
-/usr/share/java/commons-httpclient.jar /usr/share/maven/lib/commons-httpclient.jar
-/usr/share/java/commons-logging.jar /usr/share/maven/lib/commons-logging.jar
-/usr/share/java/plexus-cipher.jar /usr/share/maven/lib/plexus-cipher.jar
+/usr/share/java/aether-api.jar /usr/share/maven/lib/aether-api.jar
+/usr/share/java/aether-connector-wagon.jar /usr/share/maven/lib/aether-connector-wagon.jar
+/usr/share/java/aether-impl.jar /usr/share/maven/lib/aether-impl.jar
+/usr/share/java/aether-spi.jar /usr/share/maven/lib/aether-spi.jar
+/usr/share/java/aether-util.jar /usr/share/maven/lib/aether-util.jar
+/usr/share/java/commons-cli.jar /usr/share/maven/lib/commons-cli.jar
+/usr/share/java/commons-codec.jar /usr/share/maven/lib/commons-codec.jar
+/usr/share/java/commons-httpclient.jar /usr/share/maven/lib/commons-httpclient.jar
+/usr/share/java/commons-logging.jar /usr/share/maven/lib/commons-logging.jar
+/usr/share/java/plexus-cipher.jar /usr/share/maven/lib/plexus-cipher.jar
/usr/share/java/plexus-component-annotations-1.5.jar /usr/share/maven/lib/plexus-component-annotations.jar
-/usr/share/java/plexus-interpolation.jar /usr/share/maven/lib/plexus-interpolation.jar
-/usr/share/java/plexus-sec-dispatcher.jar /usr/share/maven/lib/plexus-sec-dispatcher.jar
-/usr/share/java/plexus-utils2.jar /usr/share/maven/lib/plexus-utils.jar
-/usr/share/java/guava.jar /usr/share/maven/lib/guava.jar
-/usr/share/java/sisu-guice.jar /usr/share/maven/lib/sisu-guice.jar
-/usr/share/java/sisu-inject-bean.jar /usr/share/maven/lib/sisu-inject-bean.jar
-/usr/share/java/sisu-inject-plexus.jar /usr/share/maven/lib/sisu-inject-plexus.jar
+/usr/share/java/plexus-interpolation.jar /usr/share/maven/lib/plexus-interpolation.jar
+/usr/share/java/plexus-sec-dispatcher.jar /usr/share/maven/lib/plexus-sec-dispatcher.jar
+/usr/share/java/plexus-utils2.jar /usr/share/maven/lib/plexus-utils.jar
+/usr/share/java/guava.jar /usr/share/maven/lib/guava.jar
+/usr/share/java/sisu-guice.jar /usr/share/maven/lib/sisu-guice.jar
+/usr/share/java/sisu-inject-bean.jar /usr/share/maven/lib/sisu-inject-bean.jar
+/usr/share/java/sisu-inject-plexus.jar /usr/share/maven/lib/sisu-inject-plexus.jar
-/usr/share/java/maven3-aether-provider.jar /usr/share/maven/lib/maven-aether-provider-3.x.jar
-/usr/share/java/maven3-artifact.jar /usr/share/maven/lib/maven-artifact-3.x.jar
-/usr/share/java/maven3-compat.jar /usr/share/maven/lib/maven-compat-3.x.jar
-/usr/share/java/maven3-core.jar /usr/share/maven/lib/maven-core-3.x.jar
-/usr/share/java/maven3-embedder.jar /usr/share/maven/lib/maven-embedder-3.x.jar
-/usr/share/java/maven3-model-builder.jar /usr/share/maven/lib/maven-model-builder-3.x.jar
-/usr/share/java/maven3-model.jar /usr/share/maven/lib/maven-model-3.x.jar
-/usr/share/java/maven3-plugin-api.jar /usr/share/maven/lib/maven-plugin-api-3.x.jar
-/usr/share/java/maven3-repository-metadata.jar /usr/share/maven/lib/maven-repository-metadata-3.x.jar
-/usr/share/java/maven3-settings-builder.jar /usr/share/maven/lib/maven-settings-builder-3.x.jar
-/usr/share/java/maven3-settings.jar /usr/share/maven/lib/maven-settings-3.x.jar
+/usr/share/java/maven3-aether-provider.jar /usr/share/maven/lib/maven-aether-provider-3.x.jar
+/usr/share/java/maven3-artifact.jar /usr/share/maven/lib/maven-artifact-3.x.jar
+/usr/share/java/maven3-compat.jar /usr/share/maven/lib/maven-compat-3.x.jar
+/usr/share/java/maven3-core.jar /usr/share/maven/lib/maven-core-3.x.jar
+/usr/share/java/maven3-embedder.jar /usr/share/maven/lib/maven-embedder-3.x.jar
+/usr/share/java/maven3-model-builder.jar /usr/share/maven/lib/maven-model-builder-3.x.jar
+/usr/share/java/maven3-model.jar /usr/share/maven/lib/maven-model-3.x.jar
+/usr/share/java/maven3-plugin-api.jar /usr/share/maven/lib/maven-plugin-api-3.x.jar
+/usr/share/java/maven3-repository-metadata.jar /usr/share/maven/lib/maven-repository-metadata-3.x.jar
+/usr/share/java/maven3-settings-builder.jar /usr/share/maven/lib/maven-settings-builder-3.x.jar
+/usr/share/java/maven3-settings.jar /usr/share/maven/lib/maven-settings-3.x.jar
-/usr/share/java/maven3-aether-provider.jar /usr/share/java/maven-aether-provider-3.x.jar
-/usr/share/java/maven3-artifact.jar /usr/share/java/maven-artifact-3.x.jar
-/usr/share/java/maven3-compat.jar /usr/share/java/maven-compat-3.x.jar
-/usr/share/java/maven3-core.jar /usr/share/java/maven-core-3.x.jar
-/usr/share/java/maven3-embedder.jar /usr/share/java/maven-embedder-3.x.jar
-/usr/share/java/maven3-model-builder.jar /usr/share/java/maven-model-builder-3.x.jar
-/usr/share/java/maven3-model.jar /usr/share/java/maven-model-3.x.jar
-/usr/share/java/maven3-plugin-api.jar /usr/share/java/maven-plugin-api-3.x.jar
-/usr/share/java/maven3-repository-metadata.jar /usr/share/java/maven-repository-metadata-3.x.jar
-/usr/share/java/maven3-settings-builder.jar /usr/share/java/maven-settings-builder-3.x.jar
-/usr/share/java/maven3-settings.jar /usr/share/java/maven-settings-3.x.jar
-
-/usr/share/java/wagon-file-2.x.jar /usr/share/maven/lib/wagon-file.jar
-/usr/share/java/wagon-http-shaded-2.x.jar /usr/share/maven/lib/wagon-http-shaded.jar
-/usr/share/java/wagon-provider-api-2.x.jar /usr/share/maven/lib/wagon-provider-api.jar
+/usr/share/java/wagon-file-2.x.jar /usr/share/maven/lib/wagon-file.jar
+/usr/share/java/wagon-http-shaded-2.x.jar /usr/share/maven/lib/wagon-http-shaded.jar
+/usr/share/java/wagon-provider-api-2.x.jar /usr/share/maven/lib/wagon-provider-api.jar
diff --git a/debian/rules b/debian/rules
index e63a723..ecaa206 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ get-orig-source:
-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
configure/$(PACKAGE)::
- mh_patchpoms -p$(PACKAGE) --rules=debian/maven.buildRules
+ mh_patchpoms -plibmaven3-core-java --rules=debian/maven.buildRules
makebuilddir/$(PACKAGE)::
install -d $(DEB_BUILDDIR)/debian/tmp/maven-repo
@@ -32,21 +32,21 @@ makebuilddir/$(PACKAGE)::
-rm $(DEB_BUILDDIR)/maven-ant-tasks-2.1.1.jar
-ln -s /usr/share/java/maven-ant-tasks.jar $(DEB_BUILDDIR)/maven-ant-tasks-2.1.1.jar
-install/$(PACKAGE)::
- mh_unpatchpoms -p$(PACKAGE)
+install/libmaven3-core-java::
+ mh_unpatchpoms -plibmaven3-core-java
- mh_installpoms -p$(PACKAGE)
- mh_installjar -p$(PACKAGE) -l --usj-name=maven3-aether-provider maven-aether-provider/pom.xml maven-aether-provider/target/maven-aether-provider-$(VERSION).jar
- mh_installjar -p$(PACKAGE) -l --usj-name=maven3-artifact maven-artifact/pom.xml maven-artifact/target/maven-artifact-$(VERSION).jar
- mh_installjar -p$(PACKAGE) -l --usj-name=maven3-compat maven-compat/pom.xml maven-compat/target/maven-compat-$(VERSION).jar
- mh_installjar -p$(PACKAGE) -l --usj-name=maven3-core maven-core/pom.xml maven-core/target/maven-core-$(VERSION).jar
- mh_installjar -p$(PACKAGE) -l --usj-name=maven3-embedder maven-embedder/pom.xml maven-embedder/target/maven-embedder-$(VERSION).jar
- mh_installjar -p$(PACKAGE) -l --usj-name=maven3-model maven-model/pom.xml maven-model/target/maven-model-$(VERSION).jar
- mh_installjar -p$(PACKAGE) -l --usj-name=maven3-model-builder maven-model-builder/pom.xml maven-model-builder/target/maven-model-builder-$(VERSION).jar
- mh_installjar -p$(PACKAGE) -l --usj-name=maven3-plugin-api maven-plugin-api/pom.xml maven-plugin-api/target/maven-plugin-api-$(VERSION).jar
- mh_installjar -p$(PACKAGE) -l --usj-name=maven3-repository-metadata maven-repository-metadata/pom.xml maven-repository-metadata/target/maven-repository-metadata-$(VERSION).jar
- mh_installjar -p$(PACKAGE) -l --usj-name=maven3-settings maven-settings/pom.xml maven-settings/target/maven-settings-$(VERSION).jar
- mh_installjar -p$(PACKAGE) -l --usj-name=maven3-settings-builder maven-settings-builder/pom.xml maven-settings-builder/target/maven-settings-builder-$(VERSION).jar
+ mh_installpoms -plibmaven3-core-java
+ mh_installjar -plibmaven3-core-java -l --usj-name=maven3-aether-provider maven-aether-provider/pom.xml maven-aether-provider/target/maven-aether-provider-$(VERSION).jar
+ mh_installjar -plibmaven3-core-java -l --usj-name=maven3-artifact maven-artifact/pom.xml maven-artifact/target/maven-artifact-$(VERSION).jar
+ mh_installjar -plibmaven3-core-java -l --usj-name=maven3-compat maven-compat/pom.xml maven-compat/target/maven-compat-$(VERSION).jar
+ mh_installjar -plibmaven3-core-java -l --usj-name=maven3-core maven-core/pom.xml maven-core/target/maven-core-$(VERSION).jar
+ mh_installjar -plibmaven3-core-java -l --usj-name=maven3-embedder maven-embedder/pom.xml maven-embedder/target/maven-embedder-$(VERSION).jar
+ mh_installjar -plibmaven3-core-java -l --usj-name=maven3-model maven-model/pom.xml maven-model/target/maven-model-$(VERSION).jar
+ mh_installjar -plibmaven3-core-java -l --usj-name=maven3-model-builder maven-model-builder/pom.xml maven-model-builder/target/maven-model-builder-$(VERSION).jar
+ mh_installjar -plibmaven3-core-java -l --usj-name=maven3-plugin-api maven-plugin-api/pom.xml maven-plugin-api/target/maven-plugin-api-$(VERSION).jar
+ mh_installjar -plibmaven3-core-java -l --usj-name=maven3-repository-metadata maven-repository-metadata/pom.xml maven-repository-metadata/target/maven-repository-metadata-$(VERSION).jar
+ mh_installjar -plibmaven3-core-java -l --usj-name=maven3-settings maven-settings/pom.xml maven-settings/target/maven-settings-$(VERSION).jar
+ mh_installjar -plibmaven3-core-java -l --usj-name=maven3-settings-builder maven-settings-builder/pom.xml maven-settings-builder/target/maven-settings-builder-$(VERSION).jar
binary-post-install/$(PACKAGE)::
# compress manpages
@@ -54,7 +54,7 @@ binary-post-install/$(PACKAGE)::
clean::
mh_clean
- mh_unpatchpoms -p$(PACKAGE)
+ mh_unpatchpoms -plibmaven3-core-java
-rm -rf debian/tmp/mvn-repo
-rm $(DEB_BUILDDIR)/maven-ant-tasks-2.1.1.jar
-find . -name target -type d | xargs rm -rf
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git
More information about the pkg-java-commits
mailing list