[liboro-java] 10/37: * New version

[Emmanuel Bourg]

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 1381b5d733988bad0efc690e475080b1532d0340
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Thu Jul 2 13:59:32 2009 +0000

    * New version
---
 debian/compat                   |  2 +-
 debian/control                  | 22 ++++++++++++++++++----
 debian/liboro-java-doc.doc-base | 13 +++++++++++++
 debian/liboro-java-doc.docs     |  4 ++++
 debian/liboro-java.links        |  1 -
 debian/liboro-java.poms         |  1 +
 debian/pom.xml                  |  6 ++++++
 debian/rules                    | 23 ++++++++++++-----------
 8 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/debian/compat b/debian/compat
index b8626c4..1e8b314 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+6
diff --git a/debian/control b/debian/control
index 88281e1..101e104 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,31 @@
 Source: liboro-java
-Section: libs
+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 (>= 4.1.0), cdbs, default-jdk, ant
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 6), cdbs, default-jdk
+Build-Depends-Indep: ant, maven-repo-helper
+Standards-Version: 3.8.1
 
 Package: liboro-java
 Architecture: all
-Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless
+Depends: ${misc:Depends}, default-jre-headless | java1-runtime-headless | java2-runtime-headless
 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
  expressions, glob expressions, and utility classes for performing
  substitutions, splits, filtering filenames, etc.  
  ORO is faster and more functional than gnu.regexp.
+
+Package: liboro-java-doc
+Section: doc
+Architecture: all
+Depends: ${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
+ expressions, glob expressions, and utility classes for performing
+ substitutions, splits, filtering filenames, etc.  
+ ORO is faster and more functional than gnu.regexp.
+ .
+ This package contains the API documentation of liboro-java
diff --git a/debian/liboro-java-doc.doc-base b/debian/liboro-java-doc.doc-base
new file mode 100644
index 0000000..b4958e9
--- /dev/null
+++ b/debian/liboro-java-doc.doc-base
@@ -0,0 +1,13 @@
+Document: liboro-java
+Title: Programmer API for ORO
+Author: Apache ORO developers
+Abstract: 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
+ expressions, glob expressions, and utility classes for performing
+ substitutions, splits, filtering filenames, etc.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/liboro-java-doc/api/index.html
+Files: /usr/share/doc/liboro-java-doc/api/*
diff --git a/debian/liboro-java-doc.docs b/debian/liboro-java-doc.docs
new file mode 100644
index 0000000..00f7fe4
--- /dev/null
+++ b/debian/liboro-java-doc.docs
@@ -0,0 +1,4 @@
+docs/api
+docs/*.html  
+docs/images
+
diff --git a/debian/liboro-java.links b/debian/liboro-java.links
deleted file mode 100644
index f02e5b7..0000000
--- a/debian/liboro-java.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java/oro-2.0.8.jar usr/share/java/oro.jar
diff --git a/debian/liboro-java.poms b/debian/liboro-java.poms
new file mode 100644
index 0000000..623bd24
--- /dev/null
+++ b/debian/liboro-java.poms
@@ -0,0 +1 @@
+debian/pom.xml --no-parent
diff --git a/debian/pom.xml b/debian/pom.xml
new file mode 100644
index 0000000..abdd237
--- /dev/null
+++ b/debian/pom.xml
@@ -0,0 +1,6 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>oro</groupId>
+  <artifactId>oro</artifactId>
+  <version>2.0.8</version>
+</project>
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 4548973..fdd030a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,24 @@
 #!/usr/bin/make -f
 # debian/rules file for liboro-java (uses cdbs)
 
-#UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -\d' ' | cut -f1 -d- )
-UPSTREAM_VERSION := 2.0.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
 
-JAVA_HOME_DIRS := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
+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.4
 
 install/liboro-java::
-	mkdir -p debian/liboro-java/usr/share/java
-	install -m 644 $(DEB_SRCDIR)/jakarta-oro-$(UPSTREAM_VERSION).jar debian/liboro-java/usr/share/java/oro-$(UPSTREAM_VERSION).jar
+	mh_installpoms -p$(PACKAGE)
+	mh_installjar -p$(PACKAGE) -l debian/pom.xml --usj-name=oro jakarta-oro-$(VERSION).jar
+
+get-orig-source:
+	-uscan --download-version $(VERSION) --force-download --rename
 
-install/liboro-java-doc::
-	mkdir -p debian/liboro-java-doc/usr/share/doc/liboro-java-doc
-	cp -r $(DEB_SRCDIR)/build/docs/apidocs debian/liboro-java-doc/usr/share/doc/liboro-java-doc
+get-orig-pom:
+	wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/oro/oro/$(VERSION)/oro-$(VERSION).pom
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/liboro-java.git