[pkg-java] r9507 - trunk/libregexp-java/debian

Ludovic Claude ludovicc-guest at alioth.debian.org
Sun Aug 2 22:29:42 UTC 2009


Author: ludovicc-guest
Date: 2009-08-02 22:29:42 +0000 (Sun, 02 Aug 2009)
New Revision: 9507

Added:
   trunk/libregexp-java/debian/libregexp-java-doc.doc-base
   trunk/libregexp-java/debian/libregexp-java-doc.install
   trunk/libregexp-java/debian/libregexp-java.poms
   trunk/libregexp-java/debian/maven.publishedRules
   trunk/libregexp-java/debian/pom.xml
Removed:
   trunk/libregexp-java/debian/doc-base
   trunk/libregexp-java/debian/docs
   trunk/libregexp-java/debian/libregexp-java.links
Modified:
   trunk/libregexp-java/debian/changelog
   trunk/libregexp-java/debian/control
   trunk/libregexp-java/debian/copyright
   trunk/libregexp-java/debian/rules
Log:
* 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

Modified: trunk/libregexp-java/debian/changelog
===================================================================
--- trunk/libregexp-java/debian/changelog	2009-08-02 22:10:27 UTC (rev 9506)
+++ trunk/libregexp-java/debian/changelog	2009-08-02 22:29:42 UTC (rev 9507)
@@ -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.claude at laposte.net>  Sun, 02 Aug 2009 23:21:23 +0100
+
 libregexp-java (1.4-6) unstable; urgency=low
 
   [ Matthias Klose ]

Modified: trunk/libregexp-java/debian/control
===================================================================
--- trunk/libregexp-java/debian/control	2009-08-02 22:10:27 UTC (rev 9506)
+++ trunk/libregexp-java/debian/control	2009-08-02 22:29:42 UTC (rev 9507)
@@ -3,8 +3,9 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>,
- Torsten Werner <twerner at debian.org>
+ Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at 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 @@
 
 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.

Modified: trunk/libregexp-java/debian/copyright
===================================================================
--- trunk/libregexp-java/debian/copyright	2009-08-02 22:10:27 UTC (rev 9506)
+++ trunk/libregexp-java/debian/copyright	2009-08-02 22:29:42 UTC (rev 9507)
@@ -1,21 +1,18 @@
-This package was debianized by Takashi Okamoto tora at 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 <tora at debian.org>
+Copyright: 2009, Ludovic Claude <ludovic.claude at 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'.

Deleted: trunk/libregexp-java/debian/doc-base
===================================================================
--- trunk/libregexp-java/debian/doc-base	2009-08-02 22:10:27 UTC (rev 9506)
+++ trunk/libregexp-java/debian/doc-base	2009-08-02 22:29:42 UTC (rev 9507)
@@ -1,9 +0,0 @@
-Document: libregexp-java
-Title: Programmer API for libregexp-java
-Author: Apache regexp developers
-Abstract: Javadocs API for the regular expression library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libregexp-java/api/index.html
-Files: /usr/share/doc/libregexp-java/api/*.html

Deleted: trunk/libregexp-java/debian/docs
===================================================================
--- trunk/libregexp-java/debian/docs	2009-08-02 22:10:27 UTC (rev 9506)
+++ trunk/libregexp-java/debian/docs	2009-08-02 22:29:42 UTC (rev 9507)
@@ -1 +0,0 @@
-docs/api

Added: trunk/libregexp-java/debian/libregexp-java-doc.doc-base
===================================================================
--- trunk/libregexp-java/debian/libregexp-java-doc.doc-base	                        (rev 0)
+++ trunk/libregexp-java/debian/libregexp-java-doc.doc-base	2009-08-02 22:29:42 UTC (rev 9507)
@@ -0,0 +1,9 @@
+Document: libregexp-java-doc
+Title: Programmer API for libregexp-java
+Author: Apache regexp developers
+Abstract: Javadocs API for the regular expression library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libregexp-java/api/index.html
+Files: /usr/share/doc/libregexp-java/api/*.html

Added: trunk/libregexp-java/debian/libregexp-java-doc.install
===================================================================
--- trunk/libregexp-java/debian/libregexp-java-doc.install	                        (rev 0)
+++ trunk/libregexp-java/debian/libregexp-java-doc.install	2009-08-02 22:29:42 UTC (rev 9507)
@@ -0,0 +1 @@
+docs/api/* usr/share/doc/libregexp-java/api/

Deleted: trunk/libregexp-java/debian/libregexp-java.links
===================================================================
--- trunk/libregexp-java/debian/libregexp-java.links	2009-08-02 22:10:27 UTC (rev 9506)
+++ trunk/libregexp-java/debian/libregexp-java.links	2009-08-02 22:29:42 UTC (rev 9507)
@@ -1 +0,0 @@
-usr/share/java/regexp-1.4.jar usr/share/java/regexp.jar

Added: trunk/libregexp-java/debian/libregexp-java.poms
===================================================================
--- trunk/libregexp-java/debian/libregexp-java.poms	                        (rev 0)
+++ trunk/libregexp-java/debian/libregexp-java.poms	2009-08-02 22:29:42 UTC (rev 9507)
@@ -0,0 +1 @@
+debian/pom.xml --no-parent

Added: trunk/libregexp-java/debian/maven.publishedRules
===================================================================
--- trunk/libregexp-java/debian/maven.publishedRules	                        (rev 0)
+++ trunk/libregexp-java/debian/maven.publishedRules	2009-08-02 22:29:42 UTC (rev 9507)
@@ -0,0 +1 @@
+s/regexp/jakarta-regexp/ s/regexp/jakarta-regexp/ jar s/.*/debian/

Added: trunk/libregexp-java/debian/pom.xml
===================================================================
--- trunk/libregexp-java/debian/pom.xml	                        (rev 0)
+++ trunk/libregexp-java/debian/pom.xml	2009-08-02 22:29:42 UTC (rev 9507)
@@ -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

Modified: trunk/libregexp-java/debian/rules
===================================================================
--- trunk/libregexp-java/debian/rules	2009-08-02 22:10:27 UTC (rev 9506)
+++ trunk/libregexp-java/debian/rules	2009-08-02 22:29:42 UTC (rev 9507)
@@ -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/libregexp-java:: 
-	install -m 644 build/jakarta-regexp-1.4.jar debian/libregexp-java/usr/share/java/regexp-1.4.jar
+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
+
+get-orig-source:
+	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+




More information about the pkg-java-commits mailing list