Author: twerner
Date: 2010-05-27 20:03:17 +0000 (Thu, 27 May 2010)
New Revision: 12516

Added:
   trunk/dom4j/dom4j/debian/pom.xml
Removed:
   trunk/dom4j/dom4j/debian/svn-deblayout
Modified:
   trunk/dom4j/dom4j/debian/changelog
   trunk/dom4j/dom4j/debian/compat
   trunk/dom4j/dom4j/debian/control
   trunk/dom4j/dom4j/debian/copyright
   trunk/dom4j/dom4j/debian/rules
Log:
* Team upload.
* Update Homepage to point to sourceforge site.
* Install POM file.
* Ignore test failures.
* Make libdom4j-java Depend on default-jre-headless instead of kaffe.
* Build-Depends on debhelper >= 7.
* Use dh_prep instead of dh_clean -k.
* Updated Standards-Version to 3.8.3.

Modified: trunk/dom4j/dom4j/debian/changelog
===================================================================
--- trunk/dom4j/dom4j/debian/changelog  2010-05-25 22:00:59 UTC (rev 12515)
+++ trunk/dom4j/dom4j/debian/changelog  2010-05-27 20:03:17 UTC (rev 12516)
@@ -1,3 +1,21 @@
+dom4j (1.6.1+dfsg.2-3) unstable; urgency=low
+
+  * Team upload.
+  * Update Homepage to point to sourceforge site.
+  * Install POM file.
+  * Ignore test failures.
+
+ -- Torsten Werner <twer...@debian.org>  Thu, 27 May 2010 21:55:34 +0200
+
+dom4j (1.6.1+dfsg.2-2) unstable; urgency=low
+
+  * Make libdom4j-java Depend on default-jre-headless instead of kaffe.
+  * Build-Depends on debhelper >= 7.
+  * Use dh_prep instead of dh_clean -k.
+  * Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <konque...@gmx.de>  Fri, 25 Sep 2009 20:21:02 +0200
+
 dom4j (1.6.1+dfsg.2-1) unstable; urgency=low
 
   * Remove non-free generated files. (Closes: #529308)

Modified: trunk/dom4j/dom4j/debian/compat
===================================================================
--- trunk/dom4j/dom4j/debian/compat     2010-05-25 22:00:59 UTC (rev 12515)
+++ trunk/dom4j/dom4j/debian/compat     2010-05-27 20:03:17 UTC (rev 12516)
@@ -1 +1 @@
-5
+7

Modified: trunk/dom4j/dom4j/debian/control
===================================================================
--- trunk/dom4j/dom4j/debian/control    2010-05-25 22:00:59 UTC (rev 12515)
+++ trunk/dom4j/dom4j/debian/control    2010-05-27 20:03:17 UTC (rev 12516)
@@ -3,17 +3,17 @@
 Priority: optional
 Maintainer: Debian Java Maintainers 
<pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Marcus Better <mar...@better.se>, Michael Koch <konque...@gmx.de>
-Build-Depends: debhelper (>= 5), ant-optional
-Build-Depends-Indep: antlr, openjdk-6-jdk, libjaxen-java, libjaxme-java, 
libxpp2-java, libxpp3-java, libxerces2-java, libxalan2-java (>= 2.7.0), 
libbackport-util-concurrent-java, junit, libjunitperf-java
-Standards-Version: 3.8.2
+Build-Depends: debhelper (>= 7), ant-optional, openjdk-6-jdk, maven-repo-helper
+Build-Depends-Indep: antlr, libjaxen-java, libjaxme-java, libxpp2-java, 
libxpp3-java, libxerces2-java, libxalan2-java (>= 2.7.0), 
libbackport-util-concurrent-java, junit, libjunitperf-java
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/dom4j
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/dom4j
-Homepage: http://www.dom4j.org
+Homepage: http://sourceforge.net/projects/dom4j/
 
 Package: libdom4j-java
 Architecture: all
-Depends: kaffe | java1-runtime | java2-runtime, libjaxen-java, libjaxme-java, 
libxpp2-java, libxpp3-java, libbackport-util-concurrent-java
-Suggests: java-virtual-machine, libdom4j-java-doc
+Depends: default-jre-headless | java2-runtime-headless, libjaxen-java, 
libjaxme-java, libxpp2-java, libxpp3-java, libbackport-util-concurrent-java
+Suggests: libdom4j-java-doc
 Description: flexible XML framework for Java
  dom4j is a library for working with XML, XPath and XSLT on the Java
  platform using the Java Collections Framework and with full support

Modified: trunk/dom4j/dom4j/debian/copyright
===================================================================
--- trunk/dom4j/dom4j/debian/copyright  2010-05-25 22:00:59 UTC (rev 12515)
+++ trunk/dom4j/dom4j/debian/copyright  2010-05-27 20:03:17 UTC (rev 12516)
@@ -2,7 +2,7 @@
     http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=48
 Name: dom4j
 Maintainer: http://lists.sourceforge.net/lists/listinfo/dom4j-user
-Source: http://www.dom4j.org
+Source: http://sourceforge.net/projects/dom4j/
 
 Copyright: 2001-2005, MetaStuff, Ltd.
 License: DOM4J

Added: trunk/dom4j/dom4j/debian/pom.xml
===================================================================
--- trunk/dom4j/dom4j/debian/pom.xml                            (rev 0)
+++ trunk/dom4j/dom4j/debian/pom.xml    2010-05-27 20:03:17 UTC (rev 12516)
@@ -0,0 +1,221 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>dom4j</groupId>
+  <artifactId>dom4j</artifactId>
+  <name>dom4j</name>
+  <version>1.6.1</version>
+  <description>dom4j: the flexible XML framework for Java</description>
+  <url>http://dom4j.org</url>
+  <issueManagement>
+    <url>http://sourceforge.net/tracker/?group_id=16035</url>
+  </issueManagement>
+  <ciManagement>
+    <notifiers>
+      <notifier>
+        <address>dom4j-...@lists.sourceforge.net</address>
+      </notifier>
+    </notifiers>
+  </ciManagement>
+  <inceptionYear>2001</inceptionYear>
+  <mailingLists>
+    <mailingList>
+      <name>dom4j user list</name>
+      
<subscribe>http://lists.sourceforge.net/lists/listinfo/dom4j-user</subscribe>
+      
<unsubscribe>http://lists.sourceforge.net/lists/listinfo/dom4j-user</unsubscribe>
+      
<archive>http://www.mail-archive.com/dom4j-user%40lists.sourceforge.net/</archive>
+    </mailingList>
+    <mailingList>
+      <name>dom4j developer list</name>
+      
<subscribe>http://lists.sourceforge.net/lists/listinfo/dom4j-dev</subscribe>
+      
<unsubscribe>http://lists.sourceforge.net/lists/listinfo/dom4j-dev</unsubscribe>
+      
<archive>http://www.mail-archive.com/dom4j-dev%40lists.sourceforge.net/</archive>
+    </mailingList>
+    <mailingList>
+      <name>dom4j commits list</name>
+      
<subscribe>http://lists.sourceforge.net/lists/listinfo/dom4j-commits</subscribe>
+      
<unsubscribe>http://lists.sourceforge.net/lists/listinfo/dom4j-commits</unsubscribe>
+    </mailingList>
+  </mailingLists>
+  <developers>
+    <developer>
+      <id>carnold</id>
+      <name>Curt Arnold</name>
+      <email>carn...@users.sourceforge.net</email>
+    </developer>
+    <developer>
+      <id>ddlucas</id>
+      <name>David Lucas</name>
+      <email>ddlu...@users.sourceforge.net</email>
+    </developer>
+    <developer>
+      <id>drwhite</id>
+      <name>David White</name>
+      <email>drwh...@users.sourceforge.net</email>
+    </developer>
+    <developer>
+      <id>jjenkov</id>
+      <name>Jakob Jenkov</name>
+      <email>jjen...@users.sourceforge.net</email>
+    </developer>
+    <developer>
+      <id>jstrachan</id>
+      <name>James Strachan</name>
+      <email>jstrac...@apache.org</email>
+      <organization>SpiritSoft, Inc.</organization>
+    </developer>
+    <developer>
+      <id>laramiec</id>
+      <name>Laramie Crocker</name>
+      <email>laram...@users.sourceforge.net</email>
+    </developer>
+    <developer>
+      <id>maartenc</id>
+      <name>Maarten Coene</name>
+      <email>maart...@users.sourceforge.net</email>
+      <organization>Cronos</organization>
+    </developer>
+    <developer>
+      <id>mskells</id>
+      <name>Michael Skells</name>
+      <email>mske...@users.sourceforge.net</email>
+    </developer>
+    <developer>
+      <id>nicksanderson</id>
+      <name>Nick Sanderson</name>
+      <email>nicksander...@users.sourceforge.net</email>
+    </developer>
+    <developer>
+      <id>slehmann</id>
+      <name>Steen Lehmann</name>
+      <email>slehm...@users.sourceforge.net</email>
+    </developer>
+    <developer>
+      <id>tradem</id>
+      <name>Tobias Rademacher</name>
+      <email>tra...@users.sourceforge.net</email>
+    </developer>
+    <developer>
+      <id>werken</id>
+      <name>Bob McWhirter</name>
+      <email>wer...@users.sourceforge.net</email>
+    </developer>
+    <developer>
+      <id>wolfftw</id>
+      <name>Todd Wolff</name>
+      <email>wolf...@users.sourceforge.net</email>
+    </developer>
+    <developer>
+      <id>yeekee</id>
+      <name>OuYang Chen</name>
+      <email>yee...@users.sourceforge.net</email>
+    </developer>
+    <developer>
+      <id>yruan2</id>
+      <name>Yuxin Ruan</name>
+      <email>yru...@users.sourceforge.net</email>
+    </developer>
+  </developers>
+  <scm>
+    
<connection>scm:cvs:pserver:anonym...@cvs.sourceforge.net:/cvsroot/dom4j:dom4j</connection>
+    
<developerConnection>scm:cvs:ext:${maven.userna...@cvs.sourceforge.net:/cvsroot/dom4j:dom4j</developerConnection>
+    <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/dom4j/dom4j/</url>
+  </scm>
+  <organization>
+    <name>MetaStuff Ltd.</name>
+    <url>http://sourceforge.net/projects/dom4j</url>
+  </organization>
+  <build>
+    <sourceDirectory>src/java</sourceDirectory>
+    <testSourceDirectory>src/test</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>**/*Test.java</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>jaxme</groupId>
+      <artifactId>jaxme-api</artifactId>
+      <version>0.3</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>jaxen</groupId>
+      <artifactId>jaxen</artifactId>
+      <version>1.1-beta-6</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>msv</groupId>
+      <artifactId>xsdlib</artifactId>
+      <version>20030807</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>msv</groupId>
+      <artifactId>relaxngDatatype</artifactId>
+      <version>20030807</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>pull-parser</groupId>
+      <artifactId>pull-parser</artifactId>
+      <version>2</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>xpp3</groupId>
+      <artifactId>xpp3</artifactId>
+      <version>1.1.3.3</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax-api</artifactId>
+      <version>1.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>1.0.b2</version>
+    </dependency>
+    <dependency>
+      <groupId>junitperf</groupId>
+      <artifactId>junitperf</artifactId>
+      <version>1.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax-ri</artifactId>
+      <version>1.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.6.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
+      <version>2.5.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <distributionManagement>
+    <site>
+      <id>default</id>
+      <name>Default Site</name>
+      <url>scp://dom4j.org//home/groups/d/do/dom4j/htdocs</url>
+    </site>
+  </distributionManagement>
+</project>
\ No newline at end of file

Modified: trunk/dom4j/dom4j/debian/rules
===================================================================
--- trunk/dom4j/dom4j/debian/rules      2010-05-25 22:00:59 UTC (rev 12515)
+++ trunk/dom4j/dom4j/debian/rules      2010-05-27 20:03:17 UTC (rev 12516)
@@ -28,7 +28,8 @@
 build: build-stamp
 build-stamp:
        dh_testdir
-       $(ANT_INVOKE) package test release-javadoc
+       $(ANT_INVOKE) package release-javadoc
+       -$(ANT_INVOKE) test
        touch build-stamp
 
 clean:
@@ -41,7 +42,7 @@
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k 
+       dh_prep
        dh_installdirs
 
 binary-indep: build install
@@ -50,8 +51,8 @@
        dh_installchangelogs -k docs/changes-report.html
        dh_installdocs
        dh_installexamples
-       install -m 644 build/dom4j.jar $(JAVALIBDIR)/dom4j-$(VERSION).jar
-       ln -s dom4j-$(VERSION).jar $(JAVALIBDIR)/dom4j.jar
+       mh_installpom -plibdom4j-java debian/pom.xml
+       mh_installjar -plibdom4j-java debian/pom.xml -l build/dom4j.jar
        install -m 644 debian/$(PKGNAME)-doc.lintian-overrides 
$(INSTALLDIR)-doc/usr/share/lintian/overrides/$(PKGNAME)-doc
        dh_link
        dh_compress

Deleted: trunk/dom4j/dom4j/debian/svn-deblayout
===================================================================
--- trunk/dom4j/dom4j/debian/svn-deblayout      2010-05-25 22:00:59 UTC (rev 
12515)
+++ trunk/dom4j/dom4j/debian/svn-deblayout      2010-05-27 20:03:17 UTC (rev 
12516)
@@ -1,2 +0,0 @@
-buildArea=../../build-area
-origDir=..


_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits

Reply via email to