[Git][java-team/velocity-tools][master] 6 commits: Removed the -java-doc package (Closes: #1052567)
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Tue Oct 3 07:24:24 BST 2023
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / velocity-tools
Commits:
16131595 by Emmanuel Bourg at 2023-10-03T08:00:01+02:00
Removed the -java-doc package (Closes: #1052567)
- - - - -
f2733f77 by Emmanuel Bourg at 2023-10-03T08:01:07+02:00
Standards-Version updated to 4.6.2
- - - - -
33110861 by Emmanuel Bourg at 2023-10-03T08:01:16+02:00
Switch to debhelper level 13
- - - - -
a89aafbf by Emmanuel Bourg at 2023-10-03T08:06:05+02:00
Wrap and sort
- - - - -
ae87e71c by Emmanuel Bourg at 2023-10-03T08:09:28+02:00
Depend on libservlet-api-java instead of libservlet3.1-java
- - - - -
7aef3929 by Emmanuel Bourg at 2023-10-03T08:09:56+02:00
Upload to unstable
- - - - -
6 changed files:
- debian/changelog
- − debian/compat
- debian/control
- − debian/libvelocity-tools-java-doc.doc-base
- − debian/libvelocity-tools-java-doc.examples
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+velocity-tools (2.0-9) unstable; urgency=medium
+
+ * Team upload.
+ * Removed the -java-doc package (Closes: #1052567)
+ * Depend on libservlet-api-java instead of libservlet3.1-java
+ * Standards-Version updated to 4.6.2
+ * Switch to debhelper level 13
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 03 Oct 2023 08:09:51 +0200
+
velocity-tools (2.0-8) unstable; urgency=high
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-10
=====================================
debian/control
=====================================
@@ -3,38 +3,43 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: ant, debhelper (>= 10), default-jdk
-Build-Depends-Indep: ant-optional,
- antlr,
- junit4,
- libcommons-beanutils-java,
- libcommons-collections3-java,
- libcommons-digester-java,
- libcommons-lang-java,
- libcommons-logging-java,
- libcommons-validator-java,
- libdom4j-java,
- liboro-java,
- libservlet3.1-java,
- maven-repo-helper,
- velocity
-Standards-Version: 4.1.1
+Build-Depends:
+ ant,
+ ant-optional,
+ antlr,
+ debhelper-compat (= 13),
+ default-jdk,
+ junit4,
+ libcommons-beanutils-java,
+ libcommons-collections3-java,
+ libcommons-digester-java,
+ libcommons-lang-java,
+ libcommons-logging-java,
+ libcommons-validator-java,
+ libdom4j-java,
+ libjsp-api-java,
+ liboro-java,
+ libservlet-api-java,
+ maven-repo-helper,
+ velocity
+Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/java-team/velocity-tools.git
Vcs-Browser: https://salsa.debian.org/java-team/velocity-tools
Homepage: http://velocity.apache.org/tools/
Package: libvelocity-tools-java
Architecture: all
-Depends: libcommons-beanutils-java,
- libcommons-collections3-java,
- libcommons-digester-java,
- libcommons-lang-java,
- libcommons-logging-java,
- libcommons-validator-java,
- libdom4j-java,
- liboro-java,
- velocity,
- ${misc:Depends}
+Depends:
+ libcommons-beanutils-java,
+ libcommons-collections3-java,
+ libcommons-digester-java,
+ libcommons-lang-java,
+ libcommons-logging-java,
+ libcommons-validator-java,
+ libdom4j-java,
+ liboro-java,
+ velocity,
+ ${misc:Depends}
Description: collection of useful tools for Velocity template engine
The VelocityTools project is a collection of useful Java classes (aka tools),
as well as infrastructure to easily, automatically and transparently
@@ -43,19 +48,3 @@ Description: collection of useful tools for Velocity template engine
Project include easy integration of Velocity into the view-layer of
web applications (via the VelocityViewTag and
VelocityViewServlet) and integration with Struts 1.x applications.
-
-Package: libvelocity-tools-java-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Suggests: libvelocity-tools-java
-Description: collection of useful tools for Velocity template engine - documentation
- The VelocityTools project is a collection of useful Java classes (aka tools),
- as well as infrastructure to easily, automatically and transparently
- make these tools available to Velocity templates.
- .
- Project include easy integration of Velocity into the view-layer of
- web applications (via the VelocityViewTag and
- VelocityViewServlet) and integration with Struts 1.x applications.
- .
- This package provides the API documentation for Velocity Tools.
=====================================
debian/libvelocity-tools-java-doc.doc-base deleted
=====================================
@@ -1,9 +0,0 @@
-Document: libvelocity-tools-java-doc
-Title: API Javadoc for Velocity Tools
-Author: Velocity Tools developers
-Abstract: This is the API Javadoc provided by the Velocity Tools library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libvelocity-tools-java/api/index.html
-Files: /usr/share/doc/libvelocity-tools-java/api/*
=====================================
debian/libvelocity-tools-java-doc.examples deleted
=====================================
@@ -1,2 +0,0 @@
-examples/showcase/
-examples/simple/
=====================================
debian/rules
=====================================
@@ -8,15 +8,15 @@ export CLASSPATH=/usr/share/java/commons-beanutils.jar \
:/usr/share/java/commons-lang.jar \
:/usr/share/java/commons-logging.jar \
:/usr/share/java/dom4j.jar \
- :/usr/share/java/jsp-api-2.3.jar \
- :/usr/share/java/servlet-api-3.1.jar \
+ :/usr/share/java/jsp-api.jar \
+ :/usr/share/java/servlet-api.jar \
:/usr/share/java/velocity.jar
%:
dh $@
override_dh_auto_build:
- dh_auto_build -- jar.view jar.generic javadoc -Dskip-download=true
+ dh_auto_build -- jar.view jar.generic -Dskip-download=true
override_dh_install:
dh_install
@@ -29,13 +29,7 @@ override_dh_install:
dh_link -plibvelocity-tools-java /usr/share/java/velocity-tools-view.jar /usr/share/maven-repo/velocity-tools/velocity-tools-view/debian/velocity-tools-view-debian.jar
dh_link -plibvelocity-tools-java /usr/share/java/velocity-tools-view.jar /usr/share/maven-repo/velocity-tools/velocity-tools-view/$(DEB_VERSION_UPSTREAM)/velocity-tools-view-$(DEB_VERSION_UPSTREAM).jar
- dh_install -plibvelocity-tools-java-doc docs/javadoc/* usr/share/doc/libvelocity-tools-java/api
-
override_dh_auto_clean:
dh_auto_clean
-rm -rf debian/tmp
mh_clean
-
-# Rename content directory to velocity-tools-X.Y in orig.tar.gz
-get-orig-source:
- uscan --force-download --rename --repack
View it on GitLab: https://salsa.debian.org/java-team/velocity-tools/-/compare/abb7e7f0e7ac3062704824f4ab42fec67352d7f3...7aef3929d468408bb76a095acb4a51a236ca6df3
--
View it on GitLab: https://salsa.debian.org/java-team/velocity-tools/-/compare/abb7e7f0e7ac3062704824f4ab42fec67352d7f3...7aef3929d468408bb76a095acb4a51a236ca6df3
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/20231003/33a30e8d/attachment.htm>
More information about the pkg-java-commits
mailing list