[plexus-classworlds] 07/10: Renamed the package to plexus-classworlds

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Sep 21 15:37:40 UTC 2017


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository plexus-classworlds.

commit e00f7127f8ec333850a26db058319b96617f8b84
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 21 17:22:51 2017 +0200

    Renamed the package to plexus-classworlds
---
 debian/README.source                               |  4 +-
 debian/changelog                                   |  4 +-
 debian/control                                     | 43 ++++++++++++++++++----
 debian/libplexus-classworlds-java-doc.doc-base.api | 10 +++++
 debian/libplexus-classworlds-java-doc.install      |  1 +
 ...2-java.poms => libplexus-classworlds-java.poms} |  2 +-
 .../libplexus-classworlds2-java-doc.doc-base.api   | 10 -----
 debian/libplexus-classworlds2-java-doc.install     |  1 -
 debian/libplexus-classworlds2-java.links           |  3 ++
 debian/maven.rules                                 |  2 -
 debian/rules                                       |  7 ++++
 11 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index f35500c..f647736 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,5 +1,5 @@
-Information about plexus-classworlds2
-------------------------------
+Information about plexus-classworlds
+------------------------------------
 
 This package was debianized using the mh_make command
 from the maven-debian-helper package.
diff --git a/debian/changelog b/debian/changelog
index 455a6fd..a6961f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-plexus-classworlds2 (2.5.2-2) UNRELEASED; urgency=medium
+plexus-classworlds (2.5.2-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Renamed the package to plexus-classworlds
+    - Kept libplexus-classworlds2-java as a transitional package
   * Build with maven-debian-helper instead of maven-ant-helper
   * Enabled the unit tests
   * Standards-Version updated to 4.1.0
diff --git a/debian/control b/debian/control
index 390b151..32b4199 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: plexus-classworlds2
+Source: plexus-classworlds
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
@@ -17,14 +17,16 @@ Build-Depends:
  libmaven-javadoc-plugin-java,
  maven-debian-helper (>= 2.2)
 Standards-Version: 4.1.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/plexus-classworlds2.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/plexus-classworlds2.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/plexus-classworlds.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/plexus-classworlds.git
 Homepage: http://plexus.codehaus.org/plexus-classworlds
 
-Package: libplexus-classworlds2-java
+Package: libplexus-classworlds-java
 Architecture: all
 Depends: ${misc:Depends}, ${maven:Depends}
-Suggests: ${maven:OptionalDepends}, libplexus-classworlds2-java-doc
+Suggests: ${maven:OptionalDepends}, libplexus-classworlds-java-doc
+Breaks: libplexus-classworlds2-java (<< 2.5.2-2~)
+Replaces: libplexus-classworlds2-java (<< 2.5.2-2~)
 Description: Class loading 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
@@ -44,11 +46,36 @@ Description: Class loading utilities for the Plexus framework
   * Various dependency injection techniques including constructor injection,
    setter injection, and private field injection.
 
-Package: libplexus-classworlds2-java-doc
+Package: libplexus-classworlds2-java
+Architecture: all
+Section: oldlibs
+Depends: ${misc:Depends}, libplexus-classworlds-java (>= 2.5.2-2~)
+Description: Class loading utilities for the Plexus framework (transitional package)
+ The Plexus project provides a full software stack for creating and executing
+ software projects. Based on the Plexus container, the applications can
+ utilise component-oriented programming to build modular, reusable components
+ that can easily be assembled and reused.
+ .
+ While Plexus is similar to other inversion-of-control (IoC) or dependency
+ injection frameworks such as the Spring Framework, it is a full-fledged
+ container that supports many more features such as:
+ .
+  * Component lifecycles
+  * Component instantiation strategies
+  * Nested containers
+  * Component configuration
+  * Auto-wiring
+  * Component dependencies, and
+  * Various dependency injection techniques including constructor injection,
+   setter injection, and private field injection.
+ .
+ This is a transitional package, please use libplexus-classworlds-java instead.
+
+Package: libplexus-classworlds-java-doc
 Architecture: all
 Section: doc
 Depends: ${maven:DocDepends}, ${misc:Depends}
-Suggests: ${maven:DocOptionalDepends}, libplexus-classworlds2-java
+Suggests: ${maven:DocOptionalDepends}, libplexus-classworlds-java
 Description: Class loading utilities for the Plexus framework - documentation
  The Plexus project provides a full software stack for creating and executing
  software projects. Based on the Plexus container, the applications can
@@ -68,4 +95,4 @@ Description: Class loading utilities for the Plexus framework - documentation
   * Various dependency injection techniques including constructor injection,
    setter injection, and private field injection.
  .
- This package provides the API documentation for libplexus-classworlds2-java.
+ This package provides the API documentation for libplexus-classworlds-java.
diff --git a/debian/libplexus-classworlds-java-doc.doc-base.api b/debian/libplexus-classworlds-java-doc.doc-base.api
new file mode 100644
index 0000000..fee71c0
--- /dev/null
+++ b/debian/libplexus-classworlds-java-doc.doc-base.api
@@ -0,0 +1,10 @@
+Document: libplexus-classworlds-java
+Title: API Javadoc for Plexus Classworlds
+Author: Codehaus developers
+Abstract: This is the API Javadoc provided for the
+ libplexus-classworlds-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libplexus-classworlds-java/api/index.html
+Files: /usr/share/doc/libplexus-classworlds-java/api/*
diff --git a/debian/libplexus-classworlds-java-doc.install b/debian/libplexus-classworlds-java-doc.install
new file mode 100644
index 0000000..0f6a37f
--- /dev/null
+++ b/debian/libplexus-classworlds-java-doc.install
@@ -0,0 +1 @@
+target/apidocs/* usr/share/doc/libplexus-classworlds-java/api
diff --git a/debian/libplexus-classworlds2-java.poms b/debian/libplexus-classworlds-java.poms
similarity index 94%
rename from debian/libplexus-classworlds2-java.poms
rename to debian/libplexus-classworlds-java.poms
index 01138a4..db2dafe 100644
--- a/debian/libplexus-classworlds2-java.poms
+++ b/debian/libplexus-classworlds-java.poms
@@ -23,4 +23,4 @@
 #   --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
 #     temporarily for certain artifacts such as Javadoc jars.
 
-pom.xml --has-package-version --java-lib --usj-name=plexus-classworlds2 --no-parent
+pom.xml --has-package-version --java-lib --no-parent
diff --git a/debian/libplexus-classworlds2-java-doc.doc-base.api b/debian/libplexus-classworlds2-java-doc.doc-base.api
deleted file mode 100644
index 35f8562..0000000
--- a/debian/libplexus-classworlds2-java-doc.doc-base.api
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: libplexus-classworlds2-java
-Title: API Javadoc for Plexus Classworlds
-Author: Codehaus developers
-Abstract: This is the API Javadoc provided for the
- libplexus-classworlds2-java library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libplexus-classworlds2-java/api/index.html
-Files: /usr/share/doc/libplexus-classworlds2-java/api/*
diff --git a/debian/libplexus-classworlds2-java-doc.install b/debian/libplexus-classworlds2-java-doc.install
deleted file mode 100644
index a42cde3..0000000
--- a/debian/libplexus-classworlds2-java-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-target/apidocs/* usr/share/doc/libplexus-classworlds2-java/api
diff --git a/debian/libplexus-classworlds2-java.links b/debian/libplexus-classworlds2-java.links
new file mode 100644
index 0000000..92ba892
--- /dev/null
+++ b/debian/libplexus-classworlds2-java.links
@@ -0,0 +1,3 @@
+/usr/share/java/plexus-classworlds.jar /usr/share/java/plexus-classworlds2.jar
+/usr/share/java/plexus-classworlds.jar /usr/share/java/plexus-classworlds2-2.5.2.jar
+/usr/share/java/plexus-classworlds.jar /usr/share/maven-repo/org/codehaus/plexus/plexus-classworlds/2.x/plexus-classworlds-2.x.jar
diff --git a/debian/maven.rules b/debian/maven.rules
index 51490ce..33b91ab 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -17,5 +17,3 @@
 #   junit junit jar s/3\\..*/3.x/
 
 junit junit jar s/.*/4.x/ * *
-org.codehaus.plexus plexus-classworlds * s/2\..*/2.x/ * *
-org.codehaus.plexus plexus pom s/2\..*/2.x/ * *
diff --git a/debian/rules b/debian/rules
index 5a6351f..8a4376d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,5 +3,12 @@
 %:
 	dh $@
 
+override_dh_auto_install:
+	dh_auto_install
+
+	# Install the old 2.x pom in libplexus-classworlds2-java
+	mh_installpom -plibplexus-classworlds2-java -e2.x pom.xml
+	rm -Rf debian/libplexus-classworlds2-java/usr/share/maven-repo/org/codehaus/plexus/plexus-classworlds/debian
+
 get-orig-source:
 	uscan --download-current-version --force-download --rename

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-classworlds.git



More information about the pkg-java-commits mailing list