[libjibx1.2-java] 05/33: UNRELEASED * Team upload * New upstream release * Improve download of upstream source code. * Add Build-Depends: libjoda-time-java. * Remove Java runtime from Depends. * Add missing Depends: ${misc:Depends}. * Switch to source format 3.0. * Update Standards-Version: 3.9.1.
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Feb 2 10:27:14 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libjibx1.2-java.
commit 738c0f539f5d7c7789aaf965ba575c786e4e2c7f
Author: Torsten Werner <twerner at debian.org>
Date: Wed Aug 31 12:12:20 2011 +0000
UNRELEASED
* Team upload
* New upstream release
* Improve download of upstream source code.
* Add Build-Depends: libjoda-time-java.
* Remove Java runtime from Depends.
* Add missing Depends: ${misc:Depends}.
* Switch to source format 3.0.
* Update Standards-Version: 3.9.1.
---
debian/changelog | 14 ++++++++++++++
debian/control | 9 +++++----
debian/orig-tar.sh | 12 +++++-------
debian/patches/01_build_xml.patch | 12 +++++++-----
debian/patches/build_xml_clean_target.patch | 8 +++++---
debian/patches/series | 4 ++--
debian/rules | 7 ++++---
debian/source/format | 1 +
8 files changed, 43 insertions(+), 24 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3b8ecfc..9e99f8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+libjibx1.2-java (1.2.3-1) unstable; urgency=low
+
+ UNRELEASED
+ * Team upload
+ * New upstream release
+ * Improve download of upstream source code.
+ * Add Build-Depends: libjoda-time-java.
+ * Remove Java runtime from Depends.
+ * Add missing Depends: ${misc:Depends}.
+ * Switch to source format 3.0.
+ * Update Standards-Version: 3.9.1.
+
+ -- Torsten Werner <twerner at debian.org> Wed, 31 Aug 2011 14:09:31 +0200
+
libjibx1.2-java (1.2.1-1) unstable; urgency=low
[ Eric Lavarde ]
diff --git a/debian/control b/debian/control
index 7a41879..8b4d12c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,15 +4,16 @@ 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, quilt
-Build-Depends-Indep: antlr, libbcel-java, liblog4j1.2-java, libxpp3-java
-Standards-Version: 3.8.4
+Build-Depends-Indep: antlr, libbcel-java, liblog4j1.2-java, libxpp3-java,
+ libjoda-time-java
+Standards-Version: 3.9.1
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: libjibx1.2-java
Architecture: all
-Depends: default-jre-headless | java2-runtime-headless, libbcel-java, libxpp3-java, ${misc:Depends}
+Depends: 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
@@ -25,7 +26,7 @@ Description: Framework for binding XML data to Java objects
Package: libjibx-java
Architecture: all
-Depends: libjibx1.2-java
+Depends: libjibx1.2-java, ${misc:Depends}
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
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index a4591a2..cf78ddb 100644
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,23 +1,21 @@
#!/bin/sh -e
# called by uscan with '--upstream-version' <version> <file>
-echo $*
-DIR=libjibx-java-$2
-TAR=../libjibx-java_$2.orig.tar.gz
+DIR=libjibx1.2-java-$2
+TAR=../libjibx1.2-java_$2.orig.tar.gz
# clean up the upstream tarball
unzip $3
mv jibx $DIR
GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR
-rm -rf $DIR
+rm -rf $DIR $3
# move to directory 'tarballs'
if [ -r .svn/deb-layout ]; then
. .svn/deb-layout
if [ ".." != "$origDir" ]; then
- mv $3 $origDir
- echo "moved $3 to $origDir"
+ mv $TAR $origDir
+ echo "moved $TAR to $origDir"
fi
fi
-exit 0
diff --git a/debian/patches/01_build_xml.patch b/debian/patches/01_build_xml.patch
index 73624f6..14b7003 100644
--- a/debian/patches/01_build_xml.patch
+++ b/debian/patches/01_build_xml.patch
@@ -1,5 +1,7 @@
---- build/build.xml 2009-09-27 22:42:46.000000000 +0200
-+++ build/build.xml.orig 2009-09-27 22:42:24.000000000 +0200
+Index: libjibx1.2-java-1.2.3/build/build.xml
+===================================================================
+--- libjibx1.2-java-1.2.3.orig/build/build.xml 2011-08-31 14:05:45.000000000 +0200
++++ libjibx1.2-java-1.2.3/build/build.xml 2011-08-31 14:05:54.000000000 +0200
@@ -59,6 +59,7 @@
<!-- Common classpaths -->
<path id="support-classpath">
@@ -8,7 +10,7 @@
</path>
<!-- Optional components -->
-@@ -232,12 +233,14 @@
+@@ -242,12 +243,14 @@
deprecation="on">
<classpath>
<fileset dir="${lib}" includes="*.jar" excludes="asm*.jar,org.eclipse.*.jar,qdox*.jar,${schemaname}.jar,${toolsname}.jar"/>
@@ -23,7 +25,7 @@
</classpath>
<arg value="${src}/schema-noprefix-binding.xml"/>
<arg value="${src}/schema-xsprefix-binding.xml"/>
-@@ -1261,6 +1264,7 @@
+@@ -1273,6 +1276,7 @@
<bottom><table width='80%%'><tr><td width='50%%'><p align='center'><a href='http://www.jibx.org/' target='_top'><font size='3'><b>Project Web Site</b></font></a></td><td width='50%%'><p align='center'></td></tr></table></bottom>
<classpath>
<fileset dir="${lib}" includes="*.jar"/>
@@ -31,7 +33,7 @@
</classpath>
</javadoc>
</target>
-@@ -1364,7 +1367,7 @@
+@@ -1411,7 +1415,7 @@
<!-- Intermediate targets, not to be run directly. -->
<target name="build-jibx" depends="compile-run,compile-bind,compile-extras"/>
diff --git a/debian/patches/build_xml_clean_target.patch b/debian/patches/build_xml_clean_target.patch
index d8c3ac6..75e575f 100644
--- a/debian/patches/build_xml_clean_target.patch
+++ b/debian/patches/build_xml_clean_target.patch
@@ -1,6 +1,8 @@
---- 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 @@
+Index: libjibx1.2-java-1.2.3/build/build.xml
+===================================================================
+--- libjibx1.2-java-1.2.3.orig/build/build.xml 2011-02-14 20:35:24.000000000 +0100
++++ libjibx1.2-java-1.2.3/build/build.xml 2011-08-31 14:05:45.000000000 +0200
+@@ -65,6 +65,11 @@
<available property="dom4j" file="${lib}/dom4j.jar"/>
<available property="jdom" file="${lib}/jdom.jar"/>
diff --git a/debian/patches/series b/debian/patches/series
index 837cabb..f09dca4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-build_xml_clean_target.patch -p0
-01_build_xml.patch -p0
+build_xml_clean_target.patch
+01_build_xml.patch
diff --git a/debian/rules b/debian/rules
index 7c1fae3..fcaa417 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,12 +2,10 @@
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
DEB_COMPRESS_EXCLUDE := .class
JAVA_HOME := /usr/lib/jvm/java-6-openjdk
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar bcel log4j qdox xpp3
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar bcel log4j-1.2 qdox xpp3 joda-time
DEB_ANT_BUILD_TARGET := setrelease current devdoc
DEB_ANT_ARGS := -Dbindname=jibx-bind-$(DEB_UPSTREAM_VERSION) -Dextrasname=jibx-extras-$(DEB_UPSTREAM_VERSION) -Drunname=jibx-run-$(DEB_UPSTREAM_VERSION) -Dschemaname=jibx-schema-$(DEB_UPSTREAM_VERSION)
DEB_BUILDDIR := build
@@ -39,3 +37,6 @@ install/libjibx-java::
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
dh_link -plibjibx-java usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-schema.jar
+
+get-orig-source:
+ uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjibx1.2-java.git
More information about the pkg-java-commits
mailing list