[pkg-java] r12388 - in trunk/libajaxtags-java/debian: . patches source
Torsten Werner
twerner at alioth.debian.org
Wed May 12 21:29:30 UTC 2010
Author: twerner
Date: 2010-05-12 21:29:30 +0000 (Wed, 12 May 2010)
New Revision: 12388
Added:
trunk/libajaxtags-java/debian/libajaxtags-java.poms
trunk/libajaxtags-java/debian/maven.cleanIgnoreRules
trunk/libajaxtags-java/debian/maven.ignoreRules
trunk/libajaxtags-java/debian/maven.properties
trunk/libajaxtags-java/debian/maven.publishedRules
trunk/libajaxtags-java/debian/maven.rules
trunk/libajaxtags-java/debian/patches/
trunk/libajaxtags-java/debian/patches/0001-disable-demo-module.patch
trunk/libajaxtags-java/debian/patches/series
trunk/libajaxtags-java/debian/source/
trunk/libajaxtags-java/debian/source/format
Removed:
trunk/libajaxtags-java/debian/install
Modified:
trunk/libajaxtags-java/debian/changelog
trunk/libajaxtags-java/debian/control
trunk/libajaxtags-java/debian/rules
Log:
* New upstream version.
* Package does no longer Build-Depends: libjericho-html-java.
(Closes: 581331)
* Switch to Maven for building the package.
* Do not build the ajaxtags-demo module.
* Ignore test failures.
Modified: trunk/libajaxtags-java/debian/changelog
===================================================================
--- trunk/libajaxtags-java/debian/changelog 2010-05-12 15:56:13 UTC (rev 12387)
+++ trunk/libajaxtags-java/debian/changelog 2010-05-12 21:29:30 UTC (rev 12388)
@@ -1,3 +1,14 @@
+libajaxtags-java (1.5.1-1) unstable; urgency=low
+
+ * New upstream version.
+ * Package does no longer Build-Depends: libjericho-html-java.
+ (Closes: 581331)
+ * Switch to Maven for building the package.
+ * Do not build the ajaxtags-demo module.
+ * Ignore test failures.
+
+ -- Torsten Werner <twerner at debian.org> Wed, 12 May 2010 23:26:55 +0200
+
libajaxtags-java (1.3~rc7-4) unstable; urgency=low
* Change Build-Depends: glassfish-javaee. (Closes: #571431)
Modified: trunk/libajaxtags-java/debian/control
===================================================================
--- trunk/libajaxtags-java/debian/control 2010-05-12 15:56:13 UTC (rev 12387)
+++ trunk/libajaxtags-java/debian/control 2010-05-12 21:29:30 UTC (rev 12388)
@@ -4,8 +4,8 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Torsten Werner <twerner at debian.org>, Michael Koch <konqueror at gmx.de>
Build-Depends: ant, cdbs, debhelper (>= 5), default-jdk,
- libcommons-beanutils-java, libcommons-lang-java, libjericho-html-java,
- libservlet2.5-java, libstruts1.2-java, glassfish-javaee
+ libcommons-beanutils-java, libcommons-lang-java,
+ libservlet2.5-java, glassfish-javaee
Standards-Version: 3.8.1
Homepage: http://ajaxtags.sourceforge.net/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libajaxtags-java/
Deleted: trunk/libajaxtags-java/debian/install
===================================================================
--- trunk/libajaxtags-java/debian/install 2010-05-12 15:56:13 UTC (rev 12387)
+++ trunk/libajaxtags-java/debian/install 2010-05-12 21:29:30 UTC (rev 12388)
@@ -1,2 +0,0 @@
-dist/ajaxtags-*.jar /usr/share/java/
-
Added: trunk/libajaxtags-java/debian/libajaxtags-java.poms
===================================================================
--- trunk/libajaxtags-java/debian/libajaxtags-java.poms (rev 0)
+++ trunk/libajaxtags-java/debian/libajaxtags-java.poms 2010-05-12 21:29:30 UTC (rev 12388)
@@ -0,0 +1,4 @@
+pom.xml
+ajaxtags/pom.xml
+ajaxtags-resources/pom.xml
+ajaxtags-demo/pom.xml
Added: trunk/libajaxtags-java/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/libajaxtags-java/debian/maven.cleanIgnoreRules (rev 0)
+++ trunk/libajaxtags-java/debian/maven.cleanIgnoreRules 2010-05-12 21:29:30 UTC (rev 12388)
@@ -0,0 +1,15 @@
+# Maven clean ignore rules - ignore some Maven dependencies and plugins during the clean phase
+# Format of this file is:
+# [group] [artifact] [type] [version]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM
+# junit junit jar s/3\..*/3.x/
Added: trunk/libajaxtags-java/debian/maven.ignoreRules
===================================================================
--- trunk/libajaxtags-java/debian/maven.ignoreRules (rev 0)
+++ trunk/libajaxtags-java/debian/maven.ignoreRules 2010-05-12 21:29:30 UTC (rev 12388)
@@ -0,0 +1,18 @@
+# Maven ignore rules - ignore some Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM
+# junit junit jar s/3\..*/3.x/
+org.apache.maven.plugins maven-assembly-plugin maven-plugin *
+org.mortbay.jetty maven-jetty-plugin maven-plugin *
+com.google.code.maven-license-plugin maven-license-plugin maven-plugin *
Added: trunk/libajaxtags-java/debian/maven.properties
===================================================================
--- trunk/libajaxtags-java/debian/maven.properties (rev 0)
+++ trunk/libajaxtags-java/debian/maven.properties 2010-05-12 21:29:30 UTC (rev 12388)
@@ -0,0 +1 @@
+maven.test.failure.ignore=true
Added: trunk/libajaxtags-java/debian/maven.publishedRules
===================================================================
--- trunk/libajaxtags-java/debian/maven.publishedRules (rev 0)
+++ trunk/libajaxtags-java/debian/maven.publishedRules 2010-05-12 21:29:30 UTC (rev 12388)
@@ -0,0 +1,18 @@
+# Maven published rules - additional rules to publish, to help
+# the packaging work of Debian maintainers using mh_make
+# Format of this file is:
+# [group] [artifact] [type] [version]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+# in this case, elements that match are transformed using
+# the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match any dependency whose group is ant,
+# replacing it with org.apache.ant
+# s/ant/org.apache.ant/ * * s/.*/debian/
Added: trunk/libajaxtags-java/debian/maven.rules
===================================================================
--- trunk/libajaxtags-java/debian/maven.rules (rev 0)
+++ trunk/libajaxtags-java/debian/maven.rules 2010-05-12 21:29:30 UTC (rev 12388)
@@ -0,0 +1,22 @@
+# Maven rules - transform Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+# in this case, elements that match are transformed using
+# the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+# junit junit jar s/3\..*/3.x/
+s/org.apache.tomcat/javax.el/ el-api jar s/.*/2.1/
+s/org.apache.tomcat/javax.servlet/ jsp-api jar s/.*/2.1/
+s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/
+javax.servlet.jsp jsp-api jar s/.*/2.1/
+junit junit jar s/4\..*/4.x/
Added: trunk/libajaxtags-java/debian/patches/0001-disable-demo-module.patch
===================================================================
--- trunk/libajaxtags-java/debian/patches/0001-disable-demo-module.patch (rev 0)
+++ trunk/libajaxtags-java/debian/patches/0001-disable-demo-module.patch 2010-05-12 21:29:30 UTC (rev 12388)
@@ -0,0 +1,22 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Wed, 12 May 2010 23:20:54 +0200
+Subject: [PATCH] disable demo module
+
+---
+ pom.xml | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 98991de..2a71be5 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -10,7 +10,7 @@
+ <modules>
+ <module>ajaxtags</module>
+ <module>ajaxtags-resources</module>
+- <module>ajaxtags-demo</module>
++<!-- <module>ajaxtags-demo</module> -->
+ </modules>
+ <url>http://ajaxtags.sourceforge.net/</url>
+ <issueManagement>
+--
Added: trunk/libajaxtags-java/debian/patches/series
===================================================================
--- trunk/libajaxtags-java/debian/patches/series (rev 0)
+++ trunk/libajaxtags-java/debian/patches/series 2010-05-12 21:29:30 UTC (rev 12388)
@@ -0,0 +1 @@
+0001-disable-demo-module.patch
Modified: trunk/libajaxtags-java/debian/rules
===================================================================
--- trunk/libajaxtags-java/debian/rules 2010-05-12 15:56:13 UTC (rev 12387)
+++ trunk/libajaxtags-java/debian/rules 2010-05-12 21:29:30 UTC (rev 12388)
@@ -1,25 +1,6 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
-JAR_VERSION := 1.3-beta-rc7
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET := jar
-
-DEB_JARS := commons-beanutils commons-lang jericho-html jsp-api-2.1 servlet-api-2.5 \
- struts-1.2 glassfish-appserv-jstl
-
-clean::
- $(RM) -r lib src/main/resources/META-INF
-
-pre-build::
- mkdir -p lib src/main/resources/META-INF
-
-install/libajaxtags-java::
- dh_link /usr/share/java/ajaxtags-$(JAR_VERSION).jar \
- /usr/share/java/ajaxtags.jar
-
-get-orig-source:
- uscan --force-download --rename
-
Added: trunk/libajaxtags-java/debian/source/format
===================================================================
--- trunk/libajaxtags-java/debian/source/format (rev 0)
+++ trunk/libajaxtags-java/debian/source/format 2010-05-12 21:29:30 UTC (rev 12388)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-java-commits
mailing list