[libjettison-java] 03/34: the package builds now

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libjettison-java.

commit c152263c0a3a645301f1146bdc6d1dc836278dea
Author: Torsten Werner <twerner at debian.org>
Date:   Sun Nov 25 18:39:04 2007 +0000

    the package builds now
---
 debian/ant.properties |  4 ++++
 debian/build.xml      | 23 +++++++++++++++++++++++
 debian/orig-tar.sh    | 15 ++++++++-------
 debian/rules          | 27 +++++----------------------
 debian/watch          |  4 ++--
 5 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
new file mode 100644
index 0000000..9794025
--- /dev/null
+++ b/debian/ant.properties
@@ -0,0 +1,4 @@
+project.name=jettison
+class.dir=build
+source.dir=.
+jar=jettison.jar
diff --git a/debian/build.xml b/debian/build.xml
new file mode 100644
index 0000000..4be14e1
--- /dev/null
+++ b/debian/build.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project default="jar" name="${project.name}" basedir="..">
+
+  <target name="clean">
+    <delete dir="${class.dir}" quiet="true"/>
+  </target>
+
+  <target name="compile" description="o Compile the source files">
+    <mkdir dir="${class.dir}"/>
+    <javac srcdir="${source.dir}" destdir="${class.dir}"
+      debug="true" source="1.5"/>
+  </target>
+
+  <target name="jar" description="o Create the jar" depends="compile">
+    <jar jarfile="${jar}">
+      <fileset dir="${class.dir}">
+          <include name="**"/>
+      </fileset>
+    </jar>
+  </target>
+
+</project>
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 75ac663..7b10f85 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,19 +1,20 @@
 #!/bin/sh -e
 
 # called by uscan with '--upstream-version' <version> <file>
-DIR=xom_$2.orig
+DIR=jettison-$2
+TAR=../libjettison-java_$2.orig.tar.gz
 
 # clean up the upstream tarball
-tar zxf $3
-mv XOM $DIR
-GZIP=--best tar czf $3 --exclude '*.jar' --exclude '*.class' $DIR
-rm -rf $DIR
+mkdir $DIR
+(cd $DIR && jar -x -f ../$3)
+tar -c -z -f $TAR $DIR
+rm -rf $DIR $3
 
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then
     . .svn/deb-layout
-    mv $3 $origDir
-    echo "moved $3 to $origDir"
+    mv $TAR $origDir
+    echo "moved $TAR to $origDir"
 fi
 
 exit 0
diff --git a/debian/rules b/debian/rules
index 15b1a43..e556718 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,30 +2,13 @@
 
 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            := /usr/lib/jvm/java-gcj
-ANT_HOME             := /usr/share/ant
-DEB_JARS             := xercesImpl xalan xml-apis jaxen saxpath ant-optional junit ecj $(ANT_HOME)/lib/ant-launcher.jar
-DEB_ANT_BUILD_TARGET := javadoc jar samples
-DEB_ANT_COMPILER     := org.eclipse.jdt.core.JDTCompilerAdapter
-ANT_ARGS             := -Dbuild.sysclasspath=only
-ANT_OPTS             := -Xss3m
+JAVA_HOME         := /usr/lib/jvm/java-gcj
+DEB_ANT_BUILDFILE := debian/build.xml
 
-clean::
-	-find -name '*.class' | xargs $(RM)
-
-install/libxom-java:: 
-	dh_installdirs -plibxom-java usr/share/java
-	dh_install -plibxom-java build/xom-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_link -plibxom-java usr/share/java/xom-$(DEB_UPSTREAM_VERSION).jar usr/share/java/xom.jar
-	install -m644 build/xom-samples.jar debian/libxom-java/usr/share/java/xom-samples-$(DEB_UPSTREAM_VERSION).jar
-	dh_link -plibxom-java usr/share/java/xom-samples-$(DEB_UPSTREAM_VERSION).jar usr/share/java/xom-samples.jar
-
-install/libxom-java-doc::
-	dh_installdocs -plibxom-java-doc build/apidocs
+install/libjettison-java:: 
+	install -m644 -D jettison.jar $(DEB_DESTDIR)/usr/share/java/jettison-$(DEB_UPSTREAM_VERSION).jar
+	dh_link -plibjettison-java /usr/share/java/jettison-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jettison.jar
 
 get-orig-source:
 	-uscan --upstream-version 0 --rename	
-
-DEB_PHONY_RULES += get-orig-source
diff --git a/debian/watch b/debian/watch
index 0fc342e..49dfb16 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
 opts=uversionmangle=s/-/~/ \
-  http://repository.codehaus.org/org/codehaus/jettison/jettison/1.0-RC2/ \
-  jettison-(.*)-sources.jar debian debian/orig-tar.sh
+  http://repository.codehaus.org/org/codehaus/jettison/jettison/(\d.{0,6})/jettison-(\d.*)-sources.jar \
+  debian debian/orig-tar.sh

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