[Git][java-team/guice][master] 8 commits: Standards-Version updated to 4.5.1

Emmanuel Bourg gitlab at salsa.debian.org
Tue Jan 19 15:19:20 GMT 2021 


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


Commits:
ab1f60e7 by Emmanuel Bourg at 2021-01-19T15:09:40+01:00
Standards-Version updated to 4.5.1

- - - - -
f3d0b511 by Emmanuel Bourg at 2021-01-19T15:15:35+01:00
Removed the -java-doc package

- - - - -
6d66897b by Emmanuel Bourg at 2021-01-19T15:16:02+01:00
New uploader

- - - - -
95d84817 by Emmanuel Bourg at 2021-01-19T15:53:58+01:00
Build and install the no_aop artifact (Closes: #948309)

- - - - -
90cea980 by Emmanuel Bourg at 2021-01-19T16:14:15+01:00
Build depend on libservlet-api-java instead of libservlet3.1-java

- - - - -
e7360c4b by Emmanuel Bourg at 2021-01-19T16:15:18+01:00
No longer use the 3.x Spring artifact

- - - - -
af8c5c11 by Emmanuel Bourg at 2021-01-19T16:16:33+01:00
No longer track the release candidates

- - - - -
e886f6f8 by Emmanuel Bourg at 2021-01-19T16:16:57+01:00
Upload to unstable

- - - - -


10 changed files:

- debian/changelog
- debian/control
- − debian/libguice-java-doc.doc-base
- − debian/libguice-java-doc.examples
- − debian/libguice-java-doc.install
- − debian/libguice-java.links
- debian/maven.ignoreRules
- debian/maven.rules
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+guice (4.2.3-2) unstable; urgency=medium
+
+  * Build and install the no_aop artifact (Closes: #948309)
+  * Build depend on libservlet-api-java instead of libservlet3.1-java
+  * No longer use the 3.x Spring artifact
+  * Removed the -java-doc package
+  * Standards-Version updated to 4.5.1
+  * No longer track the release candidates
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 19 Jan 2021 16:16:47 +0100
+
 guice (4.2.3-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -2,10 +2,10 @@ Source: guice
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Emmanuel Bourg <ebourg at apache.org>
 Build-Depends:
  debhelper-compat (= 13),
  default-jdk,
- default-jdk-doc,
  libaopalliance-java,
  libasm-java (>= 5.0),
  libatinject-jsr330-api-java,
@@ -15,12 +15,11 @@ Build-Depends:
  libguava-java,
  libjarjar-maven-plugin-java,
  libmaven-bundle-plugin-java,
- libmaven-javadoc-plugin-java,
  libmunge-maven-plugin-java,
- libservlet3.1-java,
+ libservlet-api-java,
  libspring-beans-java,
  maven-debian-helper (>= 2.2)
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Vcs-Git: https://salsa.debian.org/java-team/guice.git
 Vcs-Browser: https://salsa.debian.org/java-team/guice
 Homepage: https://github.com/google/guice
@@ -41,23 +40,3 @@ Description: lightweight dependency injection framework for Java 5 and above
  the same interface is needed, the user can create custom annotations
  that identify an implementation, then use that annotation when
  injecting it.
-
-Package: libguice-java-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: default-jdk-doc
-Description: documentation for libguice-java
- Documentation for Guice that is a framework that provides support for
- dependency injection using annotations to configure Java objects.
- Dependency injection is a design pattern whose core principle is to
- separate behavior from dependency resolution.
- .
- Guice allows implementation classes to be programmatically bound to
- an interface, then injected into constructors, methods or fields
- using an @Inject annotation. When more than one implementation of
- the same interface is needed, the user can create custom annotations
- that identify an implementation, then use that annotation when
- injecting it.
- .
- This package provides javadocs for Guice framework and example code.


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


=====================================
debian/libguice-java-doc.examples deleted
=====================================
@@ -1 +0,0 @@
-examples/src/example/xml


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


=====================================
debian/libguice-java.links deleted
=====================================
@@ -1 +0,0 @@
-/usr/share/maven-repo/com/google/inject/guice/debian/guice-debian.jar /usr/share/maven-repo/com/google/inject/guice/debian/guice-debian-no_aop.jar


=====================================
debian/maven.ignoreRules
=====================================
@@ -7,7 +7,7 @@ javax.inject javax.inject-tck * * * *
 junit junit * * * *
 org.apache.felix org.apache.felix.framework * * * *
 org.apache.maven.plugins maven-gpg-plugin * * * *
-org.apache.maven.plugins maven-jar-plugin * * * *
+org.apache.maven.plugins maven-javadoc-plugin * * * *
 org.apache.maven.plugins maven-remote-resources-plugin * * * *
 org.apache.maven.plugins maven-source-plugin * * * *
 org.codehaus.mojo animal-sniffer-maven-plugin * * * *


=====================================
debian/maven.rules
=====================================
@@ -1,2 +1 @@
-javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
-org.springframework spring-beans * s/.*/3.x/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/debian/ * *


=====================================
debian/rules
=====================================
@@ -9,5 +9,10 @@ CGLIB_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libcglib-java
 %:
 	dh $@ --buildsystem=maven
 
+override_dh_auto_install:
+	dh_auto_install
+
+	mh_installjar -plibguice-java --java-lib --usj-name=guice-no-aop --classifier=no_aop core/pom.xml core/target/guice-*-no_aop.jar
+
 override_dh_gencontrol:
 	dh_gencontrol -- -Vasm:Version=${ASM_VERSION} -Vcglib:Version=${CGLIB_VERSION}


=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
-version=3
-opts=repack,compression=xz,uversionmangle=s/-(rc|beta)/~$1/ \
-https://github.com/google/guice/tags .*/([\d\.]+(?:-(?:rc|beta)(?:\d+)?)?).tar.gz
+version=4
+opts=repack,compression=xz \
+https://github.com/google/guice/tags .*/([\d\.]+).tar.gz



View it on GitLab: https://salsa.debian.org/java-team/guice/-/compare/e9c8f8cb2626e094b4ac06fbbb619fb0c679b26a...e886f6f851ccbb1d9958b32f1f0994b56ee428b7

-- 
View it on GitLab: https://salsa.debian.org/java-team/guice/-/compare/e9c8f8cb2626e094b4ac06fbbb619fb0c679b26a...e886f6f851ccbb1d9958b32f1f0994b56ee428b7
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/20210119/40fb561f/attachment.html>

More information about the pkg-java-commits mailing list