[pkg-java] r8874 - trunk/plexus-component-api/debian

Ludovic Claude ludovicc-guest at alioth.debian.org
Sun Jul 5 19:37:03 UTC 2009


Author: ludovicc-guest
Date: 2009-07-05 19:37:00 +0000 (Sun, 05 Jul 2009)
New Revision: 8874

Added:
   trunk/plexus-component-api/debian/libplexus-component-api-java.poms
Modified:
   trunk/plexus-component-api/debian/
   trunk/plexus-component-api/debian/changelog
   trunk/plexus-component-api/debian/control
   trunk/plexus-component-api/debian/rules
Log:
* New version


Property changes on: trunk/plexus-component-api/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: trunk/plexus-component-api/debian/changelog
===================================================================
--- trunk/plexus-component-api/debian/changelog	2009-07-05 19:27:35 UTC (rev 8873)
+++ trunk/plexus-component-api/debian/changelog	2009-07-05 19:37:00 UTC (rev 8874)
@@ -1,11 +1,22 @@
-plexus-component-api (1.0+svn6316-2) UNRELEASED; urgency=low
+plexus-component-api (1.0+svn6316-2) unstable; urgency=low
 
+  [Ludovic Claude]
+  * Change section to java, bump up Standards-Version to 3.8.1
+  * Add the Maven POM to the package,
+  * Add a Build-Depends-Indep dependency on maven-repo-helper
+  * Use mh_installpom and mh_installjar to install the POM and the jar to the
+    Maven repository
+  * Change the dependency on java-gcj to default-jdk (Closes: #526294)
+  * Add a Recommends on libplexus-containers-java as the POM for this 
+    package required org.codehaus.plexus:plexus-containers as parent
+
+  [Michael Koch]
   * Added watch file.
   * Added myself to Uploaders.
   * Added Homepage, Vcs-Svn and Vcs-Browser fields.
   * Updated Standards-Version to 3.7.3.
 
- -- Michael Koch <konqueror at gmx.de>  Sat, 19 Apr 2008 09:38:42 +0200
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 09 Apr 2009 13:15:53 +0000
 
 plexus-component-api (1.0+svn6316-1) unstable; urgency=low
 

Modified: trunk/plexus-component-api/debian/control
===================================================================
--- trunk/plexus-component-api/debian/control	2009-07-05 19:27:35 UTC (rev 8873)
+++ trunk/plexus-component-api/debian/control	2009-07-05 19:37:00 UTC (rev 8874)
@@ -1,20 +1,20 @@
 Source: plexus-component-api
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Paul Cager <paul-debian at home.paulcager.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional, libxalan2-java,
-                     libplexus-classworlds-java, libplexus-classworlds-java-doc
-Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
-Standards-Version: 3.7.3
+Build-Depends-Indep: maven-repo-helper, ant, ant-optional, 
+ libxalan2-java, libplexus-classworlds-java, libplexus-classworlds-java-doc
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk
+Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-component-api
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-component-api
 Homepage: http://plexus.codehaus.org/
 
 Package: libplexus-component-api-java
 Architecture: all
-Section: libs
-Depends: libplexus-classworlds-java
+Depends: ${misc:Depends}, libplexus-classworlds-java
+Recommends: libplexus-containers-java
 Suggests: libplexus-component-api-java-doc
 Description: utilities for the Plexus framework
  The Plexus project provides a full software stack for creating and executing
@@ -38,7 +38,7 @@
 Package: libplexus-component-api-java-doc
 Architecture: all
 Section: doc
-Depends: classpath-doc
+Depends: ${misc:Depends}, classpath-doc
 Suggests: libplexus-component-api-java
 Description: API Documentation for plexus-component-api
  The Plexus project provides a full software stack for creating and executing

Added: trunk/plexus-component-api/debian/libplexus-component-api-java.poms
===================================================================
--- trunk/plexus-component-api/debian/libplexus-component-api-java.poms	                        (rev 0)
+++ trunk/plexus-component-api/debian/libplexus-component-api-java.poms	2009-07-05 19:37:00 UTC (rev 8874)
@@ -0,0 +1 @@
+pom.xml

Modified: trunk/plexus-component-api/debian/rules
===================================================================
--- trunk/plexus-component-api/debian/rules	2009-07-05 19:27:35 UTC (rev 8873)
+++ trunk/plexus-component-api/debian/rules	2009-07-05 19:37:00 UTC (rev 8874)
@@ -2,15 +2,14 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-)
-JAVA_HOME            := /usr/lib/jvm/java-gcj
-ANT_HOME             := /usr/share/ant
+#VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-)
+VERSION              := "1.0-alpha-22"
+JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar xalan2 /usr/share/java/plexus-classworlds.jar
 DEB_ANT_BUILD_TARGET := package
-DEB_ANT_BUILDFILE    := ./debian/build.xml
+DEB_ANT_BUILDFILE    := debian/build.xml
 DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
 #DEB_ANT_INVOKE       := ant -verbose -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -f $(BUILD_FILE)
 API_DOCS             := build/doc/api
@@ -27,12 +26,15 @@
 	rm -rf orig_tmp
 	
 
-makebuilddir/lib$(PACKAGE)-java::
-	echo "build/$(PACKAGE)-$(VERSION).jar usr/share/java" >debian/lib$(PACKAGE)-java.install
-	echo "/usr/share/java/$(PACKAGE)-$(VERSION).jar /usr/share/java/$(PACKAGE).jar" >debian/lib$(PACKAGE)-java.links
-
 makebuilddir/lib$(PACKAGE)-java-doc::
 	echo "$(API_DOCS) usr/share/doc/lib$(PACKAGE)-java" >debian/lib$(PACKAGE)-java-doc.install
 
-cleanbuilddir/lib$(PACKAGE)-java::
-	cd debian && rm -f lib$(PACKAGE)-java-doc.install lib$(PACKAGE)-java.links lib$(PACKAGE)-java.install
+cleanbuilddir/lib$(PACKAGE)-java-doc::
+	cd debian && rm -f lib$(PACKAGE)-java-doc.install
+
+binary-post-install/lib$(PACKAGE)-java::
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l --usj-version=$(VERSION) pom.xml build/$(PACKAGE)-$(VERSION).jar
+
+clean::
+	-rm -rf debian/tmp


Property changes on: trunk/plexus-component-api/debian/rules
___________________________________________________________________
Modified: svn:executable
   - 
   + *




More information about the pkg-java-commits mailing list