[pkg-java] r10340 - in trunk/libcommons-jxpath-java/debian: . patches

Niels Thykier nthykier-guest at alioth.debian.org
Fri Sep 11 22:02:42 UTC 2009


Author: nthykier-guest
Date: 2009-09-11 22:02:41 +0000 (Fri, 11 Sep 2009)
New Revision: 10340

Modified:
   trunk/libcommons-jxpath-java/debian/changelog
   trunk/libcommons-jxpath-java/debian/control
   trunk/libcommons-jxpath-java/debian/copyright
   trunk/libcommons-jxpath-java/debian/libcommons-jxpath-java-doc.docs
   trunk/libcommons-jxpath-java/debian/patches/01_build_xml.patch
   trunk/libcommons-jxpath-java/debian/rules
Log:
  [ Niels Thykier ]
  * New upstream release.
  * Added myself to the uploaders.
  * Replaced Build-Depends-Indep with Build-Depends to avoid problems
    with the buildds.
  * Replace "kaffe" with "default java" packages.
  * Updated the encoding of debian/copyright to UTF-8.
  * Added Vcs-fields to debian/control.
  * Added missing ${misc:Depends} to dependencies.


Modified: trunk/libcommons-jxpath-java/debian/changelog
===================================================================
--- trunk/libcommons-jxpath-java/debian/changelog	2009-09-11 22:02:24 UTC (rev 10339)
+++ trunk/libcommons-jxpath-java/debian/changelog	2009-09-11 22:02:41 UTC (rev 10340)
@@ -1,14 +1,22 @@
-libcommons-jxpath-java (1.2-7.1) UNRELEASED; urgency=low
+libcommons-jxpath-java (1.3-1) UNRELEASED; urgency=low
 
-  * Non-maintainer upload.
-
   [ Emmanuel Bourg ]
   * Update of the URLs
   * Rename Jakarta Commons to Apache Commons
-  * debian/copyright: Switch to Apache License 2.0. Closes: #532891. 
+  * debian/copyright: Switch to Apache License 2.0. Closes: #532891.
 
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Wed, 17 Jun 2009 10:51:45 +0200
+  [ Niels Thykier ]
+  * New upstream release.
+  * Added myself to the uploaders.
+  * Replaced Build-Depends-Indep with Build-Depends to avoid problems
+    with the buildds.
+  * Replace "kaffe" with "default java" packages.
+  * Updated the encoding of debian/copyright to UTF-8.
+  * Added Vcs-fields to debian/control.
+  * Added missing ${misc:Depends} to dependencies.
 
+ -- Niels Thykier <niels at thykier.net>  Fri, 11 Sep 2009 22:21:58 +0200
+
 libcommons-jxpath-java (1.2-7) unstable; urgency=low
 
   * Removed libgnujaxp-java dependency - not needed anymore

Modified: trunk/libcommons-jxpath-java/debian/control
===================================================================
--- trunk/libcommons-jxpath-java/debian/control	2009-09-11 22:02:24 UTC (rev 10339)
+++ trunk/libcommons-jxpath-java/debian/control	2009-09-11 22:02:41 UTC (rev 10340)
@@ -1,14 +1,20 @@
 Source: libcommons-jxpath-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>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs (>= 0.4.8), ant, libcommons-logging-java, junit, libservlet2.3-java, libcommons-collections-java, libcommons-beanutils-java, libjdom1-java, kaffe
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>,
+ Niels Thykier <niels at thykier.net>
+Build-Depends: debhelper (>= 4.2.30), cdbs (>= 0.4.8), ant, libcommons-logging-java,
+ junit, libservlet2.3-java, libcommons-collections-java, libcommons-beanutils-java,
+ libjdom1-java, default-jdk
 Standards-Version: 3.6.2
+Homepage: http://commons.apache.org/jxpath/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-jxpath-java
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/libcommons-jxpath-java
 
 Package: libcommons-jxpath-java
 Architecture: all
-Depends: kaffe (>= 2:1.1.5-3) | java1-runtime | java2-runtime
+Depends: default-jre-headless | java1-runtime | java2-runtime, ${misc:Depends}
 Suggests: java-virtual-machine, libcommons-jxpath-java-doc
 Description: manipulate javabean using XPath syntax
  This library provides the java developer the ability to manipulate 
@@ -18,11 +24,11 @@
  . 
  One of the most important feature of the component is the
  unification of reference syntax between DOM and java. 
- . 
- Homepage: http://commons.apache.org/jxpath/
 
 Package: libcommons-jxpath-java-doc
+Section: doc
 Architecture: all
+Depends: ${misc:Depends}
 Suggests: libcommons-jxpath-java
 Description: Javadoc API for libcommons-jxpath-java
  The javadoc API for libcommons-jxpath-java which is a library to

Modified: trunk/libcommons-jxpath-java/debian/copyright
===================================================================
--- trunk/libcommons-jxpath-java/debian/copyright	2009-09-11 22:02:24 UTC (rev 10339)
+++ trunk/libcommons-jxpath-java/debian/copyright	2009-09-11 22:02:41 UTC (rev 10340)
@@ -7,7 +7,7 @@
                   Craig McClanahan <Craig.McClanahan at eng.sun.com>
                   Matt Benson <mbenson at apache.org>
 
-Copyright: © 2001-2008 The Apache Software Foundation
+Copyright: © 2001-2008 The Apache Software Foundation
 
 License: Apache 2.0
 

Modified: trunk/libcommons-jxpath-java/debian/libcommons-jxpath-java-doc.docs
===================================================================
--- trunk/libcommons-jxpath-java/debian/libcommons-jxpath-java-doc.docs	2009-09-11 22:02:24 UTC (rev 10339)
+++ trunk/libcommons-jxpath-java/debian/libcommons-jxpath-java-doc.docs	2009-09-11 22:02:41 UTC (rev 10340)
@@ -1,3 +1,2 @@
 PROPOSAL.html
-STATUS.html
 dist/docs/api

Modified: trunk/libcommons-jxpath-java/debian/patches/01_build_xml.patch
===================================================================
--- trunk/libcommons-jxpath-java/debian/patches/01_build_xml.patch	2009-09-11 22:02:24 UTC (rev 10339)
+++ trunk/libcommons-jxpath-java/debian/patches/01_build_xml.patch	2009-09-11 22:02:41 UTC (rev 10340)
@@ -1,11 +1,11 @@
---- build.xml.orig	2005-09-18 21:56:53.000000000 +0200
-+++ build.xml	2005-09-18 21:57:51.000000000 +0200
+--- build.xml.orig	2009-09-11 23:13:56.969009343 +0200
++++ build.xml	2009-09-11 23:15:44.485055841 +0200
 @@ -33,7 +33,7 @@
    <target name="compile" description="o Compile the code" depends="get-deps">
      <mkdir dir="${classesdir}">
      </mkdir>
 -    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-+    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" target="1.3">
++    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" target="1.3" source="1.3">
        <src>
          <pathelement location="${basedir}/src/java">
          </pathelement>
@@ -18,19 +18,12 @@
      <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
      </jar>
    </target>
-@@ -139,7 +139,7 @@
+@@ -146,7 +146,7 @@
      </property>
      <property name="title" value="JXPath 1.2 API">
      </property>
--    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames=".*">
-+    <javadoc destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.*">
+-    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="*">
++    <javadoc destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="*">
        <classpath>
          <fileset dir="${libdir}">
            <include name="*.jar">
-@@ -182,4 +182,4 @@
-     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
-     </unjar>
-   </target>
--</project>
-\ Kein Zeilenumbruch am Dateiende.
-+</project>

Modified: trunk/libcommons-jxpath-java/debian/rules
===================================================================
--- trunk/libcommons-jxpath-java/debian/rules	2009-09-11 22:02:24 UTC (rev 10339)
+++ trunk/libcommons-jxpath-java/debian/rules	2009-09-11 22:02:41 UTC (rev 10340)
@@ -8,10 +8,11 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME_DIRS       := /usr/lib/kaffe
+JAVA_HOME	     := /usr/lib/jvm/default-java
 ANT_HOME             := /usr/share/ant
 DEB_JARS             := junit jdom1 servlet-2.3 commons-beanutils common-collections commons-logging $(ANT_HOME)/lib/ant-launcher.jar
 DEB_ANT_BUILD_TARGET := jar javadoc
+DEB_ANT_CLEAN_TARGET := clean
 
 LIBRARY=commons-jxpath
-VERSION=1.2
+VERSION=1.3




More information about the pkg-java-commits mailing list