[pkg-java] r17331 - trunk/libjdom2-java/debian

Emmanuel Bourg ebourg-guest at alioth.debian.org
Tue Oct 15 18:35:12 UTC 2013


Author: ebourg-guest
Date: 2013-10-15 18:35:12 +0000 (Tue, 15 Oct 2013)
New Revision: 17331

Added:
   trunk/libjdom2-java/debian/libjdom2-java-doc.doc-base
   trunk/libjdom2-java/debian/libjdom2-java-doc.install
   trunk/libjdom2-java/debian/libjdom2-java.poms
Removed:
   trunk/libjdom2-java/debian/libjdom1-java-doc.doc-base
   trunk/libjdom2-java/debian/libjdom1-java-doc.install
   trunk/libjdom2-java/debian/libjdom1-java.poms
Modified:
   trunk/libjdom2-java/debian/README.source
   trunk/libjdom2-java/debian/ant.properties
   trunk/libjdom2-java/debian/changelog
   trunk/libjdom2-java/debian/compat
   trunk/libjdom2-java/debian/control
   trunk/libjdom2-java/debian/copyright
   trunk/libjdom2-java/debian/manifest
   trunk/libjdom2-java/debian/maven.publishedRules
   trunk/libjdom2-java/debian/maven.rules
   trunk/libjdom2-java/debian/orig-tar.sh
   trunk/libjdom2-java/debian/pom.xml
   trunk/libjdom2-java/debian/rules
   trunk/libjdom2-java/debian/watch
Log:
New upstream release (2.0.5)



Modified: trunk/libjdom2-java/debian/README.source
===================================================================
--- trunk/libjdom2-java/debian/README.source	2013-10-15 13:37:26 UTC (rev 17330)
+++ trunk/libjdom2-java/debian/README.source	2013-10-15 18:35:12 UTC (rev 17331)
@@ -1,8 +1,4 @@
-The upstream source tarball has been repacked, with the following
-directories removed:
+Information about libjdom2-java
+-------------------------------
 
- * core/lib/
- * test/lib/
- * contrib/lib/
-
-These contained compiled sources and third-party binary jar files.
+The upstream source tarball has been repacked to removed the third-party binary jar files.

Modified: trunk/libjdom2-java/debian/ant.properties
===================================================================
--- trunk/libjdom2-java/debian/ant.properties	2013-10-15 13:37:26 UTC (rev 17330)
+++ trunk/libjdom2-java/debian/ant.properties	2013-10-15 18:35:12 UTC (rev 17331)
@@ -1,8 +1,10 @@
-compile.source=1.4
-compile.target=1.4
+compile.source=1.6
+compile.target=1.6
 
-parser.jar=/usr/share/java/xercesImpl.jar
-jakarta-regexp.jar=/usr/share/java/regexp.jar
-jaxen.lib.dir=/usr/share/java
+version=2.x
 
-junit.jar=/usr/share/java/junit.jar
+isorelax.jar = /usr/share/java/isorelax.jar
+jaxen.jar    = /usr/share/java/jaxen.jar
+junit.jar    = /usr/share/java/junit4.jar
+parser.jar   = /usr/share/java/xercesImpl.jar
+xalan.jar    = /usr/share/java/xalan2.jar

Modified: trunk/libjdom2-java/debian/changelog
===================================================================
--- trunk/libjdom2-java/debian/changelog	2013-10-15 13:37:26 UTC (rev 17330)
+++ trunk/libjdom2-java/debian/changelog	2013-10-15 18:35:12 UTC (rev 17331)
@@ -1,3 +1,17 @@
+libjdom2-java (2.0.5-1) unstable; urgency=low
+
+  * New upstream release (Closes: #726432)
+    - Updated debian/watch
+    - Updated debian/copyright to acknowledge the new contributors
+    - source/target changed to 1.6
+    - New build dependencies on libisorelax-java and libxalan2-java
+    - Removed the build dependency on libregexp-java
+    - Updated the OSGi metadata
+    - Updated the Maven pom
+  * Use XZ compression for the upstream tarball
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 15 Oct 2013 20:30:05 +0200
+
 libjdom1-java (1.1.3-1) unstable; urgency=low
 
   [ Emmanuel Bourg ]

Modified: trunk/libjdom2-java/debian/compat
===================================================================
--- trunk/libjdom2-java/debian/compat	2013-10-15 13:37:26 UTC (rev 17330)
+++ trunk/libjdom2-java/debian/compat	2013-10-15 18:35:12 UTC (rev 17331)
@@ -1 +1 @@
-7
+9

Modified: trunk/libjdom2-java/debian/control
===================================================================
--- trunk/libjdom2-java/debian/control	2013-10-15 13:37:26 UTC (rev 17330)
+++ trunk/libjdom2-java/debian/control	2013-10-15 18:35:12 UTC (rev 17331)
@@ -1,27 +1,25 @@
-Source: libjdom1-java
+Source: libjdom2-java
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Marcus Better <marcus at better.se>,
-           Damien Raude-Morvan <drazzib at debian.org>,
-           Jakub Adam <jakub.adam at ktknet.cz>,
-           Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: ant, ant-optional, debhelper (>= 7.0.50~), default-jdk
+Uploaders: Emmanuel Bourg <ebourg at apache.org>
+Build-Depends: ant, ant-optional, debhelper (>= 9), default-jdk
 Build-Depends-Indep: javahelper,
-                     junit,
+                     junit4,
+                     libisorelax-java,
                      libjaxen-java,
-                     libregexp-java,
+                     libxalan2-java,
                      libxerces2-java,
                      maven-repo-helper (>= 1.5)
 Standards-Version: 3.9.4
-Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libjdom1-java/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libjdom1-java/
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libjdom2-java/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libjdom2-java/
 Homepage: http://jdom.org
 
-Package: libjdom1-java
+Package: libjdom2-java
 Architecture: all
 Depends: libjaxen-java, ${misc:Depends}
-Suggests: libjdom1-java-doc
+Suggests: libjdom2-java-doc
 Description: lightweight and fast library using XML
  JDOM is, quite simply, a Java representation of an XML document. JDOM
  provides a way to represent that document for easy and efficient
@@ -30,11 +28,11 @@
  an alternative to DOM and SAX, although it integrates well with both
  DOM and SAX.
 
-Package: libjdom1-java-doc
+Package: libjdom2-java-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Suggests: libjdom1-java
+Suggests: libjdom2-java
 Description: lightweight and fast library using XML - documentation
  JDOM is, quite simply, a Java representation of an XML document. JDOM
  provides a way to represent that document for easy and efficient
@@ -43,4 +41,4 @@
  an alternative to DOM and SAX, although it integrates well with both
  DOM and SAX.
  .
- This package contains API documentation (Javadoc) of libjdom1-java.
+ This package contains API documentation (Javadoc) of libjdom2-java.

Modified: trunk/libjdom2-java/debian/copyright
===================================================================
--- trunk/libjdom2-java/debian/copyright	2013-10-15 13:37:26 UTC (rev 17330)
+++ trunk/libjdom2-java/debian/copyright	2013-10-15 18:35:12 UTC (rev 17331)
@@ -1,16 +1,18 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: JDOM
-Upstream-Contact: Jason Hunter, Brett McLaughlin
+Upstream-Contact: Jason Hunter, Brett McLaughlin, Rolf Lear
 Source: https://github.com/hunterhacker/jdom
 
 Files: *
 Copyright: 2000-2004, Brett McLaughlin
-           2000-2004, Jason Hunter
+           2000-2011, Jason Hunter <jhunter at servlets.com>
+           2011-2013, Rolf Lear <jdom at tuis.net>
 License: BSD-4
 
 Files: debian/*
 Copyright: 2008, Marcus Better
            2011, Damien Raude-Morvan
+           2013, Emmanuel bourg
 License: BSD-4
 
 License: BSD-4

Deleted: trunk/libjdom2-java/debian/libjdom1-java-doc.doc-base
===================================================================
--- trunk/libjdom2-java/debian/libjdom1-java-doc.doc-base	2013-10-15 13:37:26 UTC (rev 17330)
+++ trunk/libjdom2-java/debian/libjdom1-java-doc.doc-base	2013-10-15 18:35:12 UTC (rev 17331)
@@ -1,10 +0,0 @@
-Document: libjdom1-java
-Title: Programmer API for jdom release 1.0
-Author: http://www.jdom.org/
-Abstract: Programmer API of the JDOM 1.0 release a 
- lightweight and fast XML library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libjdom1-java/api/index.html
-Files: /usr/share/doc/libjdom1-java/api/*

Deleted: trunk/libjdom2-java/debian/libjdom1-java-doc.install
===================================================================
--- trunk/libjdom2-java/debian/libjdom1-java-doc.install	2013-10-15 13:37:26 UTC (rev 17330)
+++ trunk/libjdom2-java/debian/libjdom1-java-doc.install	2013-10-15 18:35:12 UTC (rev 17331)
@@ -1 +0,0 @@
-core/build/apidocs/* /usr/share/doc/libjdom1-java/api/

Deleted: trunk/libjdom2-java/debian/libjdom1-java.poms
===================================================================
--- trunk/libjdom2-java/debian/libjdom1-java.poms	2013-10-15 13:37:26 UTC (rev 17330)
+++ trunk/libjdom2-java/debian/libjdom1-java.poms	2013-10-15 18:35:12 UTC (rev 17331)
@@ -1 +0,0 @@
-debian/pom.xml --no-parent --has-package-version --java-lib --usj-name=jdom1 --artifact=core/build/jdom-1.SNAPSHOT.jar

Copied: trunk/libjdom2-java/debian/libjdom2-java-doc.doc-base (from rev 17330, trunk/libjdom2-java/debian/libjdom1-java-doc.doc-base)
===================================================================
--- trunk/libjdom2-java/debian/libjdom2-java-doc.doc-base	                        (rev 0)
+++ trunk/libjdom2-java/debian/libjdom2-java-doc.doc-base	2013-10-15 18:35:12 UTC (rev 17331)
@@ -0,0 +1,10 @@
+Document: libjdom2-java
+Title: Programmer API for jdom release 2.0
+Author: http://www.jdom.org/
+Abstract: Programmer API of the JDOM 2.0 release a 
+ lightweight and fast XML library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libjdom2-java/api/index.html
+Files: /usr/share/doc/libjdom2-java/api/*

Copied: trunk/libjdom2-java/debian/libjdom2-java-doc.install (from rev 17330, trunk/libjdom2-java/debian/libjdom1-java-doc.install)
===================================================================
--- trunk/libjdom2-java/debian/libjdom2-java-doc.install	                        (rev 0)
+++ trunk/libjdom2-java/debian/libjdom2-java-doc.install	2013-10-15 18:35:12 UTC (rev 17331)
@@ -0,0 +1 @@
+build/apidocs/* /usr/share/doc/libjdom2-java/api/

Copied: trunk/libjdom2-java/debian/libjdom2-java.poms (from rev 17330, trunk/libjdom2-java/debian/libjdom1-java.poms)
===================================================================
--- trunk/libjdom2-java/debian/libjdom2-java.poms	                        (rev 0)
+++ trunk/libjdom2-java/debian/libjdom2-java.poms	2013-10-15 18:35:12 UTC (rev 17331)
@@ -0,0 +1 @@
+debian/pom.xml --no-parent --has-package-version --java-lib --usj-name=jdom2 --artifact=build/package/jdom-2.x.jar

Modified: trunk/libjdom2-java/debian/manifest
===================================================================
--- trunk/libjdom2-java/debian/manifest	2013-10-15 13:37:26 UTC (rev 17330)
+++ trunk/libjdom2-java/debian/manifest	2013-10-15 18:35:12 UTC (rev 17331)
@@ -1,7 +1,8 @@
-/usr/share/java/jdom1.jar:
+/usr/share/java/jdom2.jar:
  Bundle-ManifestVersion: 2
  Bundle-Name: JDOM XML
  Bundle-Vendor: jdom.org
- Bundle-SymbolicName: org.jdom
- Bundle-Version: 1.1.1
- Export-Package: org.jdom;version="1.1.1",org.jdom.adapters;version="1.1.1",org.jdom.filter;version="1.1.1",org.jdom.input;version="1.1.1",org.jdom.output;version="1.1.1",org.jdom.transform;version="1.1.1",org.jdom.xpath;version="1.1.1"
+ Bundle-SymbolicName: org.jdom2
+ Bundle-Version: 2.0.5
+ Export-Package: org.jdom2.contrib.beans;version="2.0.5",org.jdom2.internal;version="2.0.5",org.jdom2.output;uses:="org.jdom2.output.support,org.jdom2.internal,org.jdom2.adapters,org.jdom2,org.w3c.dom,org.xml.sax,org.xml.sax.ext,javax.xml.stream,javax.xml.stream.util";version="2.0.5",org.jdom2.contrib.input.scanner;version="2.0.5",org.jdom2.input;uses:="org.jdom2,org.w3c.dom,org.xml.sax,org.jdom2.input.sax,org.jdom2.input.stax,javax.xml.stream,javax.xml.stream.events,javax.xml.namespace";version="2.0.5",org.jdom2.util;uses:="org.jdom2,org.jdom2.internal";version="2.0.5",org.jdom2.transform;uses:="org.xml.sax.ext,org.jdom2,org.xml.sax.helpers,org.xml.sax,org.jdom2.input.sax,javax.xml.transform.sax,org.jdom2.output,javax.xml.transform,javax.xml.transform.stream";version="2.0.5",org.jdom2.contrib.helpers;version="2.0.5",org.jdom2.contrib.input.scanner.doc-files;version="2.0.5",org.jdom2.test;version="2.0.5",org.jdom2.adapters;uses:="org.jdom2,org.w3c.dom,javax.xml.parsers";version="2.0.5",org.jdom2.located;uses:="org.jdom2";version="2.0.5",org.jdom2.xpath.jaxen;uses:="org.jaxen.saxpath,org.jaxen,org.jdom2.input,org.jdom2,org.jaxen.util,org.jdom2.xpath,org.jdom2.xpath.util,org.jdom2.filter";version="2.0.5",org.jdom2.test.cases.special;version="2.0.5",org.jdom2.input.stax;uses:="org.jdom2";version="2.0.5",org.jdom2.contrib.dom;version="2.0.5",org.jdom2.contrib.ids;version="2.0.5",org.jdom2.output.support;uses:="org.jdom2,org.jdom2.output,org.jdom2.util,org.w3c.dom,org.jdom2.internal,org.xml.sax.ext,org.xml.sax.helpers,org.xml.sax,javax.xml.stream,javax.xml.stream.events,javax.xml.stream.util";version="2.0.5",org.jdom2.input.sax;uses:="javax.xml.parsers,javax.xml.validation,org.jdom2,org.xml.sax,javax.xml.transform,javax.xml.transform.stream,org.jdom2.input,org.xml.sax.ext,org.xml.sax.helpers,org.jdom2.internal";version="2.0.5",org.jdom2.contrib.input;version="2.0.5",org.jdom2.xpath.util;uses:="org.jdom2,org.jdom2.xpath,org.jdom2.filter";version="2.0.5",org.jdom2;uses:="org.jdom2.internal,org.jdom2.output,org.jdom2.filter,org.jdom2.util";version="2.0.5",org.jdom2.contrib.output;version="2.0.5",org.jdom2.xpath;uses:="org.jdom2,org.jdom2.filter,org.jdom2.internal,org.jdom2.xpath.jaxen";version="2.0.5",org.jdom2.contrib.ids.doc-files;version="2.0.5",org.jdom2.filter;uses:="org.jdom2";version="2.0.5"
+ Import-Package: javax.xml.namespace,javax.xml.parsers,javax.xml.stream,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform,javax.xml.transform.sax,javax.xml.transform.stream,javax.xml.validation,oracle.xml.parser;resolution:=optional,oracle.xml.parser.v2;resolution:=optional,org.apache.xerces.dom;resolution:=optional,org.apache.xerces.parsers;resolution:=optional,org.jaxen;resolution:=optional,org.jaxen.saxpath;resolution:=optional,org.jaxen.util;resolution:=optional,org.jdom;version="1.1",org.jdom.adapters;version="1.1",org.jdom.filter;version="1.1",org.jdom.input;version="1.1",org.jdom.output;version="1.1",org.jdom.transform;version="1.1",org.jdom.xpath;version="1.1",org.w3c.dom,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers

Modified: trunk/libjdom2-java/debian/maven.publishedRules
===================================================================
--- trunk/libjdom2-java/debian/maven.publishedRules	2013-10-15 13:37:26 UTC (rev 17330)
+++ trunk/libjdom2-java/debian/maven.publishedRules	2013-10-15 18:35:12 UTC (rev 17331)
@@ -1,2 +1 @@
-s/jdom/org.jdom/ jdom jar s/1\..*/debian/
 

Modified: trunk/libjdom2-java/debian/maven.rules
===================================================================
--- trunk/libjdom2-java/debian/maven.rules	2013-10-15 13:37:26 UTC (rev 17330)
+++ trunk/libjdom2-java/debian/maven.rules	2013-10-15 18:35:12 UTC (rev 17331)
@@ -1,2 +1 @@
-s/jdom/org.jdom/ jdom jar s/1\..*/debian/
 s/xerces/xml-apis/ s/xmlParserAPIs/xml-apis/ jar s/.*/debian/

Modified: trunk/libjdom2-java/debian/orig-tar.sh
===================================================================
--- trunk/libjdom2-java/debian/orig-tar.sh	2013-10-15 13:37:26 UTC (rev 17330)
+++ trunk/libjdom2-java/debian/orig-tar.sh	2013-10-15 18:35:12 UTC (rev 17331)
@@ -1,13 +1,12 @@
 #!/bin/sh -e
 
 VERSION=$(echo $2)
-TAR=../libjdom1-java_${VERSION}.orig.tar.gz
-DIR=jdom-jdom-*
+TAR=../libjdom2-java_${VERSION}.orig.tar.xz
+DIR=jdom-JDOM-*
 
-tar xvfz $3
+tar xvf $3
 rm $3
-rm -r $DIR/core/lib/* $DIR/test/lib/* $DIR/contrib/lib/*
-tar -c -z -f $TAR $DIR
+tar -c -J -f $TAR --exclude '*.jar' --exclude '.gitignore' $DIR
 rm -rf $DIR
 
 # move to directory 'tarballs'

Modified: trunk/libjdom2-java/debian/pom.xml
===================================================================
--- trunk/libjdom2-java/debian/pom.xml	2013-10-15 13:37:26 UTC (rev 17330)
+++ trunk/libjdom2-java/debian/pom.xml	2013-10-15 18:35:12 UTC (rev 17331)
@@ -1,11 +1,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jdom</groupId>
-	<artifactId>jdom</artifactId>
+	<artifactId>jdom2</artifactId>
 	<packaging>jar</packaging>
 	
 	<name>JDOM</name>
-	<version>1.1.3</version>
+	<version>2.0.5</version>
 	
 	<description>
 		A complete, Java-based solution for accessing, manipulating, 
@@ -31,6 +31,65 @@
 			<name>Similar to Apache License but with the acknowledgment clause removed</name>
 			<url>https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt</url>
 			<distribution>repo</distribution>
+			<comments xml:space="preserve"><![CDATA[
+			
+/*-- 
+
+ Copyright (C) 2000-2012 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>. 
+
+ */
+
+
+
+			]]></comments>
 		</license>
 	</licenses>
 
@@ -57,7 +116,7 @@
 		<dependency>
 			<groupId>jaxen</groupId>
 			<artifactId>jaxen</artifactId>
-			<version>1.1.3</version>
+			<version>1.1.4</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -66,10 +125,16 @@
 			<version>2.10.0</version>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>xalan</groupId>
+			<artifactId>xalan</artifactId>
+			<version>2.7.1</version>
+			<optional>true</optional>
+		</dependency>
 
 	</dependencies>
 	
 	<properties>
-		<jdk.version>1.2</jdk.version>
+		<jdk.version>1.5</jdk.version>
 	</properties>
 </project>
\ No newline at end of file

Modified: trunk/libjdom2-java/debian/rules
===================================================================
--- trunk/libjdom2-java/debian/rules	2013-10-15 13:37:26 UTC (rev 17330)
+++ trunk/libjdom2-java/debian/rules	2013-10-15 18:35:12 UTC (rev 17331)
@@ -11,17 +11,13 @@
 	dh $@ --buildsystem=ant --with maven_repo_helper,javahelper
 
 override_dh_auto_build:
-	$(ANT) dist
-	cp debian/pom.xml core/build/jdom.javadoc.pom
+	$(ANT) jars junit
 
 override_dh_auto_clean:
-	rm -Rf core/build
-	rm -Rf contrib/build
-	rm -Rf test/build test/tmp test/testOutput
-	rm -Rf dist-1.SNAPSHOT
+	rm -Rf build
 
 get-orig-source:
-	-uscan --download-version $(UPSTREAM_VERSION) --force-download
+	-uscan --download-version $(UPSTREAM_VERSION) --force-download --rename
 
 get-orig-pom:
-	wget -U '' -O debian/pom.xml http://repo1.maven.org/maven2/org/jdom/jdom/$(UPSTREAM_VERSION)/jdom-$(UPSTREAM_VERSION).pom
+	wget -U '' -O debian/pom.xml http://repo1.maven.org/maven2/org/jdom/jdom2/$(UPSTREAM_VERSION)/jdom2-$(UPSTREAM_VERSION).pom

Modified: trunk/libjdom2-java/debian/watch
===================================================================
--- trunk/libjdom2-java/debian/watch	2013-10-15 13:37:26 UTC (rev 17330)
+++ trunk/libjdom2-java/debian/watch	2013-10-15 18:35:12 UTC (rev 17331)
@@ -1,5 +1,3 @@
 version=3
 opts="dversionmangle=s/\+dfsg//" \
-  http://githubredir.debian.net/github/hunterhacker/jdom \
-  /github/hunterhacker/jdom/jdom-(.*).tar.gz \
-  debian debian/orig-tar.sh
+https://github.com/hunterhacker/jdom/releases .*/JDOM-(.*).tar.gz  debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list