[Git][java-team/tiles][master] 4 commits: Removed the -java-doc package (Closes: #108812)

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / tiles


Commits:
81c2c2dd by Emmanuel Bourg at 2024-12-09T12:52:39+01:00
Removed the -java-doc package (Closes: #108812)

- - - - -
8309e81c by Emmanuel Bourg at 2024-12-09T12:52:56+01:00
Standards-Version updated to 4.7.0

- - - - -
425a3236 by Emmanuel Bourg at 2024-12-09T13:48:30+01:00
Depend on libservlet-api-java instead of libservlet3.1-java

- - - - -
80e49d67 by Emmanuel Bourg at 2024-12-09T13:48:47+01:00
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/control
- − debian/libtiles-java-doc.doc-base
- − debian/libtiles-java-doc.install
- debian/maven.rules
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+tiles (3.0.7-6) unstable; urgency=medium
+
+  * Team upload.
+  * Depend on libservlet-api-java instead of libservlet3.1-java
+  * Removed the -java-doc package (Closes: #108812)
+  * Standards-Version updated to 4.7.0
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 09 Dec 2024 13:48:43 +0100
+
 tiles (3.0.7-5) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -8,12 +8,13 @@ Build-Depends:
  default-jdk,
  libcommons-digester-java,
  libeasymock-java,
+ libel-api-java,
  libfreemarker-java,
+ libjsp-api-java,
  libmaven-bundle-plugin-java,
- libmaven-javadoc-plugin-java,
  libmvel-java,
  libognl-java,
- libservlet3.1-java,
+ libservlet-api-java,
  libslf4j-java,
  libspring-core-java,
  libspring-web-java,
@@ -22,7 +23,7 @@ Build-Depends:
  libtomcat10-java,
  libvelocity-tools-java,
  maven-debian-helper (>= 2.6.3~)
-Standards-Version: 4.2.1
+Standards-Version: 4.7.0
 Vcs-Git: https://salsa.debian.org/java-team/tiles.git
 Vcs-Browser: https://salsa.debian.org/java-team/tiles
 Homepage: http://tiles.apache.org
@@ -42,22 +43,3 @@ Description: Java templating framework for web application user interfaces
  It has since been extracted from Struts and is now integrated with various
  frameworks, such as Struts 2 <http://struts.apache.org/2.x/>
  and Shale <http://shale.apache.org/>.
-
-Package: libtiles-java-doc
-Architecture: all
-Section: doc
-Depends: ${maven:DocDepends}, ${misc:Depends}
-Suggests: ${maven:DocOptionalDepends}
-Description: Java templating framework for web application user interfaces - documentation
- Apache Tiles is a Java templating framework built to simplify the development
- of web application user interfaces. Tiles allows authors to define page
- fragments which can be assembled into a complete page at runtime.
- .
- Tiles grew in popularity as a component of the popular
- Struts <http://struts.apache.org/1.x/> framework.
- .
- It has since been extracted from Struts and is now integrated with various
- frameworks, such as Struts 2 <http://struts.apache.org/2.x/>
- and Shale <http://shale.apache.org/>.
- .
- This package contains the Javadoc API of Tiles.


=====================================
debian/libtiles-java-doc.doc-base deleted
=====================================
@@ -1,9 +0,0 @@
-Document: libtiles-java-doc
-Title: API Javadoc for Tiles
-Author: Tiles developers
-Abstract: This is the API Javadoc provided by the Tiles library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libtiles-java/api/index.html
-Files: /usr/share/doc/libtiles-java/api/*


=====================================
debian/libtiles-java-doc.install deleted
=====================================
@@ -1 +0,0 @@
-src/target/site/apidocs/* /usr/share/doc/libtiles-java/api/


=====================================
debian/maven.rules
=====================================
@@ -1,6 +1,5 @@
 junit junit jar s/3\..*/3.x/
 org.springframework * * s/.*/3.x/
-javax.servlet s/servlet-api/javax.servlet-api/ jar s/.*/3.1/
 javax.servlet.jsp s/jsp-api/javax.servlet.jsp-api/ jar s/.*/2.3/
 javax.el s/el-api/javax.el-api/ jar s/.*/3.0/
 org.apache.tomcat s/jasper-el/tomcat-jasper-el/ * s/.*/10.x/


=====================================
debian/rules
=====================================
@@ -10,7 +10,7 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	MAVEN_OPTS="--add-opens java.base/java.util=ALL-UNNAMED" \
-	dh_auto_build -- --file src/pom.xml package javadoc:aggregate
+	dh_auto_build -- --file src/pom.xml package
 
 override_dh_auto_test:
 	MAVEN_OPTS="--add-opens java.base/java.util=ALL-UNNAMED" \



View it on GitLab: https://salsa.debian.org/java-team/tiles/-/compare/13c737ce4584dad701018f9e22cf2dff3d257317...80e49d67a941ab7717ee85cfac32830f400bec32

-- 
View it on GitLab: https://salsa.debian.org/java-team/tiles/-/compare/13c737ce4584dad701018f9e22cf2dff3d257317...80e49d67a941ab7717ee85cfac32830f400bec32
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/20241209/6b4c8991/attachment.htm>