[pkg-java] r8743 - in trunk/classworlds/debian: . patches

Ludovic Claude ludovicc-guest at alioth.debian.org
Thu Jul 2 00:01:09 UTC 2009 

Author: ludovicc-guest
Date: 2009-07-02 00:01:02 +0000 (Thu, 02 Jul 2009)
New Revision: 8743

Added:
   trunk/classworlds/debian/maven.rules
   trunk/classworlds/debian/orig-tar.sh
   trunk/classworlds/debian/patches/
   trunk/classworlds/debian/patches/pom.diff
   trunk/classworlds/debian/patches/series
Removed:
   trunk/classworlds/debian/build.xml
Modified:
   trunk/classworlds/debian/build.properties
   trunk/classworlds/debian/changelog
   trunk/classworlds/debian/control
   trunk/classworlds/debian/rules
Log:
* Add Maven support

Modified: trunk/classworlds/debian/build.properties
===================================================================
--- trunk/classworlds/debian/build.properties	2009-07-01 23:48:49 UTC (rev 8742)
+++ trunk/classworlds/debian/build.properties	2009-07-02 00:01:02 UTC (rev 8743)
@@ -1 +1,3 @@
 javadoc.dir=build/api
+maven.test.skip=true
+build.sourceDirectory=src/java/main

Deleted: trunk/classworlds/debian/build.xml
===================================================================
--- trunk/classworlds/debian/build.xml	2009-07-01 23:48:49 UTC (rev 8742)
+++ trunk/classworlds/debian/build.xml	2009-07-02 00:01:02 UTC (rev 8743)
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="classworlds" default="package" basedir="..">
-
-    <property file="debian/build.properties"/>
-    <property name="build.sourceDirectory" value="src/java/main"/>
-    <property name="maven.test.skip" value="true"/>
-    <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
-
-    <target name="clean">
-        <ant target="clean" antfile="/usr/share/maven-ant-helper/maven-build.xml" dir="."/>
-    </target>
-
-    <target name="package">
-        <ant target="package" antfile="/usr/share/maven-ant-helper/maven-build.xml" dir=".">
-            <property name="artifactId" value="classworlds"/>
-        </ant>
-    </target>
- 
-    <target name="javadoc">
-        <ant target="javadoc" antfile="/usr/share/maven-ant-helper/maven-build.xml" dir=".">
-            <property name="artifactId" value="classworlds"/>
-        </ant>
-    </target>
-</project>

Modified: trunk/classworlds/debian/changelog
===================================================================
--- trunk/classworlds/debian/changelog	2009-07-01 23:48:49 UTC (rev 8742)
+++ trunk/classworlds/debian/changelog	2009-07-02 00:01:02 UTC (rev 8743)
@@ -1,3 +1,16 @@
+classworlds (1.1-final-2) unstable; urgency=low
+
+  * Add watch file
+  * 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
+  * Use quilt to patch the POM and use <project> as the top level element
+  * Change the dependency on java-gcj to default-jdk (Closes: #526281)
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 16 Apr 2009 15:00:16 +0100
+
 classworlds (1.1-final-1) unstable; urgency=low
 
   * Update to the 1.1 release.

Modified: trunk/classworlds/debian/control
===================================================================
--- trunk/classworlds/debian/control	2009-07-01 23:48:49 UTC (rev 8742)
+++ trunk/classworlds/debian/control	2009-07-02 00:01:02 UTC (rev 8743)
@@ -1,15 +1,17 @@
 Source: classworlds
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Trygve Laugstøl <trygvis at inamo.no>, Paul Cager <paul-debian at home.paulcager.org>
-Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional, libxalan2-java, maven-ant-helper (>=3)
-Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
-Standards-Version: 3.7.2
+Build-Depends-Indep: ant, ant-optional, libxalan2-java, maven-ant-helper (>> 4),
+ maven-repo-helper
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk, quilt
+Standards-Version: 3.8.1
 
 Package: libclassworlds-java
 Architecture: all
-Section: libs
+Section: java
+Depends: ${misc:Depends}
 Suggests: libclassworlds-java-doc
 Description: framework for container developers requiring manipulation of ClassLoaders
  Classworlds is a framework for container developers who require complex
@@ -26,7 +28,7 @@
 Package: libclassworlds-java-doc
 Architecture: all
 Section: doc
-Depends: classpath-doc
+Depends: ${misc:Depends}, classpath-doc
 Suggests: libclassworlds-java
 Description: Documentation for the Classworlds Java library
  Classworlds is a framework for container developers who require complex

Added: trunk/classworlds/debian/maven.rules
===================================================================
--- trunk/classworlds/debian/maven.rules	                        (rev 0)
+++ trunk/classworlds/debian/maven.rules	2009-07-02 00:01:02 UTC (rev 8743)
@@ -0,0 +1 @@
+junit junit jar s/3\..*/3.x/

Added: trunk/classworlds/debian/orig-tar.sh
===================================================================
--- trunk/classworlds/debian/orig-tar.sh	                        (rev 0)
+++ trunk/classworlds/debian/orig-tar.sh	2009-07-02 00:01:02 UTC (rev 8743)
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+VERSION=$2
+TAR=../classworlds_$VERSION.orig.tar.gz
+DIR=classworlds-$VERSION
+TAG=$(echo "CLASSWORLDS_$VERSION" | sed 's,1\.1-final,1_1,' | sed 's,-\(alpha\),_ALPHA_,' | sed 's,-\(beta\),_BETA_,' | sed 's,-\(rc\),_RC_,' | sed 's,\([0-9]\)\.,\1_,g' )
+
+svn export http://svn.codehaus.org/classworlds/tags/$TAG/classworlds/ $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/classworlds/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/classworlds/debian/patches/pom.diff
===================================================================
--- trunk/classworlds/debian/patches/pom.diff	                        (rev 0)
+++ trunk/classworlds/debian/patches/pom.diff	2009-07-02 00:01:02 UTC (rev 8743)
@@ -0,0 +1,21 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -1,10 +1,10 @@
+-<model>
++<project>
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>classworlds</groupId>
+   <artifactId>classworlds</artifactId>
+   <packaging>jar</packaging>
+   <name>classworlds</name>
+-  <version>1.1-beta-1-SNAPSHOT</version>
++  <version>1.1</version>
+   <description></description>
+   <url>http://cvs.classworlds.codehaus.org/</url>
+   <inceptionYear>2002</inceptionYear>
+@@ -133,4 +133,4 @@
+     <name>The Codehaus</name>
+     <url>http://codehaus.org/</url>
+   </organization>
+-</model>
++</project>

Added: trunk/classworlds/debian/patches/series
===================================================================
--- trunk/classworlds/debian/patches/series	                        (rev 0)
+++ trunk/classworlds/debian/patches/series	2009-07-02 00:01:02 UTC (rev 8743)
@@ -0,0 +1 @@
+pom.diff

Modified: trunk/classworlds/debian/rules
===================================================================
--- trunk/classworlds/debian/rules	2009-07-01 23:48:49 UTC (rev 8742)
+++ trunk/classworlds/debian/rules	2009-07-02 00:01:02 UTC (rev 8743)
@@ -2,32 +2,26 @@
 
 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
+include /usr/share/cdbs/1/rules/patchsys-quilt.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
-DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar xalan2
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_JARS             := ant-trax ant-nodeps xalan2
 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)
+DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
+DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
 API_DOCS             := build/api
-SVN                  := http://svn.codehaus.org/classworlds/tags/CLASSWORLDS_1_1_ALPHA_2/classworlds
 
 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)/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
 
 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 --usj-version=$(VERSION) build/$(PACKAGE)-$(VERSION).jar
 
 binary-post-install/lib$(PACKAGE)-java-doc::
 	dh_install -plib$(PACKAGE)-java-doc build/api usr/share/doc/lib$(PACKAGE)-java
+
+clean::
+	-rm -rf debian/tmp

More information about the pkg-java-commits mailing list