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

Ludovic Claude ludovicc-guest at alioth.debian.org
Thu Jul 2 19:59:49 UTC 2009


Author: ludovicc-guest
Date: 2009-07-02 19:59:46 +0000 (Thu, 02 Jul 2009)
New Revision: 8807

Added:
   trunk/libjdom1-java/debian/libjdom1-java.poms
   trunk/libjdom1-java/debian/maven.rules
   trunk/libjdom1-java/debian/orig-tar.sh
   trunk/libjdom1-java/debian/pom.xml
Modified:
   trunk/libjdom1-java/debian/changelog
   trunk/libjdom1-java/debian/control
   trunk/libjdom1-java/debian/copyright
   trunk/libjdom1-java/debian/rules
   trunk/libjdom1-java/debian/watch
Log:
* New version

Modified: trunk/libjdom1-java/debian/changelog
===================================================================
--- trunk/libjdom1-java/debian/changelog	2009-07-02 17:18:32 UTC (rev 8806)
+++ trunk/libjdom1-java/debian/changelog	2009-07-02 19:59:46 UTC (rev 8807)
@@ -1,3 +1,14 @@
+libjdom1-java (1.1+dfsg-2) unstable; 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 <ludovic.claude at laposte.net>  Sat, 16 May 2009 02:32:36 +0100
+
 libjdom1-java (1.1+dfsg-1) unstable; urgency=low
 
   * New upstream version.

Modified: trunk/libjdom1-java/debian/control
===================================================================
--- trunk/libjdom1-java/debian/control	2009-07-02 17:18:32 UTC (rev 8806)
+++ trunk/libjdom1-java/debian/control	2009-07-02 19:59:46 UTC (rev 8807)
@@ -1,17 +1,18 @@
 Source: libjdom1-java
-Section: libs
+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-Indep: debhelper(>= 7), default-jdk-builddep, ant, libjaxen-java
-Standards-Version: 3.8.0.1
+Build-Depends: debhelper(>= 7), default-jdk-builddep, 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
 
 Package: libjdom1-java
 Architecture: all
-Depends: default-jre-headless | java-runtime-headless
+Depends: ${misc:Depends}, default-jre-headless | java-runtime-headless
 Suggests: java-virtual-machine
 Description: lightweight and fast library using XML
  JDOM is, quite simply, a Java representation of an XML document. JDOM

Modified: trunk/libjdom1-java/debian/copyright
===================================================================
--- trunk/libjdom1-java/debian/copyright	2009-07-02 17:18:32 UTC (rev 8806)
+++ trunk/libjdom1-java/debian/copyright	2009-07-02 19:59:46 UTC (rev 8807)
@@ -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

Added: trunk/libjdom1-java/debian/libjdom1-java.poms
===================================================================
--- trunk/libjdom1-java/debian/libjdom1-java.poms	                        (rev 0)
+++ trunk/libjdom1-java/debian/libjdom1-java.poms	2009-07-02 19:59:46 UTC (rev 8807)
@@ -0,0 +1 @@
+debian/pom.xml --no-parent

Added: trunk/libjdom1-java/debian/maven.rules
===================================================================
--- trunk/libjdom1-java/debian/maven.rules	                        (rev 0)
+++ trunk/libjdom1-java/debian/maven.rules	2009-07-02 19:59:46 UTC (rev 8807)
@@ -0,0 +1,2 @@
+s/jdom/org.jdom/ jdom jar s/1\..*/debian/
+s/xerces/xml-apis/ s/xmlParserAPIs/xml-apis/ jar s/.*/debian/

Added: trunk/libjdom1-java/debian/orig-tar.sh
===================================================================
--- trunk/libjdom1-java/debian/orig-tar.sh	                        (rev 0)
+++ trunk/libjdom1-java/debian/orig-tar.sh	2009-07-02 19:59:46 UTC (rev 8807)
@@ -0,0 +1,20 @@
+#!/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 -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


Property changes on: trunk/libjdom1-java/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/libjdom1-java/debian/pom.xml
===================================================================
--- trunk/libjdom1-java/debian/pom.xml	                        (rev 0)
+++ trunk/libjdom1-java/debian/pom.xml	2009-07-02 19:59:46 UTC (rev 8807)
@@ -0,0 +1,61 @@
+<?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>
+
+  <groupId>org.jdom</groupId>
+  <artifactId>jdom</artifactId>
+  <version>1.1</version>
+  <packaging>jar</packaging>
+
+  <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>
+
+  <scm>
+    <connection>scm:cvs:pserver:anonymous at cvs.jdom.org:/home/cvspublic:jdom</connection>
+  </scm>
+
+  <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>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>
+  </dependencies>
+</project>

Modified: trunk/libjdom1-java/debian/rules
===================================================================
--- trunk/libjdom1-java/debian/rules	2009-07-02 17:18:32 UTC (rev 8806)
+++ trunk/libjdom1-java/debian/rules	2009-07-02 19:59:46 UTC (rev 8807)
@@ -11,11 +11,10 @@
 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)
+UPSTREAM_VERSION := $(shell echo "$(VERSION)" | sed 's/+dfsg//')
 
-INSTALLDIR	:= debian/lib$(PKG)-java
-
 build: build-stamp
 build-stamp:
 	dh build
@@ -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
@@ -42,4 +41,10 @@
 
 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

Modified: trunk/libjdom1-java/debian/watch
===================================================================
--- trunk/libjdom1-java/debian/watch	2009-07-02 17:18:32 UTC (rev 8806)
+++ trunk/libjdom1-java/debian/watch	2009-07-02 19:59:46 UTC (rev 8807)
@@ -1,2 +1,3 @@
 version=3
-http://www.jdom.org/dist/source/jdom-([\d.]+)\.tar\.gz
+opts=uversionmangle=s/$/+dfsg/ \
+  http://www.jdom.org/dist/source/jdom-(\d.*)\.tar\.gz debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list