[Git][java-team/libfreemarker-java][master] 4 commits: * d/control: remove jruby from the build-deps. (Closes: #979745)
Louis-Philippe Véronneau
gitlab at salsa.debian.org
Mon Jan 11 02:15:59 GMT 2021
Louis-Philippe Véronneau pushed to branch master at Debian Java Maintainers / libfreemarker-java
Commits:
0a4f0987 by Louis-Philippe Véronneau at 2021-01-10T20:42:55-05:00
* d/control: remove jruby from the build-deps. (Closes: #979745)
- - - - -
3d26aa45 by Louis-Philippe Véronneau at 2021-01-10T20:45:19-05:00
d/control: use dh-compat and update to dh13.
- - - - -
d038fb89 by Louis-Philippe Véronneau at 2021-01-10T20:47:29-05:00
d/control: Standards-Version update to 4.5.1. Add Rules-Requires-Root.
- - - - -
41127bfa by Louis-Philippe Véronneau at 2021-01-10T21:08:24-05:00
Update d/watch, use new Homepage and delete old repacking scripts not needed anymore.
- - - - -
8 changed files:
- − debian/README.source
- debian/changelog
- − debian/compat
- debian/control
- − debian/orig-tar.exclude
- − debian/orig-tar.sh
- debian/patches/fix-tests-classpath.patch
- debian/watch
Changes:
=====================================
debian/README.source deleted
=====================================
@@ -1,13 +0,0 @@
-libfreemarker-java
-==================
-
-The upstream supplied source package contains binary jar files and
-pre-built documentation. 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, 27 Aug 2007 19:02:53 +0530
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+libfreemarker-java (2.3.23-10) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * d/control: remove jruby from the build-deps. (Closes: #979745)
+ * d/control: use dh-compat and update to dh13.
+ * d/control: Standards-Version update to 4.5.1. Add Rules-Requires-Root.
+ * Update d/watch, use new Homepage and delete old repacking scripts not
+ needed anymore.
+
+ -- Louis-Philippe Véronneau <pollo at debian.org> Sun, 10 Jan 2021 16:14:36 -0500
+
libfreemarker-java (2.3.23-9) unstable; urgency=medium
* Depend on libtomcat9-java instead of libtomcat8-java
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -11,13 +11,12 @@ Build-Depends:
ant-optional,
antlr3,
bnd,
- debhelper (>= 11),
+ debhelper-compat (= 13),
default-jdk,
default-jdk-doc,
ivy,
ivy-debian-helper,
javacc,
- jruby,
junit,
jython (>= 2.5.3-10~),
jython-doc,
@@ -46,10 +45,11 @@ Build-Depends:
libxerces2-java,
libxerces2-java-doc,
maven-repo-helper
-Standards-Version: 4.2.1
+Standards-Version: 4.5.1
Vcs-Git: https://salsa.debian.org/java-team/libfreemarker-java.git
Vcs-Browser: https://salsa.debian.org/java-team/libfreemarker-java
-Homepage: http://www.freemarker.org
+Homepage: https://github.com/apache/freemarker
+Rules-Requires-Root: no
Package: libfreemarker-java
Architecture: all
=====================================
debian/orig-tar.exclude deleted
=====================================
@@ -1,7 +0,0 @@
-freemarker.jar
-*/docs*
-*/src/freemarker/ext/jsp/*.dtd
-*/src/freemarker/ext/jsp/*.xsd
-.settings
-.project
-.classpath
=====================================
debian/orig-tar.sh deleted
=====================================
@@ -1,21 +0,0 @@
-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-
-VERSION=$2
-TAR=../libfreemarker-java_$VERSION.orig.tar.xz
-DIR=freemarker-$VERSION
-
-# clean up the upstream tarball
-mkdir $DIR
-tar -x -C $DIR -f $3
-mv $DIR/source $DIR/$DIR
-XZ_OPT=--best tar -c -J -f $TAR -X debian/orig-tar.exclude -C $DIR $DIR
-rm -rf $DIR $3
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $3 $origDir
- echo "moved $3 to $origDir"
-fi
=====================================
debian/patches/fix-tests-classpath.patch
=====================================
@@ -1,15 +1,16 @@
Description: Declares the missing transitive dependencies required to run the tests
Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
---- a/ivy.xml
-+++ b/ivy.xml
-@@ -96,6 +96,14 @@
+Index: libfreemarker-java/ivy.xml
+===================================================================
+--- libfreemarker-java.orig/ivy.xml
++++ libfreemarker-java/ivy.xml
+@@ -96,6 +96,13 @@
<!-- The lowerst supported xml-apis version depends on JDK version; prevent any collosion: -->
<exclude org="xml-apis" module="xml-apis" />
</dependency>
+
+ <dependency org="com.github.jnr" name="jnr-constants" rev="debian" conf="build.test->default; test->default" />
-+ <dependency org="org.jruby" name="jruby-complete" rev="1.7.11" conf="build.test->default; test->default" />
+ <dependency org="org.antlr" name="antlr" rev="3.2" conf="build.test->default; test->default" />
+ <dependency org="org.antlr" name="antlr-runtime" rev="3.2" conf="build.test->default; test->default" />
+ <dependency org="asm" name="asm-all" rev="3.3" conf="build.test->default; test->default" />
@@ -18,3 +19,10 @@ Forwarded: no
<dependency org="javax.servlet.jsp" name="jsp-api" rev="1.2" conf="build.jsp1.2->default" />
<dependency org="javax.servlet" name="servlet-api" rev="2.3" conf="build.jsp1.2->default" />
+@@ -166,4 +173,4 @@
+ <conflict org="javax.servlet.jsp" module="jsp-api" manager="strict" />
+
+ </dependencies>
+-</ivy-module>
+\ No newline at end of file
++</ivy-module>
=====================================
debian/watch
=====================================
@@ -1,3 +1,4 @@
-version=3
-opts=uversionmangle=s/^(\d)(\d)$/$1.$2/;s/^(\d)(\d)(\d)$/$1.$2.$3/ \
-http://sf.net/freemarker/ freemarker-([\d\.]+).tar.gz debian debian/orig-tar.sh
+version=4
+opts="mode=git" \
+https://github.com/apache/freemarker.git \
+refs/tags/v([\d\.]+)
View it on GitLab: https://salsa.debian.org/java-team/libfreemarker-java/-/compare/7b718ea910e60522ba01cf9cf090299257782dfa...41127bfa6d40fc6e749328d2e2a1d05d04c72cb5
--
View it on GitLab: https://salsa.debian.org/java-team/libfreemarker-java/-/compare/7b718ea910e60522ba01cf9cf090299257782dfa...41127bfa6d40fc6e749328d2e2a1d05d04c72cb5
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/20210111/28a58476/attachment.html>
More information about the pkg-java-commits
mailing list