diff -u libjdom1-java-1.1+dfsg/debian/copyright libjdom1-java-1.1+dfsg/debian/copyright --- libjdom1-java-1.1+dfsg/debian/copyright +++ libjdom1-java-1.1+dfsg/debian/copyright @@ -1,7 +1,7 @@ -Format-Specification: - http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196 -Upstream-Name: JDOM -Upstream-Source: http://jdom.org +Format-Specification: http://dep.debian.net/deps/dep5/ +Name: JDOM +Maintainer: Jason Hunter, Brett McLaughlin +Source: http://jdom.org Files: * Copyright: Copyright 2000-2004 Brett McLaughlin diff -u libjdom1-java-1.1+dfsg/debian/ant.properties libjdom1-java-1.1+dfsg/debian/ant.properties --- libjdom1-java-1.1+dfsg/debian/ant.properties +++ libjdom1-java-1.1+dfsg/debian/ant.properties @@ -2,0 +3,4 @@ +lib.dir=/usr/share/java +parser.jar=/usr/share/java/xercesImpl.jar + + diff -u libjdom1-java-1.1+dfsg/debian/changelog libjdom1-java-1.1+dfsg/debian/changelog --- libjdom1-java-1.1+dfsg/debian/changelog +++ libjdom1-java-1.1+dfsg/debian/changelog @@ -1,3 +1,28 @@ +libjdom1-java (1.1+dfsg-3ubuntu1) karmic; urgency=low + + * Merge with Debian; remaining changes: + - Use default-jdk rather as default-jdk-builddep is overkill. + - Set minimal runtime dependency to java2-runtime-headless. + + -- Matthias Klose Sun, 18 Oct 2009 17:10:25 +0200 + +libjdom1-java (1.1+dfsg-3) unstable; urgency=low + + * Upload to unstable. + + -- Torsten Werner Sun, 09 Aug 2009 12:12:30 +0200 + +libjdom1-java (1.1+dfsg-2) experimental; urgency=low + + * Add watch file + * Change section to java, bump up Standards-Version to 3.8.1 + * Add the Maven POM to the package, + * Add a Build-Depends-Indep dependency on maven-repo-helper + * Use mh_installpom and mh_installjar to install the POM and the jar to the + Maven repository + + -- Ludovic Claude Sat, 16 May 2009 02:32:36 +0100 + libjdom1-java (1.1+dfsg-1ubuntu1) karmic; urgency=low * debian/control policy fixes: diff -u libjdom1-java-1.1+dfsg/debian/control libjdom1-java-1.1+dfsg/debian/control --- libjdom1-java-1.1+dfsg/debian/control +++ libjdom1-java-1.1+dfsg/debian/control @@ -4,9 +4,9 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: Arnaud Vandyck , Marcus Better -Build-Depends: debhelper(>= 7), ant -Build-Depends-Indep: default-jdk, libjaxen-java -Standards-Version: 3.8.0.1 +Build-Depends: debhelper(>= 7), 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 diff -u libjdom1-java-1.1+dfsg/debian/rules libjdom1-java-1.1+dfsg/debian/rules --- libjdom1-java-1.1+dfsg/debian/rules +++ libjdom1-java-1.1+dfsg/debian/rules @@ -11,10 +11,9 @@ ANT := $(JAVA_HOME)/bin/java -classpath $(DEB_CLASSPATH) \ org.apache.tools.ant.Main $(ANT_ARGS) -PKG := jdom1 +PACKAGE := libjdom1-java VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 | cut -d'-' -f1) - -INSTALLDIR := debian/lib$(PKG)-java +UPSTREAM_VERSION := $(shell echo "$(VERSION)" | sed 's/+dfsg//') build: build-stamp build-stamp: @@ -25,13 +24,13 @@ clean: dh clean $(ANT) clean - + -rm -rf debian/tmp install: build install-stamp install-stamp: dh install - install -m 644 build/jdom.jar $(INSTALLDIR)/usr/share/java/$(PKG)-$(VERSION).jar - ln -s $(PKG)-$(VERSION).jar $(INSTALLDIR)/usr/share/java/$(PKG).jar + mh_installpoms -p$(PACKAGE) + mh_installjar -p$(PACKAGE) -l --usj-name=jdom1 debian/pom.xml build/jdom.jar touch install-stamp binary-arch: install @@ -44,2 +43,8 @@ +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 only in patch2: unchanged: --- libjdom1-java-1.1+dfsg.orig/debian/libjdom1-java.poms +++ libjdom1-java-1.1+dfsg/debian/libjdom1-java.poms @@ -0,0 +1 @@ +debian/pom.xml --no-parent only in patch2: unchanged: --- libjdom1-java-1.1+dfsg.orig/debian/watch +++ libjdom1-java-1.1+dfsg/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=uversionmangle=s/$/+dfsg/ \ + http://www.jdom.org/dist/source/jdom-(\d.*)\.tar\.gz debian debian/orig-tar.sh only in patch2: unchanged: --- libjdom1-java-1.1+dfsg.orig/debian/pom.xml +++ libjdom1-java-1.1+dfsg/debian/pom.xml @@ -0,0 +1,61 @@ + + + 4.0.0 + + org.jdom + jdom + 1.1 + jar + + JDOM + + 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. + + http://www.jdom.org/ + + + scm:cvs:pserver:anonymous@cvs.jdom.org:/home/cvspublic:jdom + + + + + xerces + xercesImpl + 2.6.1 + true + + + xerces + xmlParserAPIs + 2.6.1 + true + + + org.jdom + jaxen-core + 1.0-FCS + true + + + org.jdom + jaxen-jdom + 1.0-FCS + true + + + org.jdom + saxpath + 1.0-FCS + true + + + xalan + xalan + 2.5.D1 + true + + + only in patch2: unchanged: --- libjdom1-java-1.1+dfsg.orig/debian/orig-tar.sh +++ libjdom1-java-1.1+dfsg/debian/orig-tar.sh @@ -0,0 +1,21 @@ +#!/bin/sh -e + +TAR=../libjdom1-java_$2.orig.tar.gz +VERSION=$(echo $2 | sed 's/+dfsg//' ) +DIR=jdom-$VERSION +TAG=libjdom1-java-$VERSION + +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 + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir + echo "moved $TAR to $origDir" +fi only in patch2: unchanged: --- libjdom1-java-1.1+dfsg.orig/debian/maven.rules +++ libjdom1-java-1.1+dfsg/debian/maven.rules @@ -0,0 +1,2 @@ +s/jdom/org.jdom/ jdom jar s/1\..*/debian/ +s/xerces/xml-apis/ s/xmlParserAPIs/xml-apis/ jar s/.*/debian/