[pkg-java] r11481 - in trunk/libjibx-java/branch-1.2/debian: . patches

Steffen Möller moeller at alioth.debian.org
Mon Feb 1 02:36:12 UTC 2010


Author: moeller
Date: 2010-02-01 02:36:11 +0000 (Mon, 01 Feb 2010)
New Revision: 11481

Added:
   trunk/libjibx-java/branch-1.2/debian/README.Debian
   trunk/libjibx-java/branch-1.2/debian/README.source
   trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.doc-base
   trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.docs
   trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.install
   trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.links
   trunk/libjibx-java/branch-1.2/debian/patches/build_xml_clean_target.patch
   trunk/libjibx-java/branch-1.2/debian/patches/series
Removed:
   trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.doc-base
   trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.docs
   trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.install
   trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.links
Modified:
   trunk/libjibx-java/branch-1.2/debian/changelog
   trunk/libjibx-java/branch-1.2/debian/control
   trunk/libjibx-java/branch-1.2/debian/orig-tar.sh
   trunk/libjibx-java/branch-1.2/debian/rules
Log:
Introduction of versioned binary of new upstream.


Added: trunk/libjibx-java/branch-1.2/debian/README.Debian
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/README.Debian	                        (rev 0)
+++ trunk/libjibx-java/branch-1.2/debian/README.Debian	2010-02-01 02:36:11 UTC (rev 11481)
@@ -0,0 +1,7 @@
+The package provides "versioned" packages with the real .jar files
+and an unversioned package that supplies merely a symbolic link to
+the .jar.  This way, later versions will replace earlier packages and
+allow reverse-dependent projects to remain their functionality.
+
+Versions 1.0.2, 1.1.6 and 1.2.1 of jibx are sadly not upwards
+compatible.

Added: trunk/libjibx-java/branch-1.2/debian/README.source
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/README.source	                        (rev 0)
+++ trunk/libjibx-java/branch-1.2/debian/README.source	2010-02-01 02:36:11 UTC (rev 11481)
@@ -0,0 +1,3 @@
+Two patches, both to build/build.xml
+ * instruct the inclusion of bcel to the classpath
+ * add a "clean" target to build/build.xml (not ultimately required)

Modified: trunk/libjibx-java/branch-1.2/debian/changelog
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/changelog	2010-01-31 20:01:02 UTC (rev 11480)
+++ trunk/libjibx-java/branch-1.2/debian/changelog	2010-02-01 02:36:11 UTC (rev 11481)
@@ -1,4 +1,4 @@
-libjibx-java (1.2.1-1) UNRELEASED; urgency=low
+libjibx1.2-java (1.2.1-1) unstable; urgency=low
 
   [ Eric Lavarde ]
   * Remove dependency on gjdoc.
@@ -16,6 +16,11 @@
   * Make package Depends on default-jre-headless | java2-runtime-headless.
   * Updated Standards-Version to 3.8.3.
 
+  [ Steffen Moeller ]
+  * Introduced version-specific packages
+  * Updated Standards-Version to 3.8.4.
+  * added "clean" target to build.xml
+
  -- Michael Koch <konqueror at gmx.de>  Sun, 27 Sep 2009 12:32:59 +0200
 
 libjibx-java (1.0.2-1) unstable; urgency=low

Modified: trunk/libjibx-java/branch-1.2/debian/control
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/control	2010-01-31 20:01:02 UTC (rev 11480)
+++ trunk/libjibx-java/branch-1.2/debian/control	2010-02-01 02:36:11 UTC (rev 11481)
@@ -1,17 +1,20 @@
-Source: libjibx-java
+Source: libjibx1.2-java
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Eric Lavarde <deb at zorglub.s.bawue.de>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 7.0.0), cdbs (>= 0.4.8), openjdk-6-jdk, ant
+Build-Depends: debhelper (>= 7.0.0), cdbs (>= 0.4.8), openjdk-6-jdk, ant, quilt
 Build-Depends-Indep: antlr, libbcel-java, liblog4j1.2-java, libxpp3-java
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://jibx.sf.net/
+Vcs-svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjibx-java/branch-1.2/
+Vcs-browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjibx-java/branch-1.2/
 
-Package: libjibx-java
+Package: libjibx1.2-java
 Architecture: all
 Depends: default-jre-headless | java2-runtime-headless, libbcel-java, libxpp3-java, ${misc:Depends}
 Suggests: java-virtual-machine, libjibx-java-doc
+Conflicts: libjibx-java (<= 1.0.2-1)
 Description: Framework for binding XML data to Java objects
  JiBX lets you work with data from XML documents using your own class
  structures. The JiBX framework handles all the details of converting
@@ -20,7 +23,21 @@
  with very high efficiency, but still allows you a high degree of
  control over the translation process.
 
-Package: libjibx-java-doc
+Package: libjibx-java
+Architecture: all
+Depends: libjibx1.2-java
+Description: Framework for binding XML data to Java objects
+ JiBX lets you work with data from XML documents using your own class
+ structures. The JiBX framework handles all the details of converting
+ your data to and from XML based on your instructions. JiBX is designed
+ to perform the translation between internal data structures and XML
+ with very high efficiency, but still allows you a high degree of
+ control over the translation process.
+ .
+ This package provides the jibx.jar file as a symbolic link to the
+ versioned jar.
+
+Package: libjibx1.2-java-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}

Deleted: trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.doc-base
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.doc-base	2010-01-31 20:01:02 UTC (rev 11480)
+++ trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.doc-base	2010-02-01 02:36:11 UTC (rev 11481)
@@ -1,10 +0,0 @@
-Document: libjibx-java-doc
-Title: Programmer API for libjibx-java
-Author: Dennis Sosnoski <dsosnoski at users.sourceforge.net>
-Abstract: The programmer API of JiBX, a framework for
- binding XML data to Java objects.
-Section: Programming/Java
-
-Format: HTML
-Index: /usr/share/doc/libjibx-java-doc/api/index.html
-Files: /usr/share/doc/libjibx-java-doc/api/*

Deleted: trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.docs
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.docs	2010-01-31 20:01:02 UTC (rev 11480)
+++ trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.docs	2010-02-01 02:36:11 UTC (rev 11481)
@@ -1,2 +0,0 @@
-readme.html
-tutorial/

Deleted: trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.install
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.install	2010-01-31 20:01:02 UTC (rev 11480)
+++ trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.install	2010-02-01 02:36:11 UTC (rev 11481)
@@ -1,2 +0,0 @@
-docs/* usr/share/doc/libjibx-java-doc
-build/api usr/share/doc/libjibx-java-doc

Deleted: trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.links
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.links	2010-01-31 20:01:02 UTC (rev 11480)
+++ trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.links	2010-02-01 02:36:11 UTC (rev 11481)
@@ -1 +0,0 @@
-usr/share/doc/libjibx-java-doc/api usr/share/doc/libjibx-java/api

Copied: trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.doc-base (from rev 11446, trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.doc-base)
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.doc-base	                        (rev 0)
+++ trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.doc-base	2010-02-01 02:36:11 UTC (rev 11481)
@@ -0,0 +1,10 @@
+Document: libjibx1.2-java-doc
+Title: Programmer API for libjibx-java version 1.2.x
+Author: Dennis Sosnoski <dsosnoski at users.sourceforge.net>
+Abstract: The programmer API of JiBX, a framework for
+ binding XML data to Java objects.
+Section: Programming/Java
+
+Format: HTML
+Index: /usr/share/doc/libjibx1.2-java-doc/api/index.html
+Files: /usr/share/doc/libjibx1.2-java-doc/api/*


Property changes on: trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.doc-base
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.docs (from rev 11446, trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.docs)
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.docs	                        (rev 0)
+++ trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.docs	2010-02-01 02:36:11 UTC (rev 11481)
@@ -0,0 +1,2 @@
+readme.html
+tutorial/


Property changes on: trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.docs
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.install (from rev 11446, trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.install)
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.install	                        (rev 0)
+++ trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.install	2010-02-01 02:36:11 UTC (rev 11481)
@@ -0,0 +1,2 @@
+docs/* usr/share/doc/libjibx1.2-java-doc
+build/api usr/share/doc/libjibx1.2-java-doc


Property changes on: trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.install
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.links (from rev 11446, trunk/libjibx-java/branch-1.2/debian/libjibx-java-doc.links)
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.links	                        (rev 0)
+++ trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.links	2010-02-01 02:36:11 UTC (rev 11481)
@@ -0,0 +1 @@
+usr/share/doc/libjibx1.2-java-doc/api usr/share/doc/libjibx1.2-java/api


Property changes on: trunk/libjibx-java/branch-1.2/debian/libjibx1.2-java-doc.links
___________________________________________________________________
Added: svn:mergeinfo
   + 

Modified: trunk/libjibx-java/branch-1.2/debian/orig-tar.sh
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/orig-tar.sh	2010-01-31 20:01:02 UTC (rev 11480)
+++ trunk/libjibx-java/branch-1.2/debian/orig-tar.sh	2010-02-01 02:36:11 UTC (rev 11481)
@@ -1,7 +1,8 @@
 #!/bin/sh -e
 
 # called by uscan with '--upstream-version' <version> <file>
-DIR=libjibx-java_$2.orig
+echo $*
+DIR=libjibx-java-$2
 TAR=../libjibx-java_$2.orig.tar.gz
 
 # clean up the upstream tarball
@@ -13,8 +14,10 @@
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then
     . .svn/deb-layout
-    mv $3 $origDir
-    echo "moved $3 to $origDir"
+    if [ ".." != "$origDir" ]; then 
+	mv $3 $origDir
+	echo "moved $3 to $origDir"
+    fi
 fi
 
 exit 0

Added: trunk/libjibx-java/branch-1.2/debian/patches/build_xml_clean_target.patch
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/patches/build_xml_clean_target.patch	                        (rev 0)
+++ trunk/libjibx-java/branch-1.2/debian/patches/build_xml_clean_target.patch	2010-02-01 02:36:11 UTC (rev 11481)
@@ -0,0 +1,14 @@
+--- build/build.xml.orig	2010-02-01 02:19:07.000000000 +0100
++++ build/build.xml	2010-02-01 02:22:51.000000000 +0100
+@@ -66,6 +66,11 @@
+   <available property="dom4j" file="${lib}/dom4j.jar"/>
+   <available property="jdom" file="${lib}/jdom.jar"/>
+ 
++  <!-- Clean Added to help debian/rules -->
++  <target name="clean">
++    <delete quiet="true" dir="classes"/>
++  </target>
++
+   <!-- Set options for release build -->
+   <target name="setrelease">
+     <property name="optimize" value="on"/>

Added: trunk/libjibx-java/branch-1.2/debian/patches/series
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/patches/series	                        (rev 0)
+++ trunk/libjibx-java/branch-1.2/debian/patches/series	2010-02-01 02:36:11 UTC (rev 11481)
@@ -0,0 +1,2 @@
+build_xml_clean_target.patch -p0
+01_build_xml.patch -p0

Modified: trunk/libjibx-java/branch-1.2/debian/rules
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/rules	2010-01-31 20:01:02 UTC (rev 11480)
+++ trunk/libjibx-java/branch-1.2/debian/rules	2010-02-01 02:36:11 UTC (rev 11481)
@@ -2,7 +2,8 @@
 
 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/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_COMPRESS_EXCLUDE := .class
 JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
@@ -12,14 +13,24 @@
 DEB_BUILDDIR         := build
 DEB_DH_INSTALLCHANGELOGS_ARGS := changes.txt
 
+DEB_UPSTREAM_VERSION_2 := $(shell echo $(DEB_UPSTREAM_VERSION) | cut -f1,2 -d. )
+
 clean:: 
 	-rm -fr build/api build/classes lib/*
 
+install/libjibx1.2-java::
+	dh_install -plibjibx1.2-java lib/jibx-bind-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+	dh_install -plibjibx1.2-java lib/jibx-extras-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+	dh_install -plibjibx1.2-java lib/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+	dh_install -plibjibx1.2-java lib/jibx-schema-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+	if [ "$(DEB_UPSTREAM_VERSION)" != "$(DEB_UPSTREAM_VERSION_2)" ]; then \
+		dh_link -plibjibx1.2-java usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION_2).jar ; \
+		dh_link -plibjibx1.2-java usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION_2).jar ; \
+		dh_link -plibjibx1.2-java usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION_2).jar ; \
+		dh_link -plibjibx1.2-java usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION_2).jar ; \
+	fi
+
 install/libjibx-java::
-	dh_install -plibjibx-java lib/jibx-bind-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_install -plibjibx-java lib/jibx-extras-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_install -plibjibx-java lib/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_install -plibjibx-java lib/jibx-schema-$(DEB_UPSTREAM_VERSION).jar usr/share/java
 	dh_link -plibjibx-java usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-bind.jar
 	dh_link -plibjibx-java usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-extras.jar
 	dh_link -plibjibx-java usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-run.jar




More information about the pkg-java-commits mailing list