[liboro-java] 16/37: [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).

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Jul 27 13:12:16 UTC 2016


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

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

commit 18264960c0281ad1135aa49ad121701ecaa5a5fe
Author: Niels Thykier <nthykier at debian.org>
Date:   Sat Feb 20 12:17:28 2010 +0000

      [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).
---
 debian/changelog                                            | 13 ++++++++++++-
 debian/compat                                               |  2 +-
 debian/control                                              | 12 +++++++-----
 debian/osgi.MF                                              | 12 ++++++++++++
 .../01-build-xml-dont-replace-non-existing-file.patch       |  6 ++++--
 debian/patches/series                                       |  1 +
 debian/rules                                                |  4 ++--
 debian/source/format                                        |  1 +
 8 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b4b517..2c2f7e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,17 @@
 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
 
diff --git a/debian/compat b/debian/compat
index 1e8b314..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/debian/control b/debian/control
index 0c69307..37e20ee 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,16 @@ Source: liboro-java
 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
diff --git a/debian/osgi.MF b/debian/osgi.MF
new file mode 100644
index 0000000..7c6c8d3
--- /dev/null
+++ b/debian/osgi.MF
@@ -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
+
diff --git a/debian/patches/01-build-xml-dont-replace-non-existing-file.patch b/debian/patches/01-build-xml-dont-replace-non-existing-file.patch
index e222ed2..7ca3103 100644
--- a/debian/patches/01-build-xml-dont-replace-non-existing-file.patch
+++ b/debian/patches/01-build-xml-dont-replace-non-existing-file.patch
@@ -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.">
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d6d8389
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-build-xml-dont-replace-non-existing-file.patch
diff --git a/debian/rules b/debian/rules
index fdd030a..3c22243 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
 
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/liboro-java.git



More information about the pkg-java-commits mailing list