[pkg-java] r12637 - trunk/oscache/debian

[Torsten Werner]

Author: twerner
Date: 2010-06-22 19:31:59 +0000 (Tue, 22 Jun 2010)
New Revision: 12637

Added:
   trunk/oscache/debian/maven.rules
Modified:
   trunk/oscache/debian/changelog
   trunk/oscache/debian/control
   trunk/oscache/debian/rules
Log:
* Update Build-Depends: libservlet2.5-java.
* Patch pom.xml for libservlet2.5-java.
* Make sure the package builds with both hibernate 3.3 and 3.5.

Modified: trunk/oscache/debian/changelog
===================================================================
--- trunk/oscache/debian/changelog	2010-06-22 19:29:36 UTC (rev 12636)
+++ trunk/oscache/debian/changelog	2010-06-22 19:31:59 UTC (rev 12637)
@@ -1,3 +1,11 @@
+oscache (2.4.1+ds1-2) unstable; urgency=low
+
+  * Update Build-Depends: libservlet2.5-java.
+  * Patch pom.xml for libservlet2.5-java.
+  * Make sure the package builds with both hibernate 3.3 and 3.5.
+
+ -- Torsten Werner <twerner at debian.org>  Tue, 22 Jun 2010 21:30:27 +0200
+
 oscache (2.4.1+ds1-1) unstable; urgency=low
 
   [ Varun Hiremath ]

Modified: trunk/oscache/debian/control
===================================================================
--- trunk/oscache/debian/control	2010-06-22 19:29:36 UTC (rev 12636)
+++ trunk/oscache/debian/control	2010-06-22 19:31:59 UTC (rev 12637)
@@ -5,7 +5,7 @@
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
 Build-Depends: cdbs, debhelper (>= 7), maven-repo-helper
 Build-Depends-Indep: ant, default-jdk, libjgroups-java,
- glassfish-javaee, libcommons-logging-java, libservlet2.4-java,
+ glassfish-javaee, libcommons-logging-java, libservlet2.5-java,
  libhibernate3-java
 Standards-Version: 3.8.4
 Homepage: http://www.opensymphony.com/oscache/

Added: trunk/oscache/debian/maven.rules
===================================================================
--- trunk/oscache/debian/maven.rules	                        (rev 0)
+++ trunk/oscache/debian/maven.rules	2010-06-22 19:31:59 UTC (rev 12637)
@@ -0,0 +1,19 @@
+# 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/
+
+javax.servlet servlet-api jar s/2\..*/2.5/

Modified: trunk/oscache/debian/rules
===================================================================
--- trunk/oscache/debian/rules	2010-06-22 19:29:36 UTC (rev 12636)
+++ trunk/oscache/debian/rules	2010-06-22 19:31:59 UTC (rev 12637)
@@ -6,7 +6,9 @@
 JAVA_HOME 		:= /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET	:= jar
 DEB_ANT_BUILDFILE	:= debian/build.xml
-DEB_JARS		:= commons-logging jgroups-all servlet-api jsp-api glassfish-javaee jgroups-all hibernate3
+# hibernate 3.3 uses hibernate3 and 3.5 uses hibernate-core
+DEB_JARS		:= commons-logging jgroups-all servlet-api-2.5 jsp-api \
+  glassfish-javaee jgroups-all hibernate3 hibernate-core
 
 install/liboscache-java::
 	mh_installpom -pliboscache-java pom.xml