[pkg-java] r8887 - trunk/plexus-interactivity-api/debian

Ludovic Claude ludovicc-guest at alioth.debian.org
Mon Jul 6 20:52:03 UTC 2009 

Author: ludovicc-guest
Date: 2009-07-06 20:52:01 +0000 (Mon, 06 Jul 2009)
New Revision: 8887

Added:
   trunk/plexus-interactivity-api/debian/libplexus-interactivity-api-java.poms
   trunk/plexus-interactivity-api/debian/orig-tar.sh
Modified:
   trunk/plexus-interactivity-api/debian/
   trunk/plexus-interactivity-api/debian/changelog
   trunk/plexus-interactivity-api/debian/control
   trunk/plexus-interactivity-api/debian/rules
   trunk/plexus-interactivity-api/debian/watch
Log:
* New version


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

Modified: trunk/plexus-interactivity-api/debian/changelog
===================================================================
--- trunk/plexus-interactivity-api/debian/changelog	2009-07-06 20:21:35 UTC (rev 8886)
+++ trunk/plexus-interactivity-api/debian/changelog	2009-07-06 20:52:01 UTC (rev 8887)
@@ -1,8 +1,22 @@
-plexus-interactivity-api (1.0-alpha-6-3) UNRELEASED; urgency=low
+plexus-interactivity-api (1.0-alpha-6-3) unstable; urgency=low
 
+  [ Ludovic Claude ]
+  * Change section to java, bump 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
+  * Update watch file to reflect changes on the site, now use SVN to get the 
+    sources 
+  * Fix Lintian warnings: remove -1 revision to dependencies, move Homepage 
+    tag to top level
+  * Add Vcs-Browser and Vcs-Svn to control
+  * Change the dependency on java-gcj to default-jdk (Closes: #526299)
+
+  [ Michael Koch ]
   * Added watch file.
 
- -- Michael Koch <konqueror at gmx.de>  Sat, 12 Jan 2008 12:28:20 +0100
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 24 Mar 2009 15:33:22 +0000
 
 plexus-interactivity-api (1.0-alpha-6-2) unstable; urgency=low
 

Modified: trunk/plexus-interactivity-api/debian/control
===================================================================
--- trunk/plexus-interactivity-api/debian/control	2009-07-06 20:21:35 UTC (rev 8886)
+++ trunk/plexus-interactivity-api/debian/control	2009-07-06 20:52:01 UTC (rev 8887)
@@ -1,20 +1,24 @@
 Source: plexus-interactivity-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>
-Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional, libxalan2-java,
+Build-Depends-Indep: maven-repo-helper, ant, 
+                     ant-optional, libxalan2-java,
                      libplexus-component-api-java,
                      libplexus-component-api-java-doc,
-		     libplexus-utils-java (>=1:1.4.1-1),
-		     libplexus-utils-java-doc (>=1:1.4.1-1)
-Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
-Standards-Version: 3.7.2
+		     libplexus-utils-java (>=1:1.4.1),
+		     libplexus-utils-java-doc (>=1:1.4.1)
+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-interactivity-api
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-interactivity-api/
+Homepage: http://plexus.codehaus.org/
 
 Package: libplexus-interactivity-api-java
 Architecture: all
-Depends: libplexus-component-api-java
-Section: libs
+Depends: ${misc:Depends}, libplexus-component-api-java
+Section: java
 Suggests: libplexus-interactivity-api-java-doc
 Description: interactivity API for the Plexus framework
  The Plexus project provides a full software stack for creating and executing
@@ -34,13 +38,12 @@
      * Component dependencies, and
      * Various dependency injection techniques including constructor injection,
        setter injection, and private field injection. 
- .
-  Homepage: http://plexus.codehaus.org/
 
+
 Package: libplexus-interactivity-api-java-doc
 Architecture: all
 Section: doc
-Depends: classpath-doc, libplexus-component-api-java-doc
+Depends: ${misc:Depends}, classpath-doc, libplexus-component-api-java-doc
 Suggests: libplexus-interactivity-api-java
 Description: API Documentation for plexus-interactivity-api
  The Plexus project provides a full software stack for creating and executing
@@ -62,5 +65,4 @@
        setter injection, and private field injection. 
  .
  This package contains the API documentation for plexus-interactivity-api.
- .
-  Homepage: http://plexus.codehaus.org/
+

Added: trunk/plexus-interactivity-api/debian/libplexus-interactivity-api-java.poms
===================================================================
--- trunk/plexus-interactivity-api/debian/libplexus-interactivity-api-java.poms	                        (rev 0)
+++ trunk/plexus-interactivity-api/debian/libplexus-interactivity-api-java.poms	2009-07-06 20:52:01 UTC (rev 8887)
@@ -0,0 +1 @@
+pom.xml --no-parent

Added: trunk/plexus-interactivity-api/debian/orig-tar.sh
===================================================================
--- trunk/plexus-interactivity-api/debian/orig-tar.sh	                        (rev 0)
+++ trunk/plexus-interactivity-api/debian/orig-tar.sh	2009-07-06 20:52:01 UTC (rev 8887)
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+# $2 = version
+
+TAR=../plexus-interactivity-api_$2.orig.tar.gz
+DIR=plexus-interactivity-api-$2
+TAG=plexus-interactivity-$2
+
+svn export http://svn.codehaus.org/plexus/plexus-components/tags/$TAG/plexus-interactivity-api/ $DIR
+tar -c -z -f $TAR $DIR
+rm -rf $DIR ../$TAG
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+  . .svn/deb-layout
+  mv $TAR $origDir
+  echo "moved $TAR to $origDir"
+fi
+


Property changes on: trunk/plexus-interactivity-api/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/plexus-interactivity-api/debian/rules
===================================================================
--- trunk/plexus-interactivity-api/debian/rules	2009-07-06 20:21:35 UTC (rev 8886)
+++ trunk/plexus-interactivity-api/debian/rules	2009-07-06 20:52:01 UTC (rev 8887)
@@ -2,35 +2,29 @@
 
 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:' | sed "s,Version: \(.*\)-.*,\1,g")
-JAVA_HOME            := /usr/lib/jvm/java-gcj
-ANT_HOME             := /usr/share/ant
+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 /usr/share/java/plexus-component-api.jar \
-			/usr/share/java/libplexus-utils.jar
-DEB_ANT_BUILD_TARGET := package
-DEB_ANT_BUILDFILE    := ./debian/build.xml
+                        /usr/share/java/plexus-utils.jar
+DEB_ANT_BUILD_TARGET := package javadoc
+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
-SVN                  := http://svn.codehaus.org/plexus/plexus-components/tags/plexus-interactivity-$(VERSION)/plexus-interactivity-api/
 
 
-
 get-orig-source:
-	echo "Getting from $(SVN)"
-	mkdir orig_tmp
-	cd orig_tmp && \
-		svn export -q $(SVN) $(PACKAGE) && \
-		tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz $(PACKAGE)
-	rm -rf orig_tmp
+	uscan --download-version $(VERSION) --force-download --rename
 
 binary-post-install/lib$(PACKAGE)-java::
-	dh_install -plib$(PACKAGE)-java build/$(PACKAGE)-$(VERSION).jar usr/share/java
-	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-$(VERSION).jar usr/share/java/$(PACKAGE).jar;
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l pom.xml build/$(PACKAGE)-$(VERSION).jar
 
+clean::
+	-rm -rf debian/tmp
+
 binary-post-install/lib$(PACKAGE)-java-doc::
 	dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java


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

Modified: trunk/plexus-interactivity-api/debian/watch
===================================================================
--- trunk/plexus-interactivity-api/debian/watch	2009-07-06 20:21:35 UTC (rev 8886)
+++ trunk/plexus-interactivity-api/debian/watch	2009-07-06 20:52:01 UTC (rev 8887)
@@ -1,2 +1,4 @@
 version=3
-http://repository.codehaus.org/org/codehaus/plexus/plexus-interactivity-api/ (\d.*)/
+http://svn.codehaus.org/plexus/plexus-components/tags/ \
+  plexus-interactivity-(.*)/ debian debian/orig-tar.sh
+

More information about the pkg-java-commits mailing list