Author: twerner
Date: 2010-06-23 08:37:38 +0000 (Wed, 23 Jun 2010)
New Revision: 12639
Modified:
trunk/ehcache/debian/build.xml
trunk/ehcache/debian/changelog
trunk/ehcache/debian/control
trunk/ehcache/debian/orig-tar.exclude
trunk/ehcache/debian/rules
Log:
* Merge changes from Thierry's PPA and upload to Debian.
* Add an ehcache.jar link for compatibility
* New upstream release
Modified: trunk/ehcache/debian/build.xml
===================================================================
--- trunk/ehcache/debian/build.xml 2010-06-22 19:39:16 UTC (rev 12638)
+++ trunk/ehcache/debian/build.xml 2010-06-23 08:37:38 UTC (rev 12639)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="../core" name="ehcache" default="jar">
+<project basedir=".." name="ehcache" default="jar">
<property name="target" value="${basedir}/target" />
<property name="build" value="${target}/classes" />
Modified: trunk/ehcache/debian/changelog
===================================================================
--- trunk/ehcache/debian/changelog 2010-06-22 19:39:16 UTC (rev 12638)
+++ trunk/ehcache/debian/changelog 2010-06-23 08:37:38 UTC (rev 12639)
@@ -1,3 +1,21 @@
+ehcache (2.1.0-1) unstable; urgency=low
+
+ * Merge changes from Thierry's PPA and upload to Debian.
+
+ -- Torsten Werner <twer...@debian.org> Wed, 23 Jun 2010 10:35:31 +0200
+
+ehcache (2.1.0-0ubuntu1~ppa2) maverick; urgency=low
+
+ * Add an ehcache.jar link for compatibility
+
+ -- Thierry Carrez <thierry.car...@ubuntu.com> Tue, 22 Jun 2010 16:46:10 +0200
+
+ehcache (2.1.0-0ubuntu1~ppa1) maverick; urgency=low
+
+ * New upstream release
+
+ -- Thierry Carrez <thierry.car...@ubuntu.com> Fri, 04 Jun 2010 14:49:09 +0200
+
ehcache (1.6.2-1) unstable; urgency=low
* New upstream release
Modified: trunk/ehcache/debian/control
===================================================================
--- trunk/ehcache/debian/control 2010-06-22 19:39:16 UTC (rev 12638)
+++ trunk/ehcache/debian/control 2010-06-23 08:37:38 UTC (rev 12639)
@@ -9,6 +9,7 @@
Build-Depends-Indep: default-jdk, ant,
libcommons-logging-java, libcommons-collections3-java,
libservlet2.5-java, libbackport-util-concurrent-java,
+ libslf4j-java, libgeronimo-jta-1.0.1b-spec-java, libbtm-java,
libjsr107cache-java, libhibernate3-java, libjgroups-java
Standards-Version: 3.8.4
Homepage: http://ehcache.sourceforge.net/
Modified: trunk/ehcache/debian/orig-tar.exclude
===================================================================
--- trunk/ehcache/debian/orig-tar.exclude 2010-06-22 19:39:16 UTC (rev
12638)
+++ trunk/ehcache/debian/orig-tar.exclude 2010-06-23 08:37:38 UTC (rev
12639)
@@ -1,3 +1,4 @@
*.jar
*.zip
EhcacheUserGuide*.pdf
+src/site
Modified: trunk/ehcache/debian/rules
===================================================================
--- trunk/ehcache/debian/rules 2010-06-22 19:39:16 UTC (rev 12638)
+++ trunk/ehcache/debian/rules 2010-06-23 08:37:38 UTC (rev 12639)
@@ -8,11 +8,12 @@
DEB_ANT_BUILDFILE := debian/build.xml
DEB_ANT_BUILD_TARGET := jar
DEB_JARS := commons-logging servlet-api-2.5 backport-util-concurrent \
+ slf4j-api geronimo-jta-1.0.1b-spec btm \
jsr107cache hibernate3 commons-collections3 jgroups-all
install/libehcache-java::
- mh_installpom -plibehcache-java core/pom.xml --no-parent
- mh_installjar -plibehcache-java -l core/pom.xml core/target/ehcache.jar
+ mh_installpom -plibehcache-java pom.xml --no-parent
+ mh_installjar -plibehcache-java -l pom.xml target/ehcache.jar
/usr/share/java/ehcache.jar
get-orig-source:
uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
--rename
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
