[pkg-java] r14956 - trunk/libcommons-discovery-java/debian

Torsten Werner twerner at alioth.debian.org
Mon Sep 19 21:29:37 UTC 2011


Author: twerner
Date: 2011-09-19 21:29:37 +0000 (Mon, 19 Sep 2011)
New Revision: 14956

Added:
   trunk/libcommons-discovery-java/debian/README.source
   trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.doc-base.api
   trunk/libcommons-discovery-java/debian/maven.cleanIgnoreRules
   trunk/libcommons-discovery-java/debian/maven.ignoreRules
   trunk/libcommons-discovery-java/debian/maven.properties
   trunk/libcommons-discovery-java/debian/maven.publishedRules
Removed:
   trunk/libcommons-discovery-java/debian/ant.properties
   trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.doc-base
   trunk/libcommons-discovery-java/debian/patches/
   trunk/libcommons-discovery-java/debian/pom.xml
Modified:
   trunk/libcommons-discovery-java/debian/changelog
   trunk/libcommons-discovery-java/debian/compat
   trunk/libcommons-discovery-java/debian/control
   trunk/libcommons-discovery-java/debian/copyright
   trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.install
   trunk/libcommons-discovery-java/debian/libcommons-discovery-java.poms
   trunk/libcommons-discovery-java/debian/maven.rules
   trunk/libcommons-discovery-java/debian/orig-tar.sh
   trunk/libcommons-discovery-java/debian/rules
   trunk/libcommons-discovery-java/debian/watch
Log:
* New upstream version.
* Update debian/copyright.
* Use Maven to build the package.
* Drop old patch which is not needed anymore.
* Update debian/watch to create orig tarball from upstreams svn repository.

Added: trunk/libcommons-discovery-java/debian/README.source
===================================================================
--- trunk/libcommons-discovery-java/debian/README.source	                        (rev 0)
+++ trunk/libcommons-discovery-java/debian/README.source	2011-09-19 21:29:37 UTC (rev 14956)
@@ -0,0 +1,9 @@
+Information about libcommons-discovery-java
+------------------------------
+
+This package was debianized using the mh_make command
+from the maven-debian-helper package.
+
+The build system uses Maven but prevents it from downloading
+anything from the Internet, making the build compliant with
+the Debian policy.

Deleted: trunk/libcommons-discovery-java/debian/ant.properties
===================================================================
--- trunk/libcommons-discovery-java/debian/ant.properties	2011-09-19 21:08:33 UTC (rev 14955)
+++ trunk/libcommons-discovery-java/debian/ant.properties	2011-09-19 21:29:37 UTC (rev 14956)
@@ -1,5 +0,0 @@
-junit.jar=/usr/share/java/junit.jar
-logger.jar=/usr/share/java/commons-logging.jar
-ant.build.javac.source=1.3
-ant.build.javac.target=1.3
-

Modified: trunk/libcommons-discovery-java/debian/changelog
===================================================================
--- trunk/libcommons-discovery-java/debian/changelog	2011-09-19 21:08:33 UTC (rev 14955)
+++ trunk/libcommons-discovery-java/debian/changelog	2011-09-19 21:29:37 UTC (rev 14956)
@@ -1,4 +1,4 @@
-libcommons-discovery-java (0.4-5) UNRELEASED; urgency=low
+libcommons-discovery-java (0.5-1) UNRELEASED; urgency=low
 
   * Team upload
 
@@ -8,8 +8,13 @@
 
   [ Torsten Werner ]
   * Update Standards-Version: 3.9.2.
+  * New upstream version.
+  * Update debian/copyright.
+  * Use Maven to build the package.
+  * Drop old patch which is not needed anymore.
+  * Update debian/watch to create orig tarball from upstreams svn repository.
 
- -- Torsten Werner <twerner at debian.org>  Mon, 19 Sep 2011 23:07:56 +0200
+ -- Torsten Werner <twerner at debian.org>  Mon, 19 Sep 2011 23:25:59 +0200
 
 libcommons-discovery-java (0.4-4) unstable; urgency=low
 

Modified: trunk/libcommons-discovery-java/debian/compat
===================================================================
--- trunk/libcommons-discovery-java/debian/compat	2011-09-19 21:08:33 UTC (rev 14955)
+++ trunk/libcommons-discovery-java/debian/compat	2011-09-19 21:29:37 UTC (rev 14956)
@@ -1,2 +1 @@
 7
-

Modified: trunk/libcommons-discovery-java/debian/control
===================================================================
--- trunk/libcommons-discovery-java/debian/control	2011-09-19 21:08:33 UTC (rev 14955)
+++ trunk/libcommons-discovery-java/debian/control	2011-09-19 21:29:37 UTC (rev 14956)
@@ -4,8 +4,9 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at debian.org>,
  Kumar Appaiah <akumar at debian.org>, Varun Hiremath <varun at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, ant, default-jdk
-Build-Depends-Indep: libcommons-logging-java, junit, ant-optional, maven-repo-helper
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: libcommons-logging-java, junit4, default-jdk-doc, libcommons-logging-java-doc,  
+ libmaven-javadoc-plugin-java 
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-discovery-java/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-discovery-java/
@@ -13,7 +14,8 @@
 
 Package: libcommons-discovery-java
 Architecture: all
-Depends: ${misc:Depends}, libcommons-logging-java
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
 Suggests: libcommons-discovery-java-doc
 Description: locates classes that implement a given Java interface
  The Discovery Component is about discovering, or finding,
@@ -36,7 +38,9 @@
 Package: libcommons-discovery-java-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libcommons-discovery-java
 Description: locates classes that implement a given Java interface (documentation)
  The Discovery Component is about discovering, or finding,
  implementations for pluggable interfaces. It provides facilities

Modified: trunk/libcommons-discovery-java/debian/copyright
===================================================================
--- trunk/libcommons-discovery-java/debian/copyright	2011-09-19 21:08:33 UTC (rev 14955)
+++ trunk/libcommons-discovery-java/debian/copyright	2011-09-19 21:29:37 UTC (rev 14956)
@@ -12,7 +12,7 @@
                   Rory Winston <rwinston at eircom.net>,
                   Robert Burrell Donkin <rdonkin at apache.org >
 
-Copyright: © 2002-2008 The Apache Software Foundation
+Copyright: © 2002-2011 The Apache Software Foundation
 
 License: Apache-2.0
 

Deleted: trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.doc-base
===================================================================
--- trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.doc-base	2011-09-19 21:08:33 UTC (rev 14955)
+++ trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.doc-base	2011-09-19 21:29:37 UTC (rev 14956)
@@ -1,13 +0,0 @@
-Document: libcommons-discovery-java
-Title: Programmer API for Commons Discovery
-Author: The Apache Commons Discovery Team
-Abstract: This is the javadoc API of libcommons-discovery-java, a java library
- for discovering, or finding implementations for pluggable interfaces. It 
- provides facilities instantiating classes in general, and for lifecycle 
- management of singleton (factory) classes.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libcommons-discovery-java/api/index.html
-Files: /usr/share/doc/libcommons-discovery-java/api/*.html
-

Copied: trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.doc-base.api (from rev 14954, trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.doc-base)
===================================================================
--- trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.doc-base.api	                        (rev 0)
+++ trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.doc-base.api	2011-09-19 21:29:37 UTC (rev 14956)
@@ -0,0 +1,10 @@
+Document: libcommons-discovery-java
+Title: API Javadoc for Commons Discovery
+Author: Commons Discovery developers
+Abstract: This is the API Javadoc provided for the
+ libcommons-discovery-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libcommons-discovery-java/api/index.html
+Files: /usr/share/doc/libcommons-discovery-java/api/*

Modified: trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.install
===================================================================
--- trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.install	2011-09-19 21:08:33 UTC (rev 14955)
+++ trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.install	2011-09-19 21:29:37 UTC (rev 14956)
@@ -1 +1,2 @@
-dist/docs/api /usr/share/doc/libcommons-discovery-java/
+target/apidocs/* usr/share/doc/libcommons-discovery-java/api
+

Modified: trunk/libcommons-discovery-java/debian/libcommons-discovery-java.poms
===================================================================
--- trunk/libcommons-discovery-java/debian/libcommons-discovery-java.poms	2011-09-19 21:08:33 UTC (rev 14955)
+++ trunk/libcommons-discovery-java/debian/libcommons-discovery-java.poms	2011-09-19 21:29:37 UTC (rev 14956)
@@ -1 +1,26 @@
-debian/pom.xml
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+#   --ignore: ignore this POM or
+#   --no-parent: remove the <parent> tag from the POM
+#   --package=<package>: an alternative package to use when installing this POM
+#      and its artifact
+#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+#      of the version for the package.
+#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+#      during a clean operation with mh_cleanpom or mh_installpom
+#   --artifact=<path>: path to the build artifact associated with this POM,
+#      it will be installed when using the command mh_install
+#   --java-lib: install the jar into /usr/share/java to comply with Debian
+#      packaging guidelines
+#   --usj-name=<name>: name to use when installing the library in /usr/share/java
+#   --usj-version=<version>: version to use when installing the library in /usr/share/java
+#   --no-usj-versionless: don't install the versionless link in /usr/share/java
+#   --dest-jar=<path>: the destination for the real jar
+#   it will be installed with mh_install.
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --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 --no-parent --has-package-version

Added: trunk/libcommons-discovery-java/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/libcommons-discovery-java/debian/maven.cleanIgnoreRules	                        (rev 0)
+++ trunk/libcommons-discovery-java/debian/maven.cleanIgnoreRules	2011-09-19 21:29:37 UTC (rev 14956)
@@ -0,0 +1,17 @@
+# Maven clean ignore rules - ignore some Maven dependencies and plugins
+# during the clean phase of a Maven build
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+#   for the version. In this case, the element is simply matched
+#   and left as it is
+# - * (the star character, alone). In this case, anything will
+#   match and be left as it is. For example, using * on the
+#  position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM before mvn clean is called
+#   junit junit jar s/3\\..*/3.x/
+

Added: trunk/libcommons-discovery-java/debian/maven.ignoreRules
===================================================================
--- trunk/libcommons-discovery-java/debian/maven.ignoreRules	                        (rev 0)
+++ trunk/libcommons-discovery-java/debian/maven.ignoreRules	2011-09-19 21:29:37 UTC (rev 14956)
@@ -0,0 +1,20 @@
+# Maven ignore rules - ignore some Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+#   for the version. In this case, the element is simply matched
+#   and left as it is
+# - * (the star character, alone). In this case, anything will
+#   match and be left as it is. For example, using * on the
+#  position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM
+#   junit junit jar s/3\\..*/3.x/
+
+org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-changes-plugin * * * *
+org.apache.maven.plugins maven-checkstyle-plugin * * * *
+org.codehaus.mojo findbugs-maven-plugin * * * *

Added: trunk/libcommons-discovery-java/debian/maven.properties
===================================================================
--- trunk/libcommons-discovery-java/debian/maven.properties	                        (rev 0)
+++ trunk/libcommons-discovery-java/debian/maven.properties	2011-09-19 21:29:37 UTC (rev 14956)
@@ -0,0 +1,4 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+

Added: trunk/libcommons-discovery-java/debian/maven.publishedRules
===================================================================
--- trunk/libcommons-discovery-java/debian/maven.publishedRules	                        (rev 0)
+++ trunk/libcommons-discovery-java/debian/maven.publishedRules	2011-09-19 21:29:37 UTC (rev 14956)
@@ -0,0 +1,19 @@
+# Maven published rules - additional rules to publish, to help
+# the packaging work of Debian maintainers using mh_make
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+#   for the version. In this case, the element is simply matched
+#   and left as it is
+# - * (the star character, alone). In this case, anything will
+#   match and be left as it is. For example, using * on the
+#  position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+#   in this case, elements that match are transformed using
+#   the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+#   junit junit jar s/3\\..*/3.x/
+

Modified: trunk/libcommons-discovery-java/debian/maven.rules
===================================================================
--- trunk/libcommons-discovery-java/debian/maven.rules	2011-09-19 21:08:33 UTC (rev 14955)
+++ trunk/libcommons-discovery-java/debian/maven.rules	2011-09-19 21:29:37 UTC (rev 14956)
@@ -1,2 +1,21 @@
-junit junit jar s/3\..*/3.x/
+# Maven rules - transform Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+#   for the version. In this case, the element is simply matched
+#   and left as it is
+# - * (the star character, alone). In this case, anything will
+#   match and be left as it is. For example, using * on the
+#  position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+#   in this case, elements that match are transformed using
+#   the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+#   junit junit jar s/3\\..*/3.x/
 
+commons-discovery commons-discovery jar s/.*/debian/ * *
+junit junit jar s/4\..*/4.x/ * *
+commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *

Modified: trunk/libcommons-discovery-java/debian/orig-tar.sh
===================================================================
--- trunk/libcommons-discovery-java/debian/orig-tar.sh	2011-09-19 21:08:33 UTC (rev 14955)
+++ trunk/libcommons-discovery-java/debian/orig-tar.sh	2011-09-19 21:29:37 UTC (rev 14956)
@@ -1,12 +1,18 @@
-#!/bin/sh -e
+#!/bin/sh
 
-# called by uscan with '--upstream-version' <version> <file>
+set -eu
 
+VERSION=$2
+TAR=../libcommons-discovery-java_$VERSION.orig.tar.gz
+DIR=commons-discovery-$VERSION
+TAG=$(echo "DISCOVERY_$VERSION" | sed -re's,\.,_,g')
+
+svn export http://svn.apache.org/repos/asf/commons/proper/discovery/tags/${TAG}/ $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 $3 $origDir
-    echo "moved $3 to $origDir"
+  . .svn/deb-layout
+  mv $TAR $origDir && echo "moved $TAR to $origDir"
 fi
-
-exit 0

Deleted: trunk/libcommons-discovery-java/debian/pom.xml
===================================================================
--- trunk/libcommons-discovery-java/debian/pom.xml	2011-09-19 21:08:33 UTC (rev 14955)
+++ trunk/libcommons-discovery-java/debian/pom.xml	2011-09-19 21:29:37 UTC (rev 14956)
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>commons-discovery</groupId>
-  <artifactId>commons-discovery</artifactId>
-  <name>Discovery</name>
-  <version>0.4</version>
-  <description>Commons Discovery</description>
-  <url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
-  <issueManagement>
-    <url>http://issues.apache.org/jira/</url>
-  </issueManagement>
-  <ciManagement>
-    <notifiers>
-      <notifier>
-        <configuration>
-          <address>commons-dev at jakarta.apache.org</address>
-        </configuration>
-      </notifier>
-    </notifiers>
-  </ciManagement>
-  <inceptionYear>2002</inceptionYear>
-  <mailingLists>
-    <mailingList>
-      <name>Commons Dev List</name>
-      <subscribe>commons-dev-subscribe at jakarta.apache.org</subscribe>
-      <unsubscribe>commons-dev-unsubscribe at jakarta.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive>
-    </mailingList>
-    <mailingList>
-      <name>Commons User List</name>
-      <subscribe>commons-user-subscribe at jakarta.apache.org</subscribe>
-      <unsubscribe>commons-user-unsubscribe at jakarta.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive>
-    </mailingList>
-  </mailingLists>
-  <developers>
-    <developer>
-      <id>rsitze</id>
-      <name>Richard Sitze</name>
-      <email></email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <id>craigmcc</id>
-      <name>Craig R. McClanahan</name>
-      <email></email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <id>costin</id>
-      <name>Costin Manolache</name>
-      <email></email>
-      <organization></organization>
-    </developer>
-    <developer>
-      <id>jstrachan</id>
-      <name>James Strachan</name>
-      <email>jstrachan at apache.org</email>
-      <organization>SpiritSoft, Inc.</organization>
-    </developer>
-    <developer>
-      <id>matth</id>
-      <name>Matthew Hawthorne</name>
-      <email>matth at apache.org</email>
-    </developer>
-    <developer>
-      <id>dims</id>
-      <name>Davanum Srinivas</name>
-      <email>dims at apache.org</email>
-    </developer>
-    <developer>
-      <id>rwinston</id>
-      <name>Rory Winston</name>
-      <email>rwinston at eircom.net</email>
-    </developer>
-    <developer>
-      <id>rdonkin</id>
-      <name>Robert Burrell Donkin</name>
-      <email>rdonkin at apache.org</email>
-    </developer>
-  </developers>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>/LICENSE.txt</url>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</connection>
-    <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</url>
-  </scm>
-  <organization>
-    <name>The Apache Software Foundation</name>
-    <url>http://jakarta.apache.org</url>
-  </organization>
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
-    <resources>
-      <resource>
-        <targetPath>META-INF</targetPath>
-        <directory>${basedir}</directory>
-        <includes>
-          <include>NOTICE.txt</include>
-        </includes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>${basedir}/src</directory>
-        <includes>
-          <include>**/testResource</include>
-        </includes>
-      </testResource>
-      <testResource>
-        <directory>${basedir}/src/test</directory>
-        <includes>
-          <include>**/*.properties</include>
-          <include>META-INF/**</include>
-        </includes>
-      </testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>**/TestAll.java</include>
-          </includes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-xdoc-plugin</artifactId>
-        <version>1.9.2</version>
-        <configuration>
-          <comment><strong>Site Only</strong> - v1.9.2 (minimum)
-              required for building the Site documentation.</comment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.7</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <distributionManagement>
-    <repository>
-      <id>default</id>
-      <name>Default Repository</name>
-      <url>file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</url>
-    </repository>
-    <site>
-      <id>default</id>
-      <name>Default Site</name>
-      <url>scp://people.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
-    </site>
-    <status>converted</status>
-  </distributionManagement>
-</project>
\ No newline at end of file

Modified: trunk/libcommons-discovery-java/debian/rules
===================================================================
--- trunk/libcommons-discovery-java/debian/rules	2011-09-19 21:08:33 UTC (rev 14955)
+++ trunk/libcommons-discovery-java/debian/rules	2011-09-19 21:29:37 UTC (rev 14956)
@@ -1,21 +1,9 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/class/maven.mk
 
-JAVA_HOME_DIRS       := /usr/lib/jvm/default-java
-ANT_HOME             := /usr/share/ant
-DEB_JARS             := commons-logging junit $(ANT_HOME)/lib/ant-launcher.jar
-DEB_ANT_BUILD_TARGET := dist test.discovery
+JAVA_HOME := /usr/lib/jvm/default-java
 
-LIBRARY=commons-discovery
-
-install/lib${LIBRARY}-java::
-	mh_installpoms -plib${LIBRARY}-java
-	mh_installjar -plib${LIBRARY}-java -l debian/pom.xml dist/${LIBRARY}.jar
-
-clean::
-	-rm -rf debian/tmp
-
 get-orig-source:
-	-uscan --upstream-version 0 --rename
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

Modified: trunk/libcommons-discovery-java/debian/watch
===================================================================
--- trunk/libcommons-discovery-java/debian/watch	2011-09-19 21:08:33 UTC (rev 14955)
+++ trunk/libcommons-discovery-java/debian/watch	2011-09-19 21:29:37 UTC (rev 14956)
@@ -1,3 +1,6 @@
 version=3
-http://www.apache.org/dist/commons/discovery/source/ commons-discovery-([\d\.]+)-src.tar.gz debian debian/orig-tar.sh
 
+opts="uversionmangle=s/_/./g" \
+    http://svn.apache.org/repos/asf/commons/proper/discovery/tags/ \
+    DISCOVERY_([\d_]*)/ debian debian/orig-tar.sh
+




More information about the pkg-java-commits mailing list