[libcommons-jxpath-java] 08/29: libcommons-jxpath-java (1.2-6) unstable; urgency=low

Jakub Adam xhaakon-guest at moszumanska.debian.org
Sun Aug 2 23:26:25 UTC 2015


This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository libcommons-jxpath-java.

commit cb993d48a275f27a15c359b7f4ab808a98cf5fcf
Author: Wolfgang Bär <wbaer at gmx.de>
Date:   Sat Oct 1 12:14:46 2005 +0000

    libcommons-jxpath-java (1.2-6) unstable; urgency=low
    
      * Removed useless README.Debian and files from failed builds
      * Build javadocs and register with doc-base
      * Split documentation into own package as it is quite big
      * Move all patches into debian/patches & use cdbs patch system
      * Removed build-dep and dependency on javacc - not needed
      * Upgraded build-dep on libjdom0-java to libjdom1-java
      * Standards-Version 3.6.2 (no changes)
      * Added myself to uploaders
---
 debian/README.Debian                             | 12 --------
 debian/changelog                                 | 15 ++++++++++
 debian/control                                   | 19 ++++++++----
 debian/libcommons-jxpath-java-doc.doc-base       | 10 +++++++
 debian/{docs => libcommons-jxpath-java-doc.docs} |  2 +-
 debian/patches/00list                            |  1 -
 debian/patches/01_build_entity_workaround.dpatch | 37 ------------------------
 debian/patches/01_build_xml.patch                | 36 +++++++++++++++++++++++
 debian/rules                                     |  8 ++---
 9 files changed, 78 insertions(+), 62 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index 6787061..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,12 +0,0 @@
-libcommons-jxpath-java for Debian
-------------------------------
-
-No javadoc at the moment to put the library in main. As soon as a free
-replacement for the java documentation tool exists, I'll add the
-documentation. If your really want the documentation, at-get source this
-package and run 'ant javadoc' but you'll have to install a non-free
-j2sdk!
-
-libcommons-jxpath-java is in contrib because of libservlet2.3-java
-
- -- Arnaud Vandyck <avdyk at debian.org>, Wed Oct 29 11:34:35 2003
diff --git a/debian/changelog b/debian/changelog
index 02cd592..0ecf044 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+libcommons-jxpath-java (1.2-6) unstable; urgency=low
+
+  * Removed useless README.Debian and files from failed builds
+  * Build javadocs and register with doc-base
+  * Split documentation into own package as it is quite big
+  * Move all patches into debian/patches & use cdbs patch system
+  * Removed build-dep and dependency on javacc - not needed
+  * Upgraded build-dep on libjdom0-java to libjdom1-java
+  * Standards-Version 3.6.2 (no changes)
+  * Added myself to uploaders
+
+  * Upload sponsored by Arnaud Vandyck
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Sun, 18 Sep 2005 21:07:45 +0200
+
 libcommons-jxpath-java (1.2-5) unstable; urgency=low
 
   * libant1.6-java to ant transition
diff --git a/debian/control b/debian/control
index e1b7f8a..6e56b49 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,16 @@ Source: libcommons-jxpath-java
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Ola Lundqvist <opal at debian.org>, Takashi Okamoto <tora at debian.org>, Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>
-Build-Depends-Indep: debhelper (>= 4.1), cdbs (>= 0.4.8), ant, libcommons-logging-java, junit, javacc, libservlet2.3-java, libcommons-collections-java, libcommons-beanutils-java, libjdom0-java, kaffe (>= 1.1.1), jikes
-Standards-Version: 3.6.1
+Uploaders: Ola Lundqvist <opal at debian.org>, Takashi Okamoto <tora at debian.org>, Stefan Gybas <sgybas at debian.org>, 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
+Standards-Version: 3.6.2
 
 Package: libcommons-jxpath-java
 Architecture: all
-Depends: kaffe (>= 1.1.1) | java1-runtime | java2-runtime, libgnujaxp-java, javacc
-Suggests: java-virtual-machine
+Depends: kaffe (>= 2:1.1.5-3) | java1-runtime | java2-runtime, libgnujaxp-java
+Suggests: java-virtual-machine, libcommons-jxpath-java-doc
 Description: manipulate javabean using XPath syntax
- This library provides the java developper the ability to manipulate 
+ This library provides the java developer the ability to manipulate 
  javabeans with the XPath syntax. It also supports java collections,
  objects with dynamic properties (like Map, ServletContext, etc)
  and mechanism for adding support for additional models. 
@@ -20,3 +20,10 @@ Description: manipulate javabean using XPath syntax
  unification of reference syntax between DOM and java. 
  . 
  Homepage: http://jakarta.apache.org/commons/
+
+Package: libcommons-jxpath-java-doc
+Architecture: all
+Suggests: libcommons-jxpath-java
+Description: Javadoc API for libcommons-jxpath-java
+ The javadoc API for libcommons-jxpath-java which is a library to
+ manipulate javabeans with the XPath syntax.
diff --git a/debian/libcommons-jxpath-java-doc.doc-base b/debian/libcommons-jxpath-java-doc.doc-base
new file mode 100644
index 0000000..9d78a4c
--- /dev/null
+++ b/debian/libcommons-jxpath-java-doc.doc-base
@@ -0,0 +1,10 @@
+Document: libcommons-jxpath-java-doc
+Title: Programmer API for libcommons-jxpath-java
+Author: Dmitri Plotnikov <dmitri at apache.org>
+Abstract: Javadocs programmer API of libcommons-jxpath-java, 
+ a library to manipulate javabeans using XPath syntax.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libcommons-jxpath-java-doc/api/index.html
+Files: /usr/share/doc/libcommons-jxpath-java-doc/api/*.html
diff --git a/debian/docs b/debian/libcommons-jxpath-java-doc.docs
similarity index 65%
rename from debian/docs
rename to debian/libcommons-jxpath-java-doc.docs
index c1bb272..7b8cd66 100644
--- a/debian/docs
+++ b/debian/libcommons-jxpath-java-doc.docs
@@ -1,3 +1,3 @@
 PROPOSAL.html
 STATUS.html
-docs/*
+dist/docs/api
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 585c57b..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_build_entity_workaround
diff --git a/debian/patches/01_build_entity_workaround.dpatch b/debian/patches/01_build_entity_workaround.dpatch
deleted file mode 100644
index 7d10352..0000000
--- a/debian/patches/01_build_entity_workaround.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh -e
-## 01_build_entity_workaround.dpatch by Arnaud Vandyck <avdyk at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /home/arnaud/debian/ITP/libcommons-jxpath-java/libcommons-jxpath-java-1.1/build.xml libcommons-jxpath-java-1.1/build.xml
---- /home/arnaud/debian/ITP/libcommons-jxpath-java/libcommons-jxpath-java-1.1/build.xml	2003-01-31 00:41:28.000000000 +0100
-+++ libcommons-jxpath-java-1.1/build.xml	2003-10-29 11:31:43.000000000 +0100
-@@ -264,7 +264,7 @@
-                  author="true"
-                 private="false"
-                 version="true"
--               doctitle="<h1>${component.title}</h1>"
-+               doctitle="${component.title}"
-             windowtitle="${component.title} (Version ${component.version})"
-                  bottom="Copyright (c) 2001 - Apache Software Foundation"/>
-   </target>
diff --git a/debian/patches/01_build_xml.patch b/debian/patches/01_build_xml.patch
new file mode 100644
index 0000000..35b28e9
--- /dev/null
+++ b/debian/patches/01_build_xml.patch
@@ -0,0 +1,36 @@
+--- build.xml.orig	2005-09-18 21:56:53.000000000 +0200
++++ build.xml	2005-09-18 21:57:51.000000000 +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">
+       <src>
+         <pathelement location="${basedir}/src/java">
+         </pathelement>
+@@ -52,7 +52,7 @@
+       </fileset>
+     </copy>
+   </target>
+-  <target name="jar" description="o Create the jar" depends="compile,test">
++  <target name="jar" description="o Create the jar" depends="compile">
+     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
+     </jar>
+   </target>
+@@ -139,7 +139,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.*">
+       <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>
diff --git a/debian/rules b/debian/rules
index b83d9ce..281b3c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,17 +4,15 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-#export DH_COMPAT=4
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 JAVA_HOME_DIRS       := /usr/lib/kaffe
 ANT_HOME             := /usr/share/ant
-DEB_JARS             := junit jdom0 javacc servlet-2.3 commons-beanutils common-collections commons-logging $(ANT_HOME)/lib/ant-launcher.jar
+DEB_JARS             := junit jdom1 servlet-2.3 commons-beanutils common-collections commons-logging $(ANT_HOME)/lib/ant-launcher.jar
 DEB_ANT_COMPILER     := jikes
-DEB_ANT_BUILD_TARGET := jar
+DEB_ANT_BUILD_TARGET := jar javadoc
 
 LIBRARY=commons-jxpath
 VERSION=1.2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-jxpath-java.git



More information about the pkg-java-commits mailing list