[pkg-java] r17090 - trunk/libjdom1-java/debian

Emmanuel Bourg ebourg-guest at alioth.debian.org
Mon Jul 29 10:59:33 UTC 2013 

Author: ebourg-guest
Date: 2013-07-29 10:59:33 +0000 (Mon, 29 Jul 2013)
New Revision: 17090

Removed:
   trunk/libjdom1-java/debian/libjdom1-java-doc.lintian-overrides
Modified:
   trunk/libjdom1-java/debian/changelog
   trunk/libjdom1-java/debian/libjdom1-java.poms
   trunk/libjdom1-java/debian/orig-tar.sh
   trunk/libjdom1-java/debian/pom.xml
   trunk/libjdom1-java/debian/rules
Log:
New upstream release (1.1.3)
- Updated the Maven pom
- Dropped the +dfsg qualifier since no non-free feature was removed
- Updated debian/orig-tar.sh for the new source layout
- Removed the unused lintian overrides
Removed the javadoc jar from the documentation package



Modified: trunk/libjdom1-java/debian/changelog
===================================================================
--- trunk/libjdom1-java/debian/changelog	2013-07-29 08:24:01 UTC (rev 17089)
+++ trunk/libjdom1-java/debian/changelog	2013-07-29 10:59:33 UTC (rev 17090)
@@ -1,18 +1,24 @@
-libjdom1-java (1.1.2+dfsg-3) UNRELEASED; urgency=low
+libjdom1-java (1.1.3-1) unstable; urgency=low
 
-  [ tony mancill ]
-  * Correct typo in package description.  (Closes: #703155)
-    - Thanks to Pascal De Vuyst for the bug report.
-
   [ Emmanuel Bourg ]
+  * New upstream release:
+    - Updated the Maven pom
+    - Dropped the +dfsg qualifier since no non-free feature was removed
+    - Updated debian/orig-tar.sh for the new source layout
+    - Removed the unused lintian overrides
+  * Removed the javadoc jar from the documentation package
   * debian/control:
     - Updated Standards-Version to 3.9.4 (no changes)
     - Use canonical URLs in the Vcs-* fields
     - Removed java-virtual-machine from the suggested dependencies
   * debian/copyright: Merged the duplicate Copyright fields
 
- -- tony mancill <tmancill at debian.org>  Sat, 16 Mar 2013 10:54:34 -0700
+  [ tony mancill ]
+  * Correct typo in package description.  (Closes: #703155)
+    - Thanks to Pascal De Vuyst for the bug report.
 
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 29 Jul 2013 11:20:35 +0200
+
 libjdom1-java (1.1.2+dfsg-2) unstable; urgency=low
 
   [ Jakub Adam ]

Deleted: trunk/libjdom1-java/debian/libjdom1-java-doc.lintian-overrides
===================================================================
--- trunk/libjdom1-java/debian/libjdom1-java-doc.lintian-overrides	2013-07-29 08:24:01 UTC (rev 17089)
+++ trunk/libjdom1-java/debian/libjdom1-java-doc.lintian-overrides	2013-07-29 10:59:33 UTC (rev 17090)
@@ -1,3 +0,0 @@
-# /usr/share/maven-repo/org/jdom/jdom/1.1.1/jdom-1.1.1-javadoc.jar
-# only contains HTML files (Javadoc).
-libjdom1-java-doc binary: codeless-jar

Modified: trunk/libjdom1-java/debian/libjdom1-java.poms
===================================================================
--- trunk/libjdom1-java/debian/libjdom1-java.poms	2013-07-29 08:24:01 UTC (rev 17089)
+++ trunk/libjdom1-java/debian/libjdom1-java.poms	2013-07-29 10:59:33 UTC (rev 17090)
@@ -1,2 +1 @@
-debian/pom.xml --no-parent --has-package-version --java-lib --usj-name=jdom1 --artifact=core/build/jdom-1.x-snapshot.jar
-core/build/jdom.javadoc.pom --no-parent --has-package-version --artifact=core/build/jdom-1.x-snapshot-javadoc.jar --classifier=javadoc --ignore-pom --package=libjdom1-java-doc
+debian/pom.xml --no-parent --has-package-version --java-lib --usj-name=jdom1 --artifact=core/build/jdom-1.SNAPSHOT.jar

Modified: trunk/libjdom1-java/debian/orig-tar.sh
===================================================================
--- trunk/libjdom1-java/debian/orig-tar.sh	2013-07-29 08:24:01 UTC (rev 17089)
+++ trunk/libjdom1-java/debian/orig-tar.sh	2013-07-29 10:59:33 UTC (rev 17090)
@@ -1,14 +1,13 @@
 #!/bin/sh -e
 
 VERSION=$(echo $2)
-SRC_TAR=../libjdom1-java_${VERSION}.orig.tar.gz
-DST_TAR=../libjdom1-java_${VERSION}+dfsg.orig.tar.gz
-DIR=hunterhacker-jdom-*
+TAR=../libjdom1-java_${VERSION}.orig.tar.gz
+DIR=jdom-jdom-*
 
-tar xvfz $SRC_TAR
-rm $SRC_TAR
+tar xvfz $3
+rm $3
 rm -r $DIR/core/lib/* $DIR/test/lib/* $DIR/contrib/lib/*
-tar -c -z -f $DST_TAR $DIR
+tar -c -z -f $TAR $DIR
 rm -rf $DIR
 
 # move to directory 'tarballs'

Modified: trunk/libjdom1-java/debian/pom.xml
===================================================================
--- trunk/libjdom1-java/debian/pom.xml	2013-07-29 08:24:01 UTC (rev 17089)
+++ trunk/libjdom1-java/debian/pom.xml	2013-07-29 10:59:33 UTC (rev 17090)
@@ -1,75 +1,75 @@
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jdom</groupId>
-	<artifactId>jdom</artifactId>
-	<packaging>jar</packaging>
-	
-	<name>JDOM</name>
-	<version>1.1.2</version>
-	
-	<description>
-		A complete, Java-based solution for accessing, manipulating, 
-		and outputting XML data
-	</description>
-	<url>http://www.jdom.org</url>
-
-    <organization>
-        <name>JDOM</name>
-        <url>http://www.jdom.org</url>
-    </organization>
-
-    <mailingLists>
-        <mailingList>
-            <name>JDOM-interest Mailing List</name>
-            <post>jdom-interest at jdom.org</post>
-            <archive>http://jdom.markmail.org/</archive>
-        </mailingList>
-    </mailingLists>
-
-	<licenses>
-		<license>
-			<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>
-		</license>
-	</licenses>
-
-	<scm>
-		<url>git at github.com:/hunterhacker/jdom</url>
-		<connection>scm:git:git at github.com:hunterhacker/jdom</connection>
-		<developerConnection>scm:git:git at github.com:hunterhacker/jdom</developerConnection>
-	</scm>
-
-	<developers>
-		<developer>
-			<id>hunterhacker</id>
-			<name>Jason Hunter</name>
-			<email>jhunter at servlets.com</email>
-		</developer>
-		<developer>
-			<id>rolfl</id>
-			<name>Rolf Lear</name>
-			<email>jdom at tuis.net</email>
-		</developer>
-	</developers>
-	
-	<dependencies>
-		<dependency>
-			<groupId>jaxen</groupId>
-			<artifactId>jaxen</artifactId>
-			<version>1.1.3</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>xerces</groupId>
-			<artifactId>xercesImpl</artifactId>
-			<version>2.10.0</version>
-			<optional>true</optional>
-		</dependency>
-
-	</dependencies>
-	
-	<properties>
-		<jdk.version>1.2</jdk.version>
-	</properties>
-</project>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.jdom</groupId>
+	<artifactId>jdom</artifactId>
+	<packaging>jar</packaging>
+	
+	<name>JDOM</name>
+	<version>1.1.3</version>
+	
+	<description>
+		A complete, Java-based solution for accessing, manipulating, 
+		and outputting XML data
+	</description>
+	<url>http://www.jdom.org</url>
+
+    <organization>
+        <name>JDOM</name>
+        <url>http://www.jdom.org</url>
+    </organization>
+
+    <mailingLists>
+        <mailingList>
+            <name>JDOM-interest Mailing List</name>
+            <post>jdom-interest at jdom.org</post>
+            <archive>http://jdom.markmail.org/</archive>
+        </mailingList>
+    </mailingLists>
+
+	<licenses>
+		<license>
+			<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>
+		</license>
+	</licenses>
+
+	<scm>
+		<url>git at github.com:/hunterhacker/jdom</url>
+		<connection>scm:git:git at github.com:hunterhacker/jdom</connection>
+		<developerConnection>scm:git:git at github.com:hunterhacker/jdom</developerConnection>
+	</scm>
+
+	<developers>
+		<developer>
+			<id>hunterhacker</id>
+			<name>Jason Hunter</name>
+			<email>jhunter at servlets.com</email>
+		</developer>
+		<developer>
+			<id>rolfl</id>
+			<name>Rolf Lear</name>
+			<email>jdom at tuis.net</email>
+		</developer>
+	</developers>
+	
+	<dependencies>
+		<dependency>
+			<groupId>jaxen</groupId>
+			<artifactId>jaxen</artifactId>
+			<version>1.1.3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.10.0</version>
+			<optional>true</optional>
+		</dependency>
+
+	</dependencies>
+	
+	<properties>
+		<jdk.version>1.2</jdk.version>
+	</properties>
+</project>
\ No newline at end of file

Modified: trunk/libjdom1-java/debian/rules
===================================================================
--- trunk/libjdom1-java/debian/rules	2013-07-29 08:24:01 UTC (rev 17089)
+++ trunk/libjdom1-java/debian/rules	2013-07-29 10:59:33 UTC (rev 17090)
@@ -14,8 +14,14 @@
 	$(ANT) dist
 	cp debian/pom.xml core/build/jdom.javadoc.pom
 
+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
+
 get-orig-source:
-	-uscan --download-version $(UPSTREAM_VERSION) --force-download --rename
+	-uscan --download-version $(UPSTREAM_VERSION) --force-download
 
 get-orig-pom:
 	wget -U '' -O debian/pom.xml http://repo1.maven.org/maven2/org/jdom/jdom/$(UPSTREAM_VERSION)/jdom-$(UPSTREAM_VERSION).pom

More information about the pkg-java-commits mailing list