[pkg-java] r12410 - in branches/ehcache: . 2.x/debian
Torsten Werner
twerner at alioth.debian.org
Fri May 14 19:10:13 UTC 2010
Author: twerner
Date: 2010-05-14 19:10:12 +0000 (Fri, 14 May 2010)
New Revision: 12410
Added:
branches/ehcache/2.x/
branches/ehcache/2.x/debian/changelog
branches/ehcache/2.x/debian/control
branches/ehcache/2.x/debian/libehcache-java.poms
branches/ehcache/2.x/debian/maven.cleanIgnoreRules
branches/ehcache/2.x/debian/maven.ignoreRules
branches/ehcache/2.x/debian/maven.properties
branches/ehcache/2.x/debian/maven.publishedRules
branches/ehcache/2.x/debian/maven.rules
branches/ehcache/2.x/debian/rules
branches/ehcache/2.x/debian/source/
branches/ehcache/2.x/debian/watch
Removed:
branches/ehcache/2.x/debian/changelog
branches/ehcache/2.x/debian/control
branches/ehcache/2.x/debian/rules
branches/ehcache/2.x/debian/watch
Modified:
branches/ehcache/2.x/debian/orig-tar.sh
Log:
create 2.x branch for ehcache
Deleted: branches/ehcache/2.x/debian/changelog
===================================================================
--- trunk/ehcache/debian/changelog 2010-05-06 21:00:35 UTC (rev 12332)
+++ branches/ehcache/2.x/debian/changelog 2010-05-14 19:10:12 UTC (rev 12410)
@@ -1,81 +0,0 @@
-ehcache (1.5.0+dak1-2) unstable; urgency=low
-
- * Switch to default-jdk/jre (Closes: #526282)
- * Bump Standards-Version to 3.8.1
- * Change the section to java
-
- -- Varun Hiremath <varun at debian.org> Thu, 07 May 2009 19:56:47 -0400
-
-ehcache (1.5.0+dak1-1) unstable; urgency=low
-
- * Move package to main.
-
- -- Torsten Werner <twerner at debian.org> Tue, 18 Nov 2008 19:46:57 +0100
-
-ehcache (1.5.0-1) unstable; urgency=low
-
- * New upstream release
- * Add libjgroups-java to Build-Depends-Indep
- * Bump Standards-Version to 3.8.0
- * debian/copyright: remove the full text of Apache 2.0 license, as now
- is included in common licenses
-
- -- Varun Hiremath <varun at debian.org> Mon, 14 Jul 2008 02:08:53 +0530
-
-ehcache (1.4.1-2) unstable; urgency=low
-
- * Move package to contrib because libhibernate3-java is in contrib
- (Closes: #467312)
- * Remove debian/README.Debian - not required
-
- -- Varun Hiremath <varun at debian.org> Tue, 26 Feb 2008 00:15:24 +0530
-
-ehcache (1.4.1-1) unstable; urgency=low
-
- * New upstream release
-
- -- Varun Hiremath <varun at debian.org> Thu, 21 Feb 2008 16:02:21 +0530
-
-ehcache (1.4.0-1) unstable; urgency=low
-
- * New upstream release
- * bump debhelper compat to 6
-
- -- Varun Hiremath <varun at debian.org> Fri, 01 Feb 2008 08:49:43 +0530
-
-ehcache (1.4.0~beta2-1) unstable; urgency=low
-
- * New upstream release
- * Add myself to Uploaders.
- * Update Homepage and Vcs headers in debian/control.
- * Set Standards-Version: 3.7.3.
- * Build hibernate related classes because we have hibernate in Debian now.
- * Install upstream's CHANGELOG.txt and RELEASE_NOTES.txt.
-
- -- Torsten Werner <twerner at debian.org> Tue, 01 Jan 2008 17:01:28 +0100
-
-ehcache (1.4.0~beta-1) unstable; urgency=low
-
- * New upstream release
- * debian/build.xml:
- + Add clean target (Closes: #442557)
- + Remove hard coded version from build.xml and install versioned jar from debian/rules.
- * debian/control:
- + Add myself and Kumar Appaiah to Uploaders.
- + Move cdbs and debhelper to Build-Depends.
- + Add libcommons-collections3-java to Build-Depends-Indep and Depends
- + Add XS-Vcs-{Svn, Browser} headers.
- * Add debian/orig-tar.sh
- * Add debian/README.Debian-source
- * Update debian/watch to call debian/orig-tar.sh
- * debian/rules:
- + Add commons-collection3 to DEB_JARS
- + implement get-orig-source
-
- -- Varun Hiremath <varunhiremath at gmail.com> Mon, 17 Sep 2007 00:18:23 +0530
-
-ehcache (1.3.0~beta.dfsg.1-1) unstable; urgency=low
-
- * Initial Release (closes: #386103).
-
- -- Arnaud Vandyck <avdyk at debian.org> Thu, 2 Aug 2007 09:00:42 +0200
Copied: branches/ehcache/2.x/debian/changelog (from rev 12386, trunk/ehcache/debian/changelog)
===================================================================
--- branches/ehcache/2.x/debian/changelog (rev 0)
+++ branches/ehcache/2.x/debian/changelog 2010-05-14 19:10:12 UTC (rev 12410)
@@ -0,0 +1,99 @@
+ehcache (2.0.1-1) unstable; urgency=low
+
+ * UNRELEASED
+ * New upstream release
+ * Export SVN tree instead now as it contains the build system.
+
+ -- Torsten Werner <twerner at debian.org> Thu, 13 May 2010 12:17:24 +0200
+
+ehcache (1.5.0+dak1-3) unstable; urgency=low
+
+ * Update debian/watch to support the newer upstream versions.
+ * Remove +ssh from protocol part in Vcs-Svn.
+ * Update Standards-Version: 3.8.4.
+ * Switch to source format 3.0.
+ * Remove Arnaud from Uploaders list.
+
+ -- Torsten Werner <twerner at debian.org> Wed, 12 May 2010 14:09:04 +0200
+
+ehcache (1.5.0+dak1-2) unstable; urgency=low
+
+ * Switch to default-jdk/jre (Closes: #526282)
+ * Bump Standards-Version to 3.8.1
+ * Change the section to java
+
+ -- Varun Hiremath <varun at debian.org> Thu, 07 May 2009 19:56:47 -0400
+
+ehcache (1.5.0+dak1-1) unstable; urgency=low
+
+ * Move package to main.
+
+ -- Torsten Werner <twerner at debian.org> Tue, 18 Nov 2008 19:46:57 +0100
+
+ehcache (1.5.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Add libjgroups-java to Build-Depends-Indep
+ * Bump Standards-Version to 3.8.0
+ * debian/copyright: remove the full text of Apache 2.0 license, as now
+ is included in common licenses
+
+ -- Varun Hiremath <varun at debian.org> Mon, 14 Jul 2008 02:08:53 +0530
+
+ehcache (1.4.1-2) unstable; urgency=low
+
+ * Move package to contrib because libhibernate3-java is in contrib
+ (Closes: #467312)
+ * Remove debian/README.Debian - not required
+
+ -- Varun Hiremath <varun at debian.org> Tue, 26 Feb 2008 00:15:24 +0530
+
+ehcache (1.4.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Varun Hiremath <varun at debian.org> Thu, 21 Feb 2008 16:02:21 +0530
+
+ehcache (1.4.0-1) unstable; urgency=low
+
+ * New upstream release
+ * bump debhelper compat to 6
+
+ -- Varun Hiremath <varun at debian.org> Fri, 01 Feb 2008 08:49:43 +0530
+
+ehcache (1.4.0~beta2-1) unstable; urgency=low
+
+ * New upstream release
+ * Add myself to Uploaders.
+ * Update Homepage and Vcs headers in debian/control.
+ * Set Standards-Version: 3.7.3.
+ * Build hibernate related classes because we have hibernate in Debian now.
+ * Install upstream's CHANGELOG.txt and RELEASE_NOTES.txt.
+
+ -- Torsten Werner <twerner at debian.org> Tue, 01 Jan 2008 17:01:28 +0100
+
+ehcache (1.4.0~beta-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/build.xml:
+ + Add clean target (Closes: #442557)
+ + Remove hard coded version from build.xml and install versioned jar from debian/rules.
+ * debian/control:
+ + Add myself and Kumar Appaiah to Uploaders.
+ + Move cdbs and debhelper to Build-Depends.
+ + Add libcommons-collections3-java to Build-Depends-Indep and Depends
+ + Add XS-Vcs-{Svn, Browser} headers.
+ * Add debian/orig-tar.sh
+ * Add debian/README.Debian-source
+ * Update debian/watch to call debian/orig-tar.sh
+ * debian/rules:
+ + Add commons-collection3 to DEB_JARS
+ + implement get-orig-source
+
+ -- Varun Hiremath <varunhiremath at gmail.com> Mon, 17 Sep 2007 00:18:23 +0530
+
+ehcache (1.3.0~beta.dfsg.1-1) unstable; urgency=low
+
+ * Initial Release (closes: #386103).
+
+ -- Arnaud Vandyck <avdyk at debian.org> Thu, 2 Aug 2007 09:00:42 +0200
Deleted: branches/ehcache/2.x/debian/control
===================================================================
--- trunk/ehcache/debian/control 2010-05-06 21:00:35 UTC (rev 12332)
+++ branches/ehcache/2.x/debian/control 2010-05-14 19:10:12 UTC (rev 12410)
@@ -1,26 +0,0 @@
-Source: ehcache
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>,
- Varun Hiremath <varun at debian.org>,
- Kumar Appaiah <akumar at debian.org>,
- Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 6), cdbs
-Build-Depends-Indep: default-jdk, ant,
- libcommons-logging-java, libcommons-collections3-java,
- libservlet2.4-java, libbackport-util-concurrent-java,
- libjsr107cache-java, libhibernate3-java, libjgroups-java
-Standards-Version: 3.8.1
-Homepage: http://ehcache.sourceforge.net/
-Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/ehcache
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ehcache/
-
-Package: libehcache-java
-Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libcommons-logging-java, libcommons-collections3-java, libservlet2.4-java, libbackport-util-concurrent-java, libjsr107cache-java
-Description: distributed cache library
- Ehcache is a distributed cache for general purpose caching in Java,
- J2EE and light-weight containers. It features memory and disk stores,
- replicate by copy and invalidate, listeners, a gzip caching servlet
- filter and much more.
Copied: branches/ehcache/2.x/debian/control (from rev 12385, trunk/ehcache/debian/control)
===================================================================
--- branches/ehcache/2.x/debian/control (rev 0)
+++ branches/ehcache/2.x/debian/control 2010-05-14 19:10:12 UTC (rev 12410)
@@ -0,0 +1,25 @@
+Source: ehcache
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Varun Hiremath <varun at debian.org>,
+ Kumar Appaiah <akumar at debian.org>,
+ Torsten Werner <twerner at debian.org>
+Build-Depends: debhelper (>= 6), cdbs
+Build-Depends-Indep: default-jdk, ant,
+ libcommons-logging-java, libcommons-collections3-java,
+ libservlet2.5-java, libbackport-util-concurrent-java,
+ libjsr107cache-java, libhibernate3-java, libjgroups-java
+Standards-Version: 3.8.4
+Homepage: http://ehcache.sourceforge.net/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ehcache
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ehcache/
+
+Package: libehcache-java
+Architecture: all
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libcommons-logging-java, libcommons-collections3-java, libservlet2.5-java, libbackport-util-concurrent-java, libjsr107cache-java
+Description: distributed cache library
+ Ehcache is a distributed cache for general purpose caching in Java,
+ J2EE and light-weight containers. It features memory and disk stores,
+ replicate by copy and invalidate, listeners, a gzip caching servlet
+ filter and much more.
Added: branches/ehcache/2.x/debian/libehcache-java.poms
===================================================================
--- branches/ehcache/2.x/debian/libehcache-java.poms (rev 0)
+++ branches/ehcache/2.x/debian/libehcache-java.poms 2010-05-14 19:10:12 UTC (rev 12410)
@@ -0,0 +1 @@
+pom.xml --no-parent
Added: branches/ehcache/2.x/debian/maven.cleanIgnoreRules
===================================================================
--- branches/ehcache/2.x/debian/maven.cleanIgnoreRules (rev 0)
+++ branches/ehcache/2.x/debian/maven.cleanIgnoreRules 2010-05-14 19:10:12 UTC (rev 12410)
@@ -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: branches/ehcache/2.x/debian/maven.ignoreRules
===================================================================
--- branches/ehcache/2.x/debian/maven.ignoreRules (rev 0)
+++ branches/ehcache/2.x/debian/maven.ignoreRules 2010-05-14 19:10:12 UTC (rev 12410)
@@ -0,0 +1,19 @@
+# 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.codehaus.mojo buildnumber-maven-plugin maven-plugin *
+org.apache.maven.plugins maven-source-plugin maven-plugin *
+org.apache.maven.plugins maven-checkstyle-plugin maven-plugin *
+org.apache.maven.plugins maven-assembly-plugin maven-plugin *
Added: branches/ehcache/2.x/debian/maven.properties
===================================================================
--- branches/ehcache/2.x/debian/maven.properties (rev 0)
+++ branches/ehcache/2.x/debian/maven.properties 2010-05-14 19:10:12 UTC (rev 12410)
@@ -0,0 +1 @@
+maven.test.failure.ignore=true
Added: branches/ehcache/2.x/debian/maven.publishedRules
===================================================================
--- branches/ehcache/2.x/debian/maven.publishedRules (rev 0)
+++ branches/ehcache/2.x/debian/maven.publishedRules 2010-05-14 19:10:12 UTC (rev 12410)
@@ -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: branches/ehcache/2.x/debian/maven.rules
===================================================================
--- branches/ehcache/2.x/debian/maven.rules (rev 0)
+++ branches/ehcache/2.x/debian/maven.rules 2010-05-14 19:10:12 UTC (rev 12410)
@@ -0,0 +1,18 @@
+# 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/
+junit junit jar s/4\..*/4.x/
Modified: branches/ehcache/2.x/debian/orig-tar.sh
===================================================================
--- trunk/ehcache/debian/orig-tar.sh 2010-05-06 21:00:35 UTC (rev 12332)
+++ branches/ehcache/2.x/debian/orig-tar.sh 2010-05-14 19:10:12 UTC (rev 12410)
@@ -2,19 +2,18 @@
# called by uscan with '--upstream-version' <version> <file>
DIR=ehcache-$2.orig
+TAR=../ehcache_$2.orig.tar.gz
# clean up the upstream tarball
-tar zxf $3
-mv ehcache-* $DIR
-(cd $DIR; jar xf ehcache-*-sources.jar)
-GZIP=--best tar czf $3 --exclude '*.jar' --exclude '*.zip' $DIR
-rm -rf $DIR
+svn export http://svn.terracotta.org/svn/ehcache/tags/ehcache-core-$2/ $DIR
+# FIXME: check PDF and DOC files
+GZIP=--best tar czf $TAR --exclude '*.jar' --exclude '*.zip' $DIR
+rm -rf $DIR ../ehcache-core-$2
# move to directory 'tarballs'
if [ -r .svn/deb-layout ]; then
. .svn/deb-layout
- mv $3 $origDir
- echo "moved $3 to $origDir"
+ mv $TAR $origDir
+ echo "moved $TAR to $origDir"
fi
-exit 0
Deleted: branches/ehcache/2.x/debian/rules
===================================================================
--- trunk/ehcache/debian/rules 2010-05-06 21:00:35 UTC (rev 12332)
+++ branches/ehcache/2.x/debian/rules 2010-05-14 19:10:12 UTC (rev 12410)
@@ -1,19 +0,0 @@
-#!/usr/bin/make -f
-# debian/rules file for ehcache (uses cdbs)
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java/
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_BUILD_TARGET := jar
-DEB_JARS := commons-logging servlet-api-2.4 backport-util-concurrent \
- jsr107cache hibernate3 commons-collections3 jgroups-all
-DEB_INSTALL_CHANGELOGS_ALL := CHANGELOG.txt
-
-install/libehcache-java::
- install -D -m 644 target/ehcache.jar $(DEB_DESTDIR)/usr/share/java/ehcache-${DEB_UPSTREAM_VERSION}.jar
- dh_link -plibehcache-java usr/share/java/ehcache-${DEB_UPSTREAM_VERSION}.jar usr/share/java/ehcache.jar
-
-get-orig-source:
- -uscan --upstream-version 0 --rename
Copied: branches/ehcache/2.x/debian/rules (from rev 12386, trunk/ehcache/debian/rules)
===================================================================
--- branches/ehcache/2.x/debian/rules (rev 0)
+++ branches/ehcache/2.x/debian/rules 2010-05-14 19:10:12 UTC (rev 12410)
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
Deleted: branches/ehcache/2.x/debian/watch
===================================================================
--- trunk/ehcache/debian/watch 2010-05-06 21:00:35 UTC (rev 12332)
+++ branches/ehcache/2.x/debian/watch 2010-05-14 19:10:12 UTC (rev 12410)
@@ -1,3 +0,0 @@
-version=3
-opts="uversionmangle=s/-/~/,dversionmangle=s/-/~/" \
- http://sf.net/ehcache/ehcache-(\d.*)\.tgz debian debian/orig-tar.sh
Copied: branches/ehcache/2.x/debian/watch (from rev 12386, trunk/ehcache/debian/watch)
===================================================================
--- branches/ehcache/2.x/debian/watch (rev 0)
+++ branches/ehcache/2.x/debian/watch 2010-05-14 19:10:12 UTC (rev 12410)
@@ -0,0 +1,4 @@
+version=3
+opts="uversionmangle=s/-/~/,dversionmangle=s/-/~/" \
+ http://svn.terracotta.org/svn/ehcache/tags/ ehcache-core-(.*)/ \
+ debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list