[pkg-java] r11039 - trunk/libjdom1-java/debian
Damien Raude-Morvan
drazzib at alioth.debian.org
Sun Nov 8 19:03:48 UTC 2009
Author: drazzib
Date: 2009-11-08 19:03:47 +0000 (Sun, 08 Nov 2009)
New Revision: 11039
Added:
trunk/libjdom1-java/debian/libjdom1-java-doc.doc-base
trunk/libjdom1-java/debian/libjdom1-java-doc.install
Removed:
trunk/libjdom1-java/debian/dirs
trunk/libjdom1-java/debian/doc-base
trunk/libjdom1-java/debian/docs
Modified:
trunk/libjdom1-java/debian/ant.properties
trunk/libjdom1-java/debian/changelog
trunk/libjdom1-java/debian/control
trunk/libjdom1-java/debian/orig-tar.sh
trunk/libjdom1-java/debian/pom.xml
trunk/libjdom1-java/debian/rules
Log:
* New upstream version.
- Update debian/pom.xml
* New libjdom1-java-doc package:
- Split API Javadoc from bytecode (Closes: #506366)
- Install API Javadoc to /usr/share/doc/libjdom1-java/api/
* Add myself to Uploaders
* Build-Depends on default-jdk instead of default-jdk-builddep
because we don't build a native GCJ package.
* Use Debhelper 7:
- Refactor debian/rules file (Closes: #538020)
- Define classpath in debian/ant.properties
* Bump Standards-Version to 3.8.3 (no changes needed)
Modified: trunk/libjdom1-java/debian/ant.properties
===================================================================
--- trunk/libjdom1-java/debian/ant.properties 2009-11-08 19:02:44 UTC (rev 11038)
+++ trunk/libjdom1-java/debian/ant.properties 2009-11-08 19:03:47 UTC (rev 11039)
@@ -2,5 +2,5 @@
compile.target=1.4
lib.dir=/usr/share/java
parser.jar=/usr/share/java/xercesImpl.jar
+compile.class.path=/usr/share/java/jaxen.jar
-
Modified: trunk/libjdom1-java/debian/changelog
===================================================================
--- trunk/libjdom1-java/debian/changelog 2009-11-08 19:02:44 UTC (rev 11038)
+++ trunk/libjdom1-java/debian/changelog 2009-11-08 19:03:47 UTC (rev 11039)
@@ -1,3 +1,20 @@
+libjdom1-java (1.1.1+dfsg-1) unstable; urgency=low
+
+ * New upstream version.
+ - Update debian/pom.xml
+ * New libjdom1-java-doc package:
+ - Split API Javadoc from bytecode (Closes: #506366)
+ - Install API Javadoc to /usr/share/doc/libjdom1-java/api/
+ * Add myself to Uploaders
+ * Build-Depends on default-jdk instead of default-jdk-builddep
+ because we don't build a native GCJ package.
+ * Use Debhelper 7:
+ - Refactor debian/rules file (Closes: #538020)
+ - Define classpath in debian/ant.properties
+ * Bump Standards-Version to 3.8.3 (no changes needed)
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 08 Nov 2009 19:06:15 +0100
+
libjdom1-java (1.1+dfsg-3) unstable; urgency=low
* Upload to unstable.
Modified: trunk/libjdom1-java/debian/control
===================================================================
--- trunk/libjdom1-java/debian/control 2009-11-08 19:02:44 UTC (rev 11038)
+++ trunk/libjdom1-java/debian/control 2009-11-08 19:03:47 UTC (rev 11039)
@@ -2,13 +2,14 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Marcus Better <marcus at better.se>
-Build-Depends: debhelper(>= 7), default-jdk-builddep, ant
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Marcus Better <marcus at better.se>,
+ Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: debhelper (>= 7.0.50~), default-jdk, ant
Build-Depends-Indep: maven-repo-helper, libjaxen-java
-Standards-Version: 3.8.1
-Homepage: http://jdom.org
-Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libjdom1-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjdom1-java
+Standards-Version: 3.8.3
+Homepage: http://jdom.org/
+Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libjdom1-java/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjdom1-java/
Package: libjdom1-java
Architecture: all
@@ -21,3 +22,18 @@
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.
+
+Package: libjdom1-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: libjdom1-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
+ 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.
+ .
+ This package contains API documentation (Javadoc) of libjdom1-java.
Deleted: trunk/libjdom1-java/debian/dirs
===================================================================
--- trunk/libjdom1-java/debian/dirs 2009-11-08 19:02:44 UTC (rev 11038)
+++ trunk/libjdom1-java/debian/dirs 2009-11-08 19:03:47 UTC (rev 11039)
@@ -1 +0,0 @@
-usr/share/java
Deleted: trunk/libjdom1-java/debian/doc-base
===================================================================
--- trunk/libjdom1-java/debian/doc-base 2009-11-08 19:02:44 UTC (rev 11038)
+++ trunk/libjdom1-java/debian/doc-base 2009-11-08 19:03:47 UTC (rev 11039)
@@ -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/apidocs/index.html
-Files: /usr/share/doc/libjdom1-java/apidocs/*
Deleted: trunk/libjdom1-java/debian/docs
===================================================================
--- trunk/libjdom1-java/debian/docs 2009-11-08 19:02:44 UTC (rev 11038)
+++ trunk/libjdom1-java/debian/docs 2009-11-08 19:03:47 UTC (rev 11039)
@@ -1 +0,0 @@
-build/apidocs
Copied: trunk/libjdom1-java/debian/libjdom1-java-doc.doc-base (from rev 11035, trunk/libjdom1-java/debian/doc-base)
===================================================================
--- trunk/libjdom1-java/debian/libjdom1-java-doc.doc-base (rev 0)
+++ trunk/libjdom1-java/debian/libjdom1-java-doc.doc-base 2009-11-08 19:03:47 UTC (rev 11039)
@@ -0,0 +1,10 @@
+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/*
Copied: trunk/libjdom1-java/debian/libjdom1-java-doc.install (from rev 11035, trunk/libjdom1-java/debian/docs)
===================================================================
--- trunk/libjdom1-java/debian/libjdom1-java-doc.install (rev 0)
+++ trunk/libjdom1-java/debian/libjdom1-java-doc.install 2009-11-08 19:03:47 UTC (rev 11039)
@@ -0,0 +1 @@
+build/apidocs/* /usr/share/doc/libjdom1-java/api/
Modified: trunk/libjdom1-java/debian/orig-tar.sh
===================================================================
--- trunk/libjdom1-java/debian/orig-tar.sh 2009-11-08 19:02:44 UTC (rev 11038)
+++ trunk/libjdom1-java/debian/orig-tar.sh 2009-11-08 19:03:47 UTC (rev 11039)
@@ -2,14 +2,14 @@
TAR=../libjdom1-java_$2.orig.tar.gz
VERSION=$(echo $2 | sed 's/+dfsg//' )
-DIR=jdom-$VERSION
+DIR=jdom
TAG=libjdom1-java-$VERSION
tar xvfz $TAR
rm $TAR
rm -f jdom.tar.gz
-rm -r $DIR/build
-rm -r $DIR/lib
+rm -r $DIR/build/*
+rm -r $DIR/lib/*
tar -c -z -f $TAR $DIR
rm -rf $DIR ../$TAG
Modified: trunk/libjdom1-java/debian/pom.xml
===================================================================
--- trunk/libjdom1-java/debian/pom.xml 2009-11-08 19:02:44 UTC (rev 11038)
+++ trunk/libjdom1-java/debian/pom.xml 2009-11-08 19:03:47 UTC (rev 11039)
@@ -4,7 +4,7 @@
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
<packaging>jar</packaging>
<name>JDOM</name>
@@ -34,28 +34,16 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jaxen-core</artifactId>
- <version>1.0-FCS</version> <!-- patched 1.0-FCS -->
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jaxen-jdom</artifactId>
- <version>1.0-FCS</version> <!-- patched 1.0-FCS -->
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>saxpath</artifactId>
- <version>1.0-FCS</version> <!-- patched 1.0-FCS -->
- <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>
</project>
Modified: trunk/libjdom1-java/debian/rules
===================================================================
--- trunk/libjdom1-java/debian/rules 2009-11-08 19:02:44 UTC (rev 11038)
+++ trunk/libjdom1-java/debian/rules 2009-11-08 19:03:47 UTC (rev 11039)
@@ -1,50 +1,26 @@
#!/usr/bin/make -f
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := ant ant-launcher jaxen
-
-DEB_CLASSPATH = $(shell for jar in $(DEB_JARS:%=/usr/share/java/%.jar); do \
- echo -n $${jar}:; done; \
- echo -n $(JAVA_HOME)/lib/tools.jar)
-
ANT_ARGS := -propertyfile debian/ant.properties
-ANT := $(JAVA_HOME)/bin/java -classpath $(DEB_CLASSPATH) \
- org.apache.tools.ant.Main $(ANT_ARGS)
+ANT := JAVA_HOME=$(JAVA_HOME) ant $(ANT_ARGS)
PACKAGE := libjdom1-java
VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 | cut -d'-' -f1)
UPSTREAM_VERSION := $(shell echo "$(VERSION)" | sed 's/+dfsg//')
-build: build-stamp
-build-stamp:
- dh build
+%:
+ dh $@ --buildsystem=ant
+
+override_dh_auto_build:
$(ANT) package javadoc
- touch build-stamp
-clean:
- dh clean
- $(ANT) clean
- -rm -rf debian/tmp
-
-install: build install-stamp
-install-stamp:
- dh install
+override_dh_auto_install:
mh_installpoms -p$(PACKAGE)
mh_installjar -p$(PACKAGE) -l --usj-name=jdom1 debian/pom.xml build/jdom.jar
- touch install-stamp
-binary-arch: install
- dh binary-arch
-binary-indep: install
- dh binary-indep
-
-binary: binary-arch binary-indep
-
get-orig-source:
-uscan --download-version $(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
-
-.PHONY: build clean install binary-indep binary-arch binary
More information about the pkg-java-commits
mailing list