[Git][java-team/mockito][master] 7 commits: Standards-Version updated to 4.2.1

Wed Oct 10 15:22:48 BST 2018

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


Commits:
eb6e68e6 by Emmanuel Bourg at 2018-10-10T13:36:25Z
Standards-Version updated to 4.2.1

- - - - -
6b96acf5 by Emmanuel Bourg at 2018-10-10T13:36:43Z
Switch to debhelper level 11

- - - - -
66cf3322 by Emmanuel Bourg at 2018-10-10T13:37:18Z
Wrap and sort

- - - - -
31d1a930 by Emmanuel Bourg at 2018-10-10T13:37:26Z
Use salsa.debian.org Vcs-* URLs

- - - - -
c804b334 by Emmanuel Bourg at 2018-10-10T14:03:33Z
Increased the source/target level to fix the build failure with Java 9

- - - - -
ce4148a3 by Emmanuel Bourg at 2018-10-10T14:13:34Z
Removed the doc package

- - - - -
5ad3f69a by Emmanuel Bourg at 2018-10-10T14:19:33Z
Upload to unstable

- - - - -


8 changed files:

- debian/changelog
- debian/compat
- debian/control
- − debian/libmockito-java-doc.install
- + debian/patches/06-source-target-level.patch
- debian/patches/series
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,13 +1,21 @@
-mockito (1.10.19-3) UNRELEASED; urgency=medium
+mockito (1.10.19-3) unstable; urgency=medium
 
+  * Team upload.
+
+  [ Markus Koschany ]
   * Build-depend on testng and gradle >= 3.4.1-2.
     Change maven rule for testng to debian. Thus the package can be compiled
     again. Thanks to Gilles Filippini for the report. (Closes: #882182)
-  * Declare compliance with Debian Policy 4.1.1.
   * Use https for Format field.
-  * Switch to compat level 10.
 
- -- Markus Koschany <apo at debian.org>  Wed, 29 Nov 2017 18:04:36 +0100
+  [ Emmanuel Bourg ]
+  * Increased the source/target level to fix the build failure with Java 9
+  * Removed the doc package
+  * Standards-Version updated to 4.2.1
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 10 Oct 2018 16:13:50 +0200
 
 mockito (1.10.19-2) unstable; urgency=medium
 


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
@@ -2,12 +2,11 @@ Source: mockito
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders:
- Markus Koschany <apo at debian.org>
+Uploaders: Markus Koschany <apo at debian.org>
 Build-Depends:
  ant,
  bnd,
- debhelper (>= 10),
+ debhelper (>= 11),
  default-jdk,
  gradle (>= 3.4.1-2),
  gradle-debian-helper,
@@ -21,9 +20,9 @@ Build-Depends:
  libspock-java,
  maven-repo-helper (>= 1.9~),
  testng
-Standards-Version: 4.1.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/mockito.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/mockito.git
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/mockito.git
+Vcs-Browser: https://salsa.debian.org/java-team/mockito
 Homepage: http://mockito.org/
 
 Package: libmockito-java
@@ -33,22 +32,9 @@ Depends:
  libhamcrest-java,
  libobjenesis-java,
  ${misc:Depends}
-Suggests:
- libmockito-java-doc
 Description: mocking framework for Java
  Mockito is a mocking library which lets you write tests with a
  clean and simple API.
  .
  It generates mocks using reflection, it records all mock invocations,
  including methods arguments.
-
-Package: libmockito-java-doc
-Architecture: all
-Section: doc
-Depends:
- ${misc:Depends}
-Description: mocking framework for Java - documentation
- Mockito is a mocking library which lets you write tests with a
- clean and simple API.
- .
- This package contains the JavaDoc documentation for Mockito.


=====================================
debian/libmockito-java-doc.install deleted
=====================================
@@ -1 +0,0 @@
-build/docs/javadoc/* usr/share/doc/libmockito-java/api


=====================================
debian/patches/06-source-target-level.patch
=====================================
@@ -0,0 +1,16 @@
+Description: Increases the source/target level to fix the build failure with Java 9
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/build.gradle
++++ b/build.gradle
+@@ -26,8 +26,8 @@
+ 
+ group = 'org.mockito'
+ description = 'Core API and implementation.'
+-sourceCompatibility = 1.5
+-targetCompatibility = 1.5
++sourceCompatibility = 1.7
++targetCompatibility = 1.7
+ 
+ configurations {
+     provided


=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@
 03-ignore-cobertura-plugin.patch
 04-gradle-compatibility.patch
 05-ignore-release-tasks.patch
+06-source-target-level.patch


=====================================
debian/rules
=====================================
@@ -4,7 +4,4 @@
 	dh $@ --buildsystem=gradle --with maven-repo-helper --with javahelper
 
 override_dh_auto_build:
-	dh_auto_build -- jar javadoc -PantCommand=/usr/bin/ant
-
-get-orig-source:
-	uscan --download-current-version --rename --repack --compression xz
+	dh_auto_build -- jar -PantCommand=/usr/bin/ant


=====================================
debian/watch
=====================================
@@ -1,5 +1,5 @@
 version=4
-opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/,\
+opts=repack,compression=xz,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/,\
 dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/ \
 https://github.com/mockito/mockito/tags \
 .*/archive/(?:upstream/)?(?:v||version-|release-|X|R|r)(\d\S*)\.tar\.gz



View it on GitLab: https://salsa.debian.org/java-team/mockito/compare/e32346fc4546ea87dc2f52a2a9c4210715a5a09b...5ad3f69a0d44ea351e7a6109fe081fd32173fc02

-- 
View it on GitLab: https://salsa.debian.org/java-team/mockito/compare/e32346fc4546ea87dc2f52a2a9c4210715a5a09b...5ad3f69a0d44ea351e7a6109fe081fd32173fc02
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/20181010/f7c5805c/attachment.html>
