[Git][java-team/ehcache][master] 8 commits: Use salsa.debian.org Vcs-* URLs
Emmanuel Bourg
gitlab at salsa.debian.org
Tue Jan 5 11:50:43 GMT 2021
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / ehcache
Commits:
2e5d6660 by Emmanuel Bourg at 2021-01-05T12:12:50+01:00
Use salsa.debian.org Vcs-* URLs
- - - - -
890ce16c by Emmanuel Bourg at 2021-01-05T12:20:27+01:00
Updated the watch file
- - - - -
b4e06a3e by Emmanuel Bourg at 2021-01-05T12:25:23+01:00
Updated the copyright file
- - - - -
792f2a2c by Emmanuel Bourg at 2021-01-05T12:27:37+01:00
Standards-Version updated to 4.5.1
- - - - -
39f4a38e by Emmanuel Bourg at 2021-01-05T12:46:15+01:00
Build with the DH sequencer instead of CDBS
- - - - -
a6bddecf by Emmanuel Bourg at 2021-01-05T12:46:23+01:00
Switch to debhelper level 13
- - - - -
f4fe047c by Emmanuel Bourg at 2021-01-05T12:50:06+01:00
Set the source/target level to Java 8
- - - - -
96f1dd7b by Emmanuel Bourg at 2021-01-05T12:50:23+01:00
Upload to unstable
- - - - -
12 changed files:
- debian/README.Debian-source
- debian/build.xml
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- + debian/libehcache-java.links
- + debian/libehcache-java.poms
- − debian/orig-tar.exclude
- − debian/orig-tar.sh
- debian/rules
- debian/watch
Changes:
=====================================
debian/README.Debian-source
=====================================
@@ -6,9 +6,5 @@ Currently no clean source distribution exists. Therefore, the upstream
sources were modified to comply with the Debian Free Software
Guidelines.
-Use the rules/get-orig-source target to create the orig.tar.gz.
-For more details on repackaging of upstream sources please see the
-debian/orig-tar.sh file.
-
-- Varun Hiremath <varunhiremath at gmail.com> Mon, 17 Sep 2007 00:37:50 +0530
=====================================
debian/build.xml
=====================================
@@ -17,7 +17,7 @@
</target>
<target name="compile" depends="init">
- <javac destdir="${build}" srcdir="src/main/java" debug="yes" source="1.5" target="1.5"/>
+ <javac destdir="${build}" srcdir="src/main/java" debug="yes" source="8" target="8"/>
</target>
<target name="init">
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+ehcache (2.6.11-4) unstable; urgency=medium
+
+ * Build with the DH sequencer instead of CDBS
+ * Set the source/target level to Java 8
+ * Use salsa.debian.org Vcs-* URLs
+ * Updated the watch file
+ * Updated the copyright file
+ * Standards-Version updated to 4.5.1
+ * Switch to debhelper level 13
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 05 Jan 2021 12:50:16 +0100
+
ehcache (2.6.11-3) unstable; urgency=medium
* Removed the unused dependency on libjsr107cache-java
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-9
=====================================
debian/control
=====================================
@@ -6,8 +6,7 @@ Uploaders: Varun Hiremath <varun at debian.org>,
Torsten Werner <twerner at debian.org>,
Emmanuel Bourg <ebourg at apache.org>
Build-Depends: ant,
- cdbs,
- debhelper (>= 9),
+ debhelper-compat (= 13),
default-jdk,
libbtm-java,
libcommons-collections3-java,
@@ -18,9 +17,9 @@ Build-Depends: ant,
libservlet3.1-java,
libslf4j-java,
maven-repo-helper
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-java/ehcache.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/ehcache.git
+Standards-Version: 4.5.1
+Vcs-Git: https://salsa.debian.org/java-team/ehcache.git
+Vcs-Browser: https://salsa.debian.org/java-team/ehcache
Homepage: http://ehcache.sourceforge.net
Package: libehcache-java
=====================================
debian/copyright
=====================================
@@ -1,10 +1,23 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Ehcache distributed cache library
Upstream-Contact: Terracotta, Inc.
-Source: http://svn.terracotta.org/svn/ehcache/tags/
+Source: https://svn.terracotta.org/svn/ehcache/tags/
+Files-Excluded: *.jar
+ src/site
Files: *
Copyright: 2003-2014 Terracotta, Inc.
License: Apache-2.0
- On Debian systems you can find the complete text of the Apache-2.0
- license in `/usr/share/common-licenses/Apache-2.0'
+
+Files: debian/*
+Copyright: 2007, Arnaud Vandyck
+ 2007-2009, Varun Hiremath
+ 2008-2010, Torsten Werner
+ 2010, Thierry Carrez
+ 2012, Miguel Landaeta
+ 2013-2020, Emmanuel Bourg
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian systems you can find the complete text of the Apache-2.0
+ license in `/usr/share/common-licenses/Apache-2.0'
=====================================
debian/libehcache-java.links
=====================================
@@ -0,0 +1 @@
+/usr/share/java/ehcache-core.jar /usr/share/java/ehcache.jar
=====================================
debian/libehcache-java.poms
=====================================
@@ -0,0 +1,29 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+
+pom.xml --no-parent --java-lib --artifact=target/ehcache.jar
=====================================
debian/orig-tar.exclude deleted
=====================================
@@ -1,4 +0,0 @@
-*.jar
-*.zip
-EhcacheUserGuide*.pdf
-src/site
=====================================
debian/orig-tar.sh deleted
=====================================
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-DIR=ehcache-$2.orig
-TAR=../ehcache_$2.orig.tar.xz
-
-# clean up the upstream tarball
-svn export http://svn.terracotta.org/svn/ehcache/tags/ehcache-core-$2/ $DIR
-# FIXME: check PDF and DOC files
-XZ_OPT=--best tar cJf $TAR -X debian/orig-tar.exclude $DIR
-rm -rf $DIR ../ehcache-core-$2
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $TAR $origDir
- echo "moved $TAR to $origDir"
-fi
-
=====================================
debian/rules
=====================================
@@ -1,22 +1,19 @@
#!/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
+export CLASSPATH = /usr/share/java/commons-logging.jar\
+ :/usr/share/java/servlet-api-3.1.jar\
+ :/usr/share/java/slf4j-api.jar\
+ :/usr/share/java/geronimo-jta-1.0.1b-spec.jar\
+ :/usr/share/java/btm.jar\
+ :/usr/share/java/hibernate3.jar\
+ :/usr/share/java/commons-collections3.jar\
+ :/usr/share/java/jgroups-all.jar
-JAVA_HOME := /usr/lib/jvm/default-java/
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_BUILD_TARGET := jar
-DEB_JARS := commons-logging servlet-api-3.1 \
- slf4j-api geronimo-jta-1.0.1b-spec btm \
- hibernate3 commons-collections3 jgroups-all
+%:
+ dh $@ --buildsystem=ant --with maven-repo-helper
-install/libehcache-java::
- mh_installpom -plibehcache-java pom.xml --no-parent
- mh_installjar -plibehcache-java -l pom.xml target/ehcache.jar /usr/share/java/ehcache.jar
+override_dh_auto_build:
+ ant -f debian/build.xml jar
-clean::
- mh_clean
-
-get-orig-source:
- uscan --download-current-version --force-download --rename
+override_dh_auto_clean:
+ ant -f debian/build.xml clean
=====================================
debian/watch
=====================================
@@ -1,4 +1,3 @@
-version=3
-opts="uversionmangle=s/-/~/,dversionmangle=s/-/~/" \
- http://svn.terracotta.org/svn/ehcache/tags/ ehcache-core-(.*)/ \
- debian debian/orig-tar.sh
+version=4
+opts="mode=svn,uversionmangle=s/-/~/,dversionmangle=s/-/~/" \
+https://svn.terracotta.org/svn/ehcache/tags/ ehcache-core-([\d\.]+)/
View it on GitLab: https://salsa.debian.org/java-team/ehcache/-/compare/ed6d935e2b8d2006a528e13173d16f38eb3919f3...96f1dd7bf869a3a01efe68933ff11725cbe44f6e
--
View it on GitLab: https://salsa.debian.org/java-team/ehcache/-/compare/ed6d935e2b8d2006a528e13173d16f38eb3919f3...96f1dd7bf869a3a01efe68933ff11725cbe44f6e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20210105/61c1419a/attachment.html>
More information about the pkg-java-commits
mailing list