[Git][java-team/logback][master] 6 commits: Track and download the new releases from GitHub

Thu Feb 4 00:44:55 GMT 2021


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


Commits:
7589fc64 by Emmanuel Bourg at 2021-02-04T01:10:25+01:00
Track and download the new releases from GitHub

- - - - -
b7afdb80 by Emmanuel Bourg at 2021-02-04T01:10:50+01:00
Standards-Version updated to 4.5.1

- - - - -
40ef132f by Emmanuel Bourg at 2021-02-04T01:11:02+01:00
Switch to debhelper level 13

- - - - -
e7d88408 by Emmanuel Bourg at 2021-02-04T01:43:48+01:00
Build depend on libservlet-api-java instead of libservlet3.1-java

- - - - -
08ac5709 by Emmanuel Bourg at 2021-02-04T01:44:07+01:00
Fixed the build failure with gmavenplus 1.8

- - - - -
4fbc42ad by Emmanuel Bourg at 2021-02-04T01:44:38+01:00
Upload to unstable

- - - - -


10 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- debian/maven.rules
- − debian/orig-tar.exclude
- − debian/orig-tar.sh
- + debian/patches/07-gmaven-compatibility.patch
- debian/patches/series
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+logback (1:1.2.3-6) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with gmavenplus 1.8
+  * Build depend on libservlet-api-java instead of libservlet3.1-java
+  * Track and download the new releases from GitHub
+  * Standards-Version updated to 4.5.1
+  * Switch to debhelper level 13
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 04 Feb 2021 01:44:31 +0100
+
 logback (1:1.2.3-5) unstable; urgency=medium
 
   * Team upload.


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


=====================================
debian/control
=====================================
@@ -4,11 +4,11 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: tony mancill <tmancill at debian.org>
 Build-Depends:
- debhelper (>= 11),
+ debhelper-compat (= 13),
  default-jdk,
  groovy,
  libgeronimo-jms-1.1-spec-java,
- libgmavenplus-java,
+ libgmavenplus-java (>= 1.8),
  libjanino-java (>= 2.6.0),
  libjansi-java,
  libjetty9-java (>= 9.4),
@@ -16,11 +16,11 @@ Build-Depends:
  libmaven-antrun-plugin-java,
  libmaven-bundle-plugin-java,
  libmaven-javadoc-plugin-java,
- libservlet3.1-java,
+ libservlet-api-java,
  libslf4j-java (>= 1.7.18),
  libtomcat9-java,
  maven-debian-helper
-Standards-Version: 4.2.1
+Standards-Version: 4.5.1
 Vcs-Git: https://salsa.debian.org/java-team/logback.git
 Vcs-Browser: https://salsa.debian.org/java-team/logback
 Homepage: https://logback.qos.ch


=====================================
debian/copyright
=====================================
@@ -1,7 +1,13 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Logback
 Upstream-Contact: Logback developpers
-Source: https://logback.qos.ch/dist/
+Source: https://github.com/qos-ch/logback
+Files-Excluded: *.jar
+                docs/xref-test
+                docs/testapidocs
+                docs/apidocs
+                docs/xref
+                */jquery-min.js
 
 Files: *
 Copyright: 2000-2017, QOS.ch


=====================================
debian/maven.rules
=====================================
@@ -1,5 +1,4 @@
 junit junit jar s/4\..*/4.x/
-javax.servlet javax.servlet-api * s/.*/3.1/ * *
 javax.mail s/mail/javax.mail-api * s/.*/debian/ * *
 org.apache.tomcat tomcat-catalina * s/.*/9.x/
 org.apache.tomcat tomcat-coyote * s/.*/9.x/


=====================================
debian/orig-tar.exclude deleted
=====================================
@@ -1,7 +0,0 @@
-*.jar
-docs/xref-test
-docs/testapidocs
-docs/apidocs
-docs/xref
-*/jquery-min.js
-


=====================================
debian/orig-tar.sh deleted
=====================================
@@ -1,20 +0,0 @@
-#!/bin/sh -e
-
-# $2 = version
-# $3 = file
-DIR=logback_$2
-TAR=../logback_$2.orig.tar.xz
-
-# clean up the upstream tarball
-tar xzf $3
-rm $3
-mv logback-$2 $DIR
-XZ_OPT=--best tar cJf $TAR -X debian/orig-tar.exclude $DIR
-rm -rf $DIR
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-  . .svn/deb-layout
-  mv $3 $origDir
-  echo "moved $3 to $origDir"
-fi


=====================================
debian/patches/07-gmaven-compatibility.patch
=====================================
@@ -0,0 +1,28 @@
+Description: Fixes the compatibility with the version of gmaven in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/logback-classic/pom.xml
++++ b/logback-classic/pom.xml
+@@ -189,8 +189,8 @@
+             <goals>
+               <goal>generateStubs</goal>
+               <goal>compile</goal>
+-              <goal>testGenerateStubs</goal>
+-              <goal>testCompile</goal>
++              <goal>generateTestStubs</goal>
++              <goal>compileTests</goal>
+             </goals>
+           </execution>
+         </executions>
+@@ -345,9 +345,9 @@
+                     <artifactId>gmavenplus-plugin</artifactId>
+                     <versionRange>[1.5,)</versionRange>
+                     <goals>
+-                      <goal>testGenerateStubs</goal>
++                      <goal>generateTestStubs</goal>
+                       <goal>generateStubs</goal>
+-                      <goal>testCompile</goal>
++                      <goal>compileTests</goal>
+                       <goal>compile</goal>
+                     </goals>
+                   </pluginExecutionFilter>


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@
 04-privacy-breach.patch
 05-java11-compatibility.patch
 06-jetty-compatibility.patch
+07-gmaven-compatibility.patch


=====================================
debian/watch
=====================================
@@ -1,2 +1,3 @@
-version=3
-http://logback.qos.ch/dist/logback-(\d.+).tar.gz debian debian/orig-tar.sh
+version=4
+opts="repack,compression=xz" \
+https://github.com/qos-ch/logback/tags .*/v_([\d\.]+).tar.gz



View it on GitLab: https://salsa.debian.org/java-team/logback/-/compare/a7fc0435349204acd98e3b5433327679293f5852...4fbc42ad811bd23a6c95c150788683977d914989

-- 
View it on GitLab: https://salsa.debian.org/java-team/logback/-/compare/a7fc0435349204acd98e3b5433327679293f5852...4fbc42ad811bd23a6c95c150788683977d914989
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/20210204/490716f1/attachment.html>
