[Git][java-team/portlet-api-2.0-spec][master] 9 commits: Removed the -java-doc package

Emmanuel Bourg (@ebourg) gitlab at salsa.debian.org
Tue Dec 6 14:49:09 GMT 2022



Emmanuel Bourg pushed to branch master at Debian Java Maintainers / portlet-api-2.0-spec


Commits:
aca9d932 by Emmanuel Bourg at 2022-12-06T15:29:05+01:00
Removed the -java-doc package

- - - - -
b4c919bf by Emmanuel Bourg at 2022-12-06T15:29:51+01:00
Wrap and sort

- - - - -
d5910e15 by Emmanuel Bourg at 2022-12-06T15:30:06+01:00
Standards-Version updated to 4.6.1

- - - - -
ed24d029 by Emmanuel Bourg at 2022-12-06T15:30:12+01:00
Switch to debhelper level 13

- - - - -
c85d8d42 by Emmanuel Bourg at 2022-12-06T15:30:21+01:00
Use salsa.debian.org Vcs-* URLs

- - - - -
1aca4f45 by Emmanuel Bourg at 2022-12-06T15:44:17+01:00
Depend on libservlet-api-java instead of libservlet3.1-java

- - - - -
d05c9766 by Emmanuel Bourg at 2022-12-06T15:45:46+01:00
Updated the watch file

- - - - -
e0f4b324 by Emmanuel Bourg at 2022-12-06T15:47:21+01:00
Updated the copyright file

- - - - -
be452fa5 by Emmanuel Bourg at 2022-12-06T15:48:53+01:00
Upload to unstable

- - - - -


9 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- − debian/libportlet-api-2.0-spec-java-doc.doc-base.api
- − debian/libportlet-api-2.0-spec-java-doc.install
- debian/maven.rules
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+portlet-api-2.0-spec (1.0-3) unstable; urgency=medium
+
+  * Team upload.
+  * Depend on libservlet-api-java instead of libservlet3.1-java
+  * Removed the -java-doc package
+  * Standards-Version updated to 4.6.1
+  * Switch to debhelper level 13
+  * Use salsa.debian.org Vcs-* URLs
+  * Updated the watch file
+  * Updated the copyright file
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 06 Dec 2022 15:48:46 +0100
+
 portlet-api-2.0-spec (1.0-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-9


=====================================
debian/control
=====================================
@@ -3,19 +3,19 @@ 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: debhelper (>= 9), default-jdk, maven-debian-helper (>= 2.0)
-Build-Depends-Indep: default-jdk-doc,
-                     libmaven-javadoc-plugin-java,
-                     libservlet3.1-java,
-                     libservlet3.1-java-doc
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/portlet-api-2.0-spec.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/portlet-api-2.0-spec.git
+Build-Depends:
+ debhelper-compat (= 13),
+ default-jdk,
+ libservlet-api-java,
+ maven-debian-helper (>= 2.0)
+Standards-Version: 4.6.1
+Vcs-Git: https://salsa.debian.org/java-team/portlet-api-2.0-spec.git
+Vcs-Browser: https://salsa.debian.org/java-team/portlet-api-2.0-spec
 Homepage: http://portals.apache.org/pluto/portlet-2.0-apidocs/
 
 Package: libportlet-api-2.0-spec-java
 Architecture: all
-Depends: ${maven:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${maven:Depends}
 Recommends: ${maven:OptionalDepends}
 Description: Java Portlet Specification V2.0
  The Java Portlet API version 2.0 developed by the Java Community Process
@@ -26,21 +26,3 @@ Description: Java Portlet Specification V2.0
  .
  Package current source code is taken from Apache Portals project
  <http://portals.apache.org/>.
-
-Package: libportlet-api-2.0-spec-java-doc
-Architecture: all
-Section: doc
-Depends: ${maven:DocDepends}, ${misc:Depends}
-Recommends: ${maven:DocOptionalDepends}
-Suggests: libportlet-api-2.0-spec-java
-Description: Java Portlet Specification V2.0 - documentation
- The Java Portlet API version 2.0 developed by the Java Community Process
- JSR-286 Expert Group.
- .
- Portlets are pluggable user interface components that are managed
- and displayed in a web portal like Liferay or JBoss Gatein.
- .
- Package current source code is taken from Apache Portals project
- <http://portals.apache.org/>.
- .
- This package provides the API documentation for libportlet-api-2.0-spec-java.


=====================================
debian/copyright
=====================================
@@ -1,7 +1,6 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Java Portlet Specification V2.0
-Maintainer: Apache Software Foundation
-Source: http://svn.apache.org/repos/asf/portals/portlet-spec/tags/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Java Portlet Specification V2.0
+Source: https://svn.apache.org/repos/asf/portals/portlet-spec/tags/
 
 Files: *
 Copyright: 2004-2009 Apache Software Foundation


=====================================
debian/libportlet-api-2.0-spec-java-doc.doc-base.api deleted
=====================================
@@ -1,10 +0,0 @@
-Document: libportlet-api-2.0-spec-java
-Title: API Javadoc for Java Portlet Specification V2.0
-Author: Apache Software Foundation developers
-Abstract: This is the API Javadoc provided for the
- libportlet-api-2.0-spec-java library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libportlet-api-2.0-spec-java/api/index.html
-Files: /usr/share/doc/libportlet-api-2.0-spec-java/api/*


=====================================
debian/libportlet-api-2.0-spec-java-doc.install deleted
=====================================
@@ -1 +0,0 @@
-target/apidocs/* usr/share/doc/libportlet-api-2.0-spec-java/api


=====================================
debian/maven.rules
=====================================
@@ -1,5 +1,5 @@
 # Force the version of the javax apis
-javax.servlet s/servlet-api/javax.servlet-api/ jar s/.*/3.1/
+javax.servlet s/servlet-api/javax.servlet-api/ jar s/.*/debian/
 javax.portlet portlet-api jar s/.*/2.0/
 # Convert portals version of the standard apis to the javax apis
 s/org.apache.portals/javax.portlet/ s/portlet-api_2.0_spec/portlet-api/ jar s/.*/2.0/


=====================================
debian/rules
=====================================
@@ -1,7 +1,4 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --buildsystem=maven
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename
+	dh $@


=====================================
debian/watch
=====================================
@@ -1,4 +1,4 @@
-version=3
+version=4
 opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
-  http://svn.apache.org/repos/asf/portals/portlet-spec/tags/ \
+  https://svn.apache.org/repos/asf/portals/portlet-spec/tags/ \
   portlet-api_2.0_spec-(\d.*)/ debian debian/orig-tar.sh



View it on GitLab: https://salsa.debian.org/java-team/portlet-api-2.0-spec/-/compare/0b8b5cf5d348bbc5580fef28ed33091f140fb9bd...be452fa5f1a597473126c96ca676d3e8c4edb769

-- 
View it on GitLab: https://salsa.debian.org/java-team/portlet-api-2.0-spec/-/compare/0b8b5cf5d348bbc5580fef28ed33091f140fb9bd...be452fa5f1a597473126c96ca676d3e8c4edb769
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/20221206/3107a51f/attachment.htm>


More information about the pkg-java-commits mailing list