[pkg-java] r15331 - in trunk/libjdom1-java/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Wed Nov 2 21:56:12 UTC 2011
Author: drazzib
Date: 2011-11-02 21:56:12 +0000 (Wed, 02 Nov 2011)
New Revision: 15331
Modified:
trunk/libjdom1-java/debian/README.source
trunk/libjdom1-java/debian/ant.properties
trunk/libjdom1-java/debian/changelog
trunk/libjdom1-java/debian/control
trunk/libjdom1-java/debian/copyright
trunk/libjdom1-java/debian/libjdom1-java-doc.install
trunk/libjdom1-java/debian/libjdom1-java.poms
trunk/libjdom1-java/debian/orig-tar.sh
trunk/libjdom1-java/debian/patches/add-osgi-metadata.patch
trunk/libjdom1-java/debian/pom.xml
trunk/libjdom1-java/debian/rules
trunk/libjdom1-java/debian/watch
Log:
* New upstream release!
- d/watch: Update to github.
- d/README.source,d/orig-tar.sh: Updated.
- d/control: Add Build-Deps on libregexp-java for contrib.
* d/control: Add missing Build-Deps on libxerces2-java.
* Enable unit testing:
- d/control: Add Build-Deps on junit and ant-optional.
- d/ant.properties: Set junit.jar property.
Modified: trunk/libjdom1-java/debian/README.source
===================================================================
--- trunk/libjdom1-java/debian/README.source 2011-11-02 20:50:51 UTC (rev 15330)
+++ trunk/libjdom1-java/debian/README.source 2011-11-02 21:56:12 UTC (rev 15331)
@@ -1,7 +1,8 @@
The upstream source tarball has been repacked, with the following
directories removed:
- * build/
- * lib/
+ * core/lib/
+ * test/lib/
+ * contrib/lib/
These contained compiled sources and third-party binary jar files.
Modified: trunk/libjdom1-java/debian/ant.properties
===================================================================
--- trunk/libjdom1-java/debian/ant.properties 2011-11-02 20:50:51 UTC (rev 15330)
+++ trunk/libjdom1-java/debian/ant.properties 2011-11-02 21:56:12 UTC (rev 15331)
@@ -1,6 +1,8 @@
compile.source=1.4
compile.target=1.4
-lib.dir=/usr/share/java
+
parser.jar=/usr/share/java/xercesImpl.jar
-compile.class.path=/usr/share/java/jaxen.jar
+jakarta-regexp.jar=/usr/share/java/regexp.jar
+jaxen.lib.dir=/usr/share/java
+junit.jar=/usr/share/java/junit.jar
Modified: trunk/libjdom1-java/debian/changelog
===================================================================
--- trunk/libjdom1-java/debian/changelog 2011-11-02 20:50:51 UTC (rev 15330)
+++ trunk/libjdom1-java/debian/changelog 2011-11-02 21:56:12 UTC (rev 15331)
@@ -1,3 +1,16 @@
+libjdom1-java (1.1.2+dfsg-1) unstable; urgency=low
+
+ * New upstream release!
+ - d/watch: Update to github.
+ - d/README.source,d/orig-tar.sh: Updated.
+ - d/control: Add Build-Deps on libregexp-java for contrib.
+ * d/control: Add missing Build-Deps on libxerces2-java.
+ * Enable unit testing:
+ - d/control: Add Build-Deps on junit and ant-optional.
+ - d/ant.properties: Set junit.jar property.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 02 Nov 2011 22:13:47 +0100
+
libjdom1-java (1.1.1+dfsg-5) unstable; urgency=low
[Jakub Adam]
Modified: trunk/libjdom1-java/debian/control
===================================================================
--- trunk/libjdom1-java/debian/control 2011-11-02 20:50:51 UTC (rev 15330)
+++ trunk/libjdom1-java/debian/control 2011-11-02 21:56:12 UTC (rev 15331)
@@ -3,10 +3,14 @@
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>
-Build-Depends: debhelper (>= 7.0.50~), default-jdk, ant
-Build-Depends-Indep: maven-repo-helper (>= 1.5), libjaxen-java
+ Damien Raude-Morvan <drazzib at debian.org>,
+ Jakub Adam <jakub.adam at ktknet.cz>
+Build-Depends: ant, ant-optional, debhelper (>= 7.0.50~), default-jdk
+Build-Depends-Indep: junit,
+ libjaxen-java,
+ libregexp-java,
+ libxerces2-java,
+ maven-repo-helper (>= 1.5)
Standards-Version: 3.9.2
Homepage: http://jdom.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjdom1-java/
@@ -15,7 +19,7 @@
Package: libjdom1-java
Architecture: all
Depends: ${misc:Depends}
-Suggests: libjdom1-java-doc, java-virtual-machine
+Suggests: java-virtual-machine, libjdom1-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
Modified: trunk/libjdom1-java/debian/copyright
===================================================================
--- trunk/libjdom1-java/debian/copyright 2011-11-02 20:50:51 UTC (rev 15330)
+++ trunk/libjdom1-java/debian/copyright 2011-11-02 21:56:12 UTC (rev 15331)
@@ -1,7 +1,7 @@
Format: http://dep.debian.net/deps/dep5/
Upstream-Name: JDOM
Upstream-Contact: Jason Hunter, Brett McLaughlin
-Source: http://jdom.org
+Source: https://github.com/hunterhacker/jdom
Files: *
Copyright: Copyright 2000-2004 Brett McLaughlin
@@ -10,6 +10,7 @@
Files: debian/*
Copyright: Copyright 2008 Marcus Better
+Copyright: Copyright 2011 Damien Raude-Morvan
License: BSD-4
License: BSD-4
@@ -21,8 +22,8 @@
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
+ 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
@@ -33,12 +34,12 @@
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
+ 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
+ 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
@@ -54,8 +55,8 @@
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
+ 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/>.
+ on the JDOM Project, please see <http://www.jdom.org/>.
Modified: trunk/libjdom1-java/debian/libjdom1-java-doc.install
===================================================================
--- trunk/libjdom1-java/debian/libjdom1-java-doc.install 2011-11-02 20:50:51 UTC (rev 15330)
+++ trunk/libjdom1-java/debian/libjdom1-java-doc.install 2011-11-02 21:56:12 UTC (rev 15331)
@@ -1 +1 @@
-build/apidocs/* /usr/share/doc/libjdom1-java/api/
+core/build/apidocs/* /usr/share/doc/libjdom1-java/api/
Modified: trunk/libjdom1-java/debian/libjdom1-java.poms
===================================================================
--- trunk/libjdom1-java/debian/libjdom1-java.poms 2011-11-02 20:50:51 UTC (rev 15330)
+++ trunk/libjdom1-java/debian/libjdom1-java.poms 2011-11-02 21:56:12 UTC (rev 15331)
@@ -1,2 +1,2 @@
-debian/pom.xml --no-parent --has-package-version --java-lib --usj-name=jdom1 --artifact=build/jdom.jar
-build/jdom.javadoc.pom --no-parent --has-package-version --artifact=build/jdom.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.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
Modified: trunk/libjdom1-java/debian/orig-tar.sh
===================================================================
--- trunk/libjdom1-java/debian/orig-tar.sh 2011-11-02 20:50:51 UTC (rev 15330)
+++ trunk/libjdom1-java/debian/orig-tar.sh 2011-11-02 21:56:12 UTC (rev 15331)
@@ -1,17 +1,15 @@
#!/bin/sh -e
-TAR=../libjdom1-java_$2.orig.tar.gz
-VERSION=$(echo $2 | sed 's/+dfsg//' )
-DIR=jdom
-TAG=libjdom1-java-$VERSION
+VERSION=$(echo $2)
+SRC_TAR=../libjdom1-java_${VERSION}.orig.tar.gz
+DST_TAR=../libjdom1-java_${VERSION}+dfsg.orig.tar.gz
+DIR=hunterhacker-jdom-*
-tar xvfz $TAR
-rm $TAR
-rm -f jdom.tar.gz
-rm -r $DIR/build/*
-rm -r $DIR/lib/*
-tar -c -z -f $TAR $DIR
-rm -rf $DIR ../$TAG
+tar xvfz $SRC_TAR
+rm $SRC_TAR
+rm -r $DIR/core/lib/* $DIR/test/lib/* $DIR/contrib/lib/*
+tar -c -z -f $DST_TAR $DIR
+rm -rf $DIR
# move to directory 'tarballs'
if [ -r .svn/deb-layout ]; then
Modified: trunk/libjdom1-java/debian/patches/add-osgi-metadata.patch
===================================================================
--- trunk/libjdom1-java/debian/patches/add-osgi-metadata.patch 2011-11-02 20:50:51 UTC (rev 15330)
+++ trunk/libjdom1-java/debian/patches/add-osgi-metadata.patch 2011-11-02 21:56:12 UTC (rev 15331)
@@ -8,8 +8,8 @@
diff --git a/package/META-INF/MANIFEST.MF b/package/META-INF/MANIFEST.MF
index f00bc13..f0b3eab 100644
---- a/package/META-INF/MANIFEST.MF
-+++ b/package/META-INF/MANIFEST.MF
+--- a/core/package/META-INF/MANIFEST.MF
++++ b/core/package/META-INF/MANIFEST.MF
@@ -1,4 +1,16 @@
Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
Modified: trunk/libjdom1-java/debian/pom.xml
===================================================================
--- trunk/libjdom1-java/debian/pom.xml 2011-11-02 20:50:51 UTC (rev 15330)
+++ trunk/libjdom1-java/debian/pom.xml 2011-11-02 21:56:12 UTC (rev 15331)
@@ -1,49 +1,75 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<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>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.1.1</version>
- <packaging>jar</packaging>
+ <organization>
+ <name>JDOM</name>
+ <url>http://www.jdom.org</url>
+ </organization>
- <name>JDOM</name>
- <description>
- JDOM is, quite simply, a Java representation of an XML document. JDOM provides a way to represent that document for
- easy and efficient reading, manipulation, and writing. It has a straightforward API, is a lightweight and fast, and
- is optimized for the Java programmer. It's an alternative to DOM and SAX, although it integrates well with both DOM
- and SAX.
- </description>
- <url>http://www.jdom.org/</url>
+ <mailingLists>
+ <mailingList>
+ <name>JDOM-interest Mailing List</name>
+ <post>jdom-interest at jdom.org</post>
+ <archive>http://jdom.markmail.org/</archive>
+ </mailingList>
+ </mailingLists>
- <scm>
- <connection>scm:cvs:pserver:anonymous at cvs.jdom.org:/home/cvspublic:jdom</connection>
- </scm>
+ <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>
- <dependencies>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.6.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>2.6.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.5.D1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.2</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
+ <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>
Modified: trunk/libjdom1-java/debian/rules
===================================================================
--- trunk/libjdom1-java/debian/rules 2011-11-02 20:50:51 UTC (rev 15330)
+++ trunk/libjdom1-java/debian/rules 2011-11-02 21:56:12 UTC (rev 15331)
@@ -11,12 +11,11 @@
dh $@ --buildsystem=ant --with maven_repo_helper
override_dh_auto_build:
- $(ANT) package javadoc
- jar cvf build/jdom.javadoc.jar -C build/apidocs/ .
- cp debian/pom.xml build/jdom.javadoc.pom
+ $(ANT) dist
+ cp debian/pom.xml core/build/jdom.javadoc.pom
get-orig-source:
- -uscan --download-version $(VERSION) --force-download --rename
+ -uscan --download-version $(UPSTREAM_VERSION) --force-download --rename
get-orig-pom:
- wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/org/jdom/jdom/$(UPSTREAM_VERSION)/jdom-$(UPSTREAM_VERSION).pom
+ wget -U '' -O debian/pom.xml http://repo1.maven.org/maven2/org/jdom/jdom/$(UPSTREAM_VERSION)/jdom-$(UPSTREAM_VERSION).pom
Modified: trunk/libjdom1-java/debian/watch
===================================================================
--- trunk/libjdom1-java/debian/watch 2011-11-02 20:50:51 UTC (rev 15330)
+++ trunk/libjdom1-java/debian/watch 2011-11-02 21:56:12 UTC (rev 15331)
@@ -1,3 +1,5 @@
version=3
opts="dversionmangle=s/\+dfsg//" \
- http://www.jdom.org/dist/source/jdom-(\d.*)\.tar\.gz debian debian/orig-tar.sh
+ http://githubredir.debian.net/github/hunterhacker/jdom \
+ /github/hunterhacker/jdom/jdom-(.*).tar.gz \
+ debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list