[pkg-java] r4662 - in trunk/wsdl4j/debian: . patches

varun-guest at alioth.debian.org varun-guest at alioth.debian.org
Thu Nov 8 17:08:37 UTC 2007 

Author: varun-guest
Date: 2007-11-08 17:08:37 +0000 (Thu, 08 Nov 2007)
New Revision: 4662

Added:
   trunk/wsdl4j/debian/doc-base
   trunk/wsdl4j/debian/orig-tar.sh
   trunk/wsdl4j/debian/patches/
   trunk/wsdl4j/debian/patches/build.diff
   trunk/wsdl4j/debian/patches/series
Removed:
   trunk/wsdl4j/debian/libwsdl4j-java.install
   trunk/wsdl4j/debian/libwsdl4j-java.links
Modified:
   trunk/wsdl4j/debian/
   trunk/wsdl4j/debian/changelog
   trunk/wsdl4j/debian/compat
   trunk/wsdl4j/debian/control
   trunk/wsdl4j/debian/libwsdl4j-java-doc.docs
   trunk/wsdl4j/debian/rules
   trunk/wsdl4j/debian/watch
Log:
* New upstream release
* debian/control:
  + Add Homepage, Vcs-{Svn, Browser} Headers.
  + Build-Depend on debhelper >=5
* debian/compat: switch to 5
* debian/rules:
  + Clean up old comments.
  + Add install target to install jars and create symbolic links
* Remove debian/libwsdl4j-java.install and debian/libwsdl4j-java.links
* Add debian/orig-tar.sh to repackage the source (zip) and create
  orig.tar.gz
* Add build.diff patch to fix the broken build.xml file.


Property changes on: trunk/wsdl4j/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: trunk/wsdl4j/debian/changelog
===================================================================
--- trunk/wsdl4j/debian/changelog	2007-11-08 05:55:30 UTC (rev 4661)
+++ trunk/wsdl4j/debian/changelog	2007-11-08 17:08:37 UTC (rev 4662)
@@ -1,3 +1,20 @@
+wsdl4j (1.6.2-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control:
+    + Add Homepage, Vcs-{Svn, Browser} Headers.
+    + Build-Depend on debhelper >=5
+  * debian/compat: switch to 5
+  * debian/rules:
+    + Clean up old comments.
+    + Add install target to install jars and create symbolic links
+  * Remove debian/libwsdl4j-java.install and debian/libwsdl4j-java.links
+  * Add debian/orig-tar.sh to repackage the source (zip) and create
+    orig.tar.gz
+  * Add build.diff patch to fix the broken build.xml file.
+
+ -- Varun Hiremath <varunhiremath at gmail.com>  Thu, 08 Nov 2007 22:49:36 +0530
+
 wsdl4j (1.5.2-4) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/wsdl4j/debian/compat
===================================================================
--- trunk/wsdl4j/debian/compat	2007-11-08 05:55:30 UTC (rev 4661)
+++ trunk/wsdl4j/debian/compat	2007-11-08 17:08:37 UTC (rev 4662)
@@ -1 +1 @@
-4
+5

Modified: trunk/wsdl4j/debian/control
===================================================================
--- trunk/wsdl4j/debian/control	2007-11-08 05:55:30 UTC (rev 4661)
+++ trunk/wsdl4j/debian/control	2007-11-08 17:08:37 UTC (rev 4662)
@@ -3,9 +3,12 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Steffen Moeller <steffen_moeller at gmx.de>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.1.0), cdbs
+Build-Depends: debhelper (>= 5), cdbs, quilt
 Build-Depends-Indep: ant, java-gcj-compat-dev
 Standards-Version: 3.7.2
+Homepage: wsdl4j.sourceforge.net
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/wsdl4j
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/wsdl4j
 
 Package: libwsdl4j-java
 Architecture: all
@@ -14,8 +17,6 @@
  The Web Services Description Language for Java Toolkit (WSDL4J) allows
  the creation, representation, and manipulation of WSDL documents. Is
  the reference implementation for JSR110 'JWSDL' (jcp.org).
- .
- Homepage: wsdl4j.sourceforge.net
 
 Package: libwsdl4j-java-doc
 Architecture: all
@@ -27,6 +28,3 @@
  the reference implementation for JSR110 'JWSDL' (jcp.org).
  .
  This package contains documentation.
- .
- Homepage: wsdl4j.sourceforge.net
-

Added: trunk/wsdl4j/debian/doc-base
===================================================================
--- trunk/wsdl4j/debian/doc-base	                        (rev 0)
+++ trunk/wsdl4j/debian/doc-base	2007-11-08 17:08:37 UTC (rev 4662)
@@ -0,0 +1,9 @@
+Document: libwsdl4j-java-doc
+Title: API for wsdl4j
+Authors: IBM
+Abstract: Webservice description language for Java 
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libwsdl4j-java-doc/api/index.html
+Files: /usr/share/doc/libwsdl4j-java-doc/api/*.html

Modified: trunk/wsdl4j/debian/libwsdl4j-java-doc.docs
===================================================================
--- trunk/wsdl4j/debian/libwsdl4j-java-doc.docs	2007-11-08 05:55:30 UTC (rev 4661)
+++ trunk/wsdl4j/debian/libwsdl4j-java-doc.docs	2007-11-08 17:08:37 UTC (rev 4662)
@@ -1 +1 @@
-dist/docs/api
+dist/*/docs/api

Deleted: trunk/wsdl4j/debian/libwsdl4j-java.install
===================================================================
--- trunk/wsdl4j/debian/libwsdl4j-java.install	2007-11-08 05:55:30 UTC (rev 4661)
+++ trunk/wsdl4j/debian/libwsdl4j-java.install	2007-11-08 17:08:37 UTC (rev 4662)
@@ -1 +0,0 @@
-dist/wsdl4j-1.5.2.jar usr/share/java

Deleted: trunk/wsdl4j/debian/libwsdl4j-java.links
===================================================================
--- trunk/wsdl4j/debian/libwsdl4j-java.links	2007-11-08 05:55:30 UTC (rev 4661)
+++ trunk/wsdl4j/debian/libwsdl4j-java.links	2007-11-08 17:08:37 UTC (rev 4662)
@@ -1 +0,0 @@
-usr/share/java/wsdl4j-1.5.2.jar usr/share/java/wsdl4j.jar

Added: trunk/wsdl4j/debian/orig-tar.sh
===================================================================
--- trunk/wsdl4j/debian/orig-tar.sh	                        (rev 0)
+++ trunk/wsdl4j/debian/orig-tar.sh	2007-11-08 17:08:37 UTC (rev 4662)
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+TAR=../wsdl4j_$2.orig.tar.gz
+DIR=wsdl4j-$2
+
+# clean up the upstream tarball
+unzip $3
+mv wsdl4j-* $DIR
+GZIP=--best tar -c -z -f $TAR $DIR
+rm -rf $DIR $3
+
+# 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/wsdl4j/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/wsdl4j/debian/patches/build.diff
===================================================================
--- trunk/wsdl4j/debian/patches/build.diff	                        (rev 0)
+++ trunk/wsdl4j/debian/patches/build.diff	2007-11-08 17:08:37 UTC (rev 4662)
@@ -0,0 +1,28 @@
+Index: wsdl4j-1.6.2/build.xml
+===================================================================
+--- wsdl4j-1.6.2.orig/build.xml	2007-11-08 22:44:48.000000000 +0530
++++ wsdl4j-1.6.2/build.xml	2007-11-08 22:46:23.000000000 +0530
+@@ -216,23 +216,7 @@
+       <fileset dir="${build.lib}"/>
+     </copy>
+ 
+-    <copy todir="${dist.dir}/docs">
+-      <fileset dir="${docs.dir}">
+-        <include name="*.html"/>
+-      </fileset>
+-      <filterset>
+-        <filter token="version" value="${wsdl4j.version.underscore}"/>
+-      </filterset>
+-    </copy>
+-
+-    <copy tofile="${dist.dir}/docs/spec/jsr110-1.2.pdf">
+-      <fileset dir="${docs.dir}">
+-        <include name="spec/maint_rel_1.2/jsr110-1.2.pdf"/>
+-      </fileset>
+-    </copy>
+-
+     <copy file="license.html" tofile="${dist.dir}/license.html"/>
+-    <copy file="readme.txt" tofile="${dist.dir}/readme.txt"/>
+ 
+     <!-- ================================================================= -->
+     <!-- Produces the zip file                                             -->

Added: trunk/wsdl4j/debian/patches/series
===================================================================
--- trunk/wsdl4j/debian/patches/series	                        (rev 0)
+++ trunk/wsdl4j/debian/patches/series	2007-11-08 17:08:37 UTC (rev 4662)
@@ -0,0 +1 @@
+build.diff

Modified: trunk/wsdl4j/debian/rules
===================================================================
--- trunk/wsdl4j/debian/rules	2007-11-08 05:55:30 UTC (rev 4661)
+++ trunk/wsdl4j/debian/rules	2007-11-08 17:08:37 UTC (rev 4662)
@@ -1,19 +1,18 @@
 #!/usr/bin/make -f
 # debian/rules file for libwsdl4j-java (uses cdbs)
 
-export VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
-
 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
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
-#JAVA_HOME := /usr/lib/kaffe
-#ANT_HOME := /usr/share/ant
+JAVA_HOME 		:= /usr/lib/jvm/java-gcj
+DEB_ANT_INSTALL_TARGET	:= dist
 
-#DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar
+install/libwsdl4j-java::
+	install -m 644 -D build/lib/wsdl4j.jar debian/libwsdl4j-java/usr/share/java/wsdl4j-$(DEB_UPSTREAM_VERSION).jar
+	dh_link /usr/share/java/wsdl4j-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/wsdl4j.jar
+	install -m 644 -D build/lib/qname.jar debian/libqname-java/usr/share/java/qname-$(DEB_UPSTREAM_VERSION).jar
+	dh_link /usr/share/java/qname-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/qname.jar
 
-#DEB_ANT_BUILDFILE := build.xml
-#DEB_ANT_BUILD_TARGET := compile
-DEB_ANT_INSTALL_TARGET := dist
-
+get-orig-source:
+	-uscan --upstream-version 0

Modified: trunk/wsdl4j/debian/watch
===================================================================
--- trunk/wsdl4j/debian/watch	2007-11-08 05:55:30 UTC (rev 4661)
+++ trunk/wsdl4j/debian/watch	2007-11-08 17:08:37 UTC (rev 4662)
@@ -7,6 +7,4 @@
 version=3
 
 # Uncomment to find new files on sourceforge, for debscripts >= 2.9
-http://sf.net/wsdl4j/wsdl4j-src-(.*)\.zip
-
-
+http://sf.net/wsdl4j/wsdl4j-src-(.*)\.zip debian debian/orig-tar.sh

More information about the pkg-java-commits mailing list