[pkg-java] r11645 - in trunk/liboro-java/debian: . patches source
Niels Thykier
nthykier-guest at alioth.debian.org
Sat Feb 20 12:17:37 UTC 2010
Author: nthykier-guest
Date: 2010-02-20 12:17:28 +0000 (Sat, 20 Feb 2010)
New Revision: 11645
Added:
trunk/liboro-java/debian/osgi.MF
trunk/liboro-java/debian/patches/series
trunk/liboro-java/debian/source/
trunk/liboro-java/debian/source/format
Modified:
trunk/liboro-java/debian/changelog
trunk/liboro-java/debian/compat
trunk/liboro-java/debian/control
trunk/liboro-java/debian/patches/01-build-xml-dont-replace-non-existing-file.patch
trunk/liboro-java/debian/rules
Log:
[Niels Thykier]
* Added myself to Uploaders.
* Merged B-D-I and B-D; it does not make sense to have both
when all packages are arch all.
* Updated depedencies on java-runtimes to fit the built class version.
* Made patch quilt-compatible and added a short description.
* Bumped debhelper compat to 7.
* Added OSGi metadata.
* Converted source format to 3.0 (quilt).
Modified: trunk/liboro-java/debian/changelog
===================================================================
--- trunk/liboro-java/debian/changelog 2010-02-20 10:48:00 UTC (rev 11644)
+++ trunk/liboro-java/debian/changelog 2010-02-20 12:17:28 UTC (rev 11645)
@@ -1,7 +1,18 @@
liboro-java (2.0.8a-7) UNRELEASED; urgency=low
- * Updated Standards-Version to 3.8.3.
+ [ Michael Koch ]
+ * Updated Standards-Version to 3.8.4.
+ [ Niels Thykier ]
+ * Added myself to Uploaders.
+ * Merged B-D-I and B-D; it does not make sense to have both
+ when all packages are arch all.
+ * Updated depedencies on java-runtimes to fit the built class version.
+ * Made patch quilt-compatible and added a short description.
+ * Bumped debhelper compat to 7.
+ * Added OSGi metadata.
+ * Converted source format to 3.0 (quilt).
+
-- Michael Koch <konqueror at gmx.de> Mon, 28 Sep 2009 21:12:24 +0200
liboro-java (2.0.8a-6) unstable; urgency=low
Modified: trunk/liboro-java/debian/compat
===================================================================
--- trunk/liboro-java/debian/compat 2010-02-20 10:48:00 UTC (rev 11644)
+++ trunk/liboro-java/debian/compat 2010-02-20 12:17:28 UTC (rev 11645)
@@ -1 +1 @@
-6
+7
Modified: trunk/liboro-java/debian/control
===================================================================
--- trunk/liboro-java/debian/control 2010-02-20 10:48:00 UTC (rev 11644)
+++ trunk/liboro-java/debian/control 2010-02-20 12:17:28 UTC (rev 11645)
@@ -2,14 +2,16 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Michael Koch <konqueror at gmx.de>, Arnaud Vandyck <avdyk at debian.org>
-Build-Depends: debhelper (>= 6), cdbs, default-jdk
-Build-Depends-Indep: ant, maven-repo-helper
-Standards-Version: 3.8.3
+Uploaders: Michael Koch <konqueror at gmx.de>, Arnaud Vandyck <avdyk at debian.org>,
+ Niels Thykier <niels at thykier.net>
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, maven-repo-helper
+Standards-Version: 3.8.4
Package: liboro-java
Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java1-runtime-headless | java2-runtime-headless
+Depends: default-jre-headless | java2-runtime-headless |
+ java5-runtime-headless | java6-runtime-headless,
+ ${misc:Depends}
Description: Regular expression library for Java
The Jakarta-ORO Java classes are a set of text-processing Java classes
that provide Perl5 compatible regular expressions, AWK-like regular
Added: trunk/liboro-java/debian/osgi.MF
===================================================================
--- trunk/liboro-java/debian/osgi.MF (rev 0)
+++ trunk/liboro-java/debian/osgi.MF 2010-02-20 12:17:28 UTC (rev 11645)
@@ -0,0 +1,12 @@
+Bundle-ManifestVersion: 2
+Bundle-Name: Jakarta Oro
+Bundle-SymbolicName: org.apache.oro
+Bundle-Version: 2.0.8
+Bundle-Vendor: Apache Software Foundation
+Bundle-Localization: plugin
+Export-Package: org.apache.oro.io;version="2.0.8", org.apache.oro.text
+ ;version="2.0.8", org.apache.oro.text.awk;version="2.0.8", org.apache
+ .oro.text.perl;version="2.0.8", org.apache.oro.text.regex;version="2.
+ 0.8", org.apache.oro.util;version="2.0.8"
+Bundle-RequiredExecutionEnvironment: J2SE-1.2
+
Modified: trunk/liboro-java/debian/patches/01-build-xml-dont-replace-non-existing-file.patch
===================================================================
--- trunk/liboro-java/debian/patches/01-build-xml-dont-replace-non-existing-file.patch 2010-02-20 10:48:00 UTC (rev 11644)
+++ trunk/liboro-java/debian/patches/01-build-xml-dont-replace-non-existing-file.patch 2010-02-20 12:17:28 UTC (rev 11645)
@@ -1,5 +1,7 @@
---- build.xml.old 2006-04-24 22:09:08.000000000 +0000
-+++ build.xml 2006-04-24 22:09:37.000000000 +0000
+Description: Avoid a replace on a file that does not exist.
+
+--- a/build.xml 2006-04-24 22:09:08.000000000 +0000
++++ b/build.xml 2006-04-24 22:09:37.000000000 +0000
@@ -162,8 +162,8 @@
header="<a href='http://jakarta.apache.org/oro/' target=_top><img src='{@docroot}/../images/logoSmall.gif' alt='Jakarta ORO' width=48 height=47 align=center border=0 hspace=1 vspace=1></a>"
bottom="Copyright © ${year} Apache Software Foundation. All Rights Reserved.">
Added: trunk/liboro-java/debian/patches/series
===================================================================
--- trunk/liboro-java/debian/patches/series (rev 0)
+++ trunk/liboro-java/debian/patches/series 2010-02-20 12:17:28 UTC (rev 11645)
@@ -0,0 +1 @@
+01-build-xml-dont-replace-non-existing-file.patch
Modified: trunk/liboro-java/debian/rules
===================================================================
--- trunk/liboro-java/debian/rules 2010-02-20 10:48:00 UTC (rev 11644)
+++ trunk/liboro-java/debian/rules 2010-02-20 12:17:28 UTC (rev 11645)
@@ -3,16 +3,16 @@
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
PACKAGE := $(DEB_SOURCE_PACKAGE)
#VERSION := $(DEB_UPSTREAM_VERSION)
VERSION := 2.0.8
JAVA_HOME := /usr/lib/jvm/default-java
DEB_ANT_BUILD_TARGET := jar javadocs
-ANT_OPTS := -Dant.build.javac.source=1.4
+ANT_OPTS := -Dant.build.javac.source=1.3 -Dant.build.javac.target=1.2
install/liboro-java::
+ jar umf debian/osgi.MF jakarta-oro-$(VERSION).jar
mh_installpoms -p$(PACKAGE)
mh_installjar -p$(PACKAGE) -l debian/pom.xml --usj-name=oro jakarta-oro-$(VERSION).jar
Added: trunk/liboro-java/debian/source/format
===================================================================
--- trunk/liboro-java/debian/source/format (rev 0)
+++ trunk/liboro-java/debian/source/format 2010-02-20 12:17:28 UTC (rev 11645)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-java-commits
mailing list