[pkg-java] r8856 - trunk/plexus-classworlds/debian

Ludovic Claude ludovicc-guest at alioth.debian.org
Sun Jul 5 00:08:50 UTC 2009 

Author: ludovicc-guest
Date: 2009-07-05 00:08:49 +0000 (Sun, 05 Jul 2009)
New Revision: 8856

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


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

Modified: trunk/plexus-classworlds/debian/changelog
===================================================================
--- trunk/plexus-classworlds/debian/changelog	2009-07-05 00:07:06 UTC (rev 8855)
+++ trunk/plexus-classworlds/debian/changelog	2009-07-05 00:08:49 UTC (rev 8856)
@@ -1,3 +1,17 @@
+plexus-classworlds (1.5.0-1) unstable; urgency=low
+
+  * New upstream release, add myself to uploaders
+  * Change section to java
+  * 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
+  * Correct Lintian warning: use a Homepage attribute in the control file
+  * Add Vcs-Browser and Vcs-Svn to the control file
+  * Change the dependency on java-gcj to default-jdk (Closes: #526296)
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 22 Mar 2009 23:35:53 +0000
+
 plexus-classworlds (1.2-alpha-7-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #413528)

Modified: trunk/plexus-classworlds/debian/control
===================================================================
--- trunk/plexus-classworlds/debian/control	2009-07-05 00:07:06 UTC (rev 8855)
+++ trunk/plexus-classworlds/debian/control	2009-07-05 00:08:49 UTC (rev 8856)
@@ -1,15 +1,21 @@
 Source: plexus-classworlds
-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: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
-Standards-Version: 3.7.2
+Uploaders: Paul Cager <paul-debian at home.paulcager.org>, 
+ Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends-Indep: maven-repo-helper, ant, ant-optional, 
+ libxalan2-java
+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-classworlds
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-classworlds/
+Homepage: http://plexus.codehaus.org/
 
 Package: libplexus-classworlds-java
 Architecture: all
-Section: libs
+Section: java
+Depends: ${misc:Depends}
 Suggests: libplexus-classworlds-java-doc
 Description: Class loading utilities for the Plexus framework
  The Plexus project provides a full software stack for creating and executing
@@ -29,13 +35,12 @@
      * Component dependencies, and
      * Various dependency injection techniques including constructor injection,
        setter injection, and private field injection. 
- .
-  Homepage: http://plexus.codehaus.org/
+ 
 
 Package: libplexus-classworlds-java-doc
 Architecture: all
 Section: doc
-Depends: classpath-doc
+Depends: ${misc:Depends}, classpath-doc
 Suggests: libplexus-classworlds-java
 Description: API Documentation for plexus-classworlds
  The Plexus project provides a full software stack for creating and executing
@@ -57,5 +62,4 @@
        setter injection, and private field injection. 
  .
  This package contains the API documentation for plexus-classworlds.
- .
-  Homepage: http://plexus.codehaus.org/
+

Added: trunk/plexus-classworlds/debian/libplexus-classworlds-java.poms
===================================================================
--- trunk/plexus-classworlds/debian/libplexus-classworlds-java.poms	                        (rev 0)
+++ trunk/plexus-classworlds/debian/libplexus-classworlds-java.poms	2009-07-05 00:08:49 UTC (rev 8856)
@@ -0,0 +1 @@
+pom.xml --no-parent

Added: trunk/plexus-classworlds/debian/maven.rules
===================================================================
--- trunk/plexus-classworlds/debian/maven.rules	                        (rev 0)
+++ trunk/plexus-classworlds/debian/maven.rules	2009-07-05 00:08:49 UTC (rev 8856)
@@ -0,0 +1 @@
+junit junit jar s/3\..*/3.x/

Added: trunk/plexus-classworlds/debian/orig-tar.sh
===================================================================
--- trunk/plexus-classworlds/debian/orig-tar.sh	                        (rev 0)
+++ trunk/plexus-classworlds/debian/orig-tar.sh	2009-07-05 00:08:49 UTC (rev 8856)
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+TAR=../plexus-classworlds_$2.orig.tar.gz
+DIR=plexus-classworlds-$2
+TAG=$(echo plexus-classworlds-$2 | sed 's,~alpha,-alpha-,')
+
+svn export http://svn.codehaus.org/plexus/plexus-classworlds/tags/$TAG/ $DIR
+rm -f $DIR/classworlds-aj.zip
+rm -rf $DIR/lib
+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-classworlds/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/plexus-classworlds/debian/rules
===================================================================
--- trunk/plexus-classworlds/debian/rules	2009-07-05 00:07:06 UTC (rev 8855)
+++ trunk/plexus-classworlds/debian/rules	2009-07-05 00:08:49 UTC (rev 8856)
@@ -2,36 +2,28 @@
 
 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
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar xalan2
 DEB_ANT_BUILD_TARGET := package javadoc
-DEB_ANT_BUILDFILE    := ./debian/build.xml
+DEB_ANT_BUILDFILE    := debian/build.xml
 DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
 API_DOCS             := build/doc/api
-SVN                  := http://svn.codehaus.org/plexus/$(PACKAGE)/tags/$(PACKAGE)-$(VERSION)
 
 get-orig-source:
-	echo "Getting from $(SVN)"
-	rm -rf orig_tmp
-	mkdir orig_tmp
-	svn export -q $(SVN) orig_tmp/$(PACKAGE)
-	rm  orig_tmp/$(PACKAGE)/classworlds-aj.zip orig_tmp/$(PACKAGE)/lib/*.jar
-	cd orig_tmp && tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz $(PACKAGE)
-	rm -rf orig_tmp
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
 
-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
+binary-post-install/lib$(PACKAGE)-java::
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l pom.xml build/$(PACKAGE)-$(VERSION).jar
 
 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 
 
-
+clean::
+	-rm -rf debian/tmp

Added: trunk/plexus-classworlds/debian/watch
===================================================================
--- trunk/plexus-classworlds/debian/watch	                        (rev 0)
+++ trunk/plexus-classworlds/debian/watch	2009-07-05 00:08:49 UTC (rev 8856)
@@ -0,0 +1,4 @@
+version=3
+http://svn.codehaus.org/plexus/plexus-classworlds/tags/ \
+  plexus-classworlds-(.*)/ debian debian/orig-tar.sh
+

More information about the pkg-java-commits mailing list