This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libregexp-java.
commit a59d5444fb7e6c93a727a97ee5195fbba089c755
Author: Ludovic Claude <ludovic.cla...@laposte.net>
Date: Sun Aug 2 22:29:42 2009 +0000
* New upstream version
* Add myself to Uploaders
* Remove old java1 runtimes from the list of Depends:
* Add the Maven POM to the package
* Add a Build-Depends-Indep dependency on maven-repo-helper
* Update debian/copyright to the machine-readable format.
* Put the documentation in a separate package
---
debian/changelog | 12 +++++++++
debian/control | 19 ++++++++++++---
debian/copyright | 31 +++++++++++-------------
debian/docs | 1 -
debian/{doc-base => libregexp-java-doc.doc-base} | 2 +-
debian/libregexp-java-doc.install | 1 +
debian/libregexp-java.links | 1 -
debian/libregexp-java.poms | 1 +
debian/maven.publishedRules | 1 +
debian/pom.xml | 6 +++++
debian/rules | 28 ++++++++++++---------
11 files changed, 68 insertions(+), 35 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1bf04c4..e3d8553 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libregexp-java (1.5-1) experimental; urgency=low
+
+ * New upstream version
+ * Add myself to Uploaders
+ * Remove old java1 runtimes from the list of Depends:
+ * Add the Maven POM to the package
+ * Add a Build-Depends-Indep dependency on maven-repo-helper
+ * Update debian/copyright to the machine-readable format.
+ * Put the documentation in a separate package
+
+ -- Ludovic Claude <ludovic.cla...@laposte.net> Sun, 02 Aug 2009 23:21:23
+0100
+
libregexp-java (1.4-6) unstable; urgency=low
[ Matthias Klose ]
diff --git a/debian/control b/debian/control
index e71f1a0..f88fe60 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,9 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Arnaud Vandyck <av...@debian.org>, Michael Koch <konque...@gmx.de>,
- Torsten Werner <twer...@debian.org>
+ Torsten Werner <twer...@debian.org>, Ludovic Claude
<ludovic.cla...@laposte.net>
Build-Depends: debhelper (>= 5), default-jdk, ant, cdbs
+Build-Depends-Indep: maven-repo-helper
Standards-Version: 3.8.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libregexp-java
Vcs-Browser: https://svn.debian.org/wsvn/pkg-java/trunk/libregexp-java/
@@ -12,10 +13,20 @@ Homepage: http://jakarta.apache.org/regexp/
Package: libregexp-java
Architecture: all
-Depends: default-jre-headless | java2-runtime-headless |
java1-runtime-headless | java2-runtime | java1-runtime,
- ${misc:Depends}
-Description: regular expression library for Java
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless |
java2-runtime
+Description: Regular expression library for Java
Regexp is a 100% Pure Java Regular Expression package. Regular expressions
are pattern descriptions which enable sophisticated matching of strings.
In addition to being able to match a string against a pattern, you can also
extract parts of the match. This is especially useful in text parsing!
+
+Package: libregexp-java-doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: Documentation for the Regular expression library
+ Regexp is a 100% Pure Java Regular Expression package. Regular expressions
+ are pattern descriptions which enable sophisticated matching of strings.
+ In addition to being able to match a string against a pattern, you can also
+ extract parts of the match. This is especially useful in text parsing!
+ .
+ This package provides the Javadoc for the regexp API.
diff --git a/debian/copyright b/debian/copyright
index 084da9b..6dd660a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,21 +1,18 @@
-This package was debianized by Takashi Okamoto t...@debian.org on
-Tue, 5 Dec 2000 10:01:10 +0000.
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: Jakarta Regexp
+Maintainer: Apache Jakarta team
+Source: http://jakarta.apache.org/regexp/
-It was downloaded from <http://jakarta.apache.org/regexp/>
+Files: *
+Copyright: 1999-2007, Apache Software Foundation
+License: Apache-2.0
-Copyright: 1999-2004 The Apache Software Foundation.
+Files: debian/*
+Copyright: 2000, Takashi Okamoto <t...@debian.org>
+Copyright: 2009, Ludovic Claude <ludovic.cla...@laposte.net>
+License: Apache-2.0
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+License: Apache-2.0
+ On Debian GNU/Linux system you can find the complete text of the
+ Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'.
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-The full text of the license can be found in
-`/usr/share/common-licenses/Apache-2.0'.
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 4596bfa..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-docs/api
diff --git a/debian/doc-base b/debian/libregexp-java-doc.doc-base
similarity index 90%
rename from debian/doc-base
rename to debian/libregexp-java-doc.doc-base
index 7c8557e..873bc50 100644
--- a/debian/doc-base
+++ b/debian/libregexp-java-doc.doc-base
@@ -1,4 +1,4 @@
-Document: libregexp-java
+Document: libregexp-java-doc
Title: Programmer API for libregexp-java
Author: Apache regexp developers
Abstract: Javadocs API for the regular expression library.
diff --git a/debian/libregexp-java-doc.install
b/debian/libregexp-java-doc.install
new file mode 100644
index 0000000..071aa56
--- /dev/null
+++ b/debian/libregexp-java-doc.install
@@ -0,0 +1 @@
+docs/api/* usr/share/doc/libregexp-java/api/
diff --git a/debian/libregexp-java.links b/debian/libregexp-java.links
deleted file mode 100644
index 5f52405..0000000
--- a/debian/libregexp-java.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java/regexp-1.4.jar usr/share/java/regexp.jar
diff --git a/debian/libregexp-java.poms b/debian/libregexp-java.poms
new file mode 100644
index 0000000..623bd24
--- /dev/null
+++ b/debian/libregexp-java.poms
@@ -0,0 +1 @@
+debian/pom.xml --no-parent
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
new file mode 100644
index 0000000..bb4fccd
--- /dev/null
+++ b/debian/maven.publishedRules
@@ -0,0 +1 @@
+s/regexp/jakarta-regexp/ s/regexp/jakarta-regexp/ jar s/.*/debian/
diff --git a/debian/pom.xml b/debian/pom.xml
new file mode 100644
index 0000000..d35956f
--- /dev/null
+++ b/debian/pom.xml
@@ -0,0 +1,6 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>jakarta-regexp</groupId>
+ <artifactId>jakarta-regexp</artifactId>
+ <version>1.5</version>
+</project>
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index f296f5f..693f0e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,29 @@
#!/usr/bin/make -f
# debian/rules file for libregexp-java (uses cdbs)
-UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2
-\d' ' | cut -f1 -d- )
-
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/ant.mk
-JAVA_HOME_DIRS := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
-ANT_OPTS = -Dant.build.javac.source=1.4
-
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar
-
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_ANT_ARGS := -Dant.build.javac.source=1.4
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar
DEB_ANT_BUILD_TARGET := jar javadocs
clean::
-rm -Rf docs
+ -rm -rf debian/tmp
+
+install/$(PACKAGE)::
+ mh_installpoms -p$(PACKAGE)
+ mh_installjar -p$(PACKAGE) -l --usj-name=regexp debian/pom.xml
build/jakarta-regexp-$(VERSION).jar
+
+get-orig-pom: MVN_VERSION=1.4
+get-orig-pom:
+ wget -O debian/pom.xml
http://repository.sonatype.org/service/local/repositories/central/content/jakarta-regexp/jakarta-regexp/$(MVN_VERSION)/jakarta-regexp-$(MVN_VERSION).pom
+ sed -i -e 's/<version>1.4/<version>$(VERSION)/' debian/pom.xml
-install/libregexp-java::
- install -m 644 build/jakarta-regexp-1.4.jar
debian/libregexp-java/usr/share/java/regexp-1.4.jar
+get-orig-source:
+ -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
--rename
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/libregexp-java.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
