[sisu-guice] 02/02: Prepare for upload to sid

[Eugene Zhukov]

This is an automated email from the git hooks/post-receive script.

eugene pushed a commit to branch master
in repository sisu-guice.

commit 471444a330ab499330fac77ee70d688bed6f9168
Author: Eugene Zhukov <eugene at debian.org>
Date:   Thu Apr 19 10:22:32 2018 +0000

    Prepare for upload to sid
    
      * Ignore testlib extension
      * Remove obsolete maven2 patch
      * Update uploaders (Closes: #889392)
      * Standards-Version updated to 4.1.4 (get-orig-source rules target removed)
      * Switch to debhelper level 11
---
 debian/changelog                 | 11 +++++++++++
 debian/control                   |  8 +++-----
 debian/libsisu-guice-java.poms   |  1 +
 debian/maven.ignoreRules         |  1 +
 debian/patches/allow_maven2.diff | 16 ----------------
 debian/patches/series            |  1 -
 debian/rules                     |  2 --
 7 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 966a6b9..e161eb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+sisu-guice (4.2.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * Ignore testlib extension
+  * Remove obsolete maven2 patch
+  * Update uploaders (Closes: #889392)
+  * Standards-Version updated to 4.1.4 (get-orig-source rules target removed)
+  * Switch to debhelper level 11
+
+ -- Eugene Zhukov <eugene at debian.org>  Wed, 18 Apr 2018 14:07:34 +0000
+
 sisu-guice (3.2.6-4) unstable; urgency=medium
 
   * Removed the unused dependency on glassfish-javaee
diff --git a/debian/control b/debian/control
index b34a788..04099c3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,9 @@ Source: sisu-guice
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders:
- Damien Raude-Morvan <drazzib at debian.org>,
- Eugene Zhukov <jevgeni.zh at gmail.com>
+Uploaders: Eugene Zhukov <eugene at debian.org>
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11),
  default-jdk,
  junit4,
  libaopalliance-java,
@@ -21,7 +19,7 @@ Build-Depends:
  libmunge-maven-plugin-java,
  libservlet3.1-java,
  maven-debian-helper (>= 1.4)
-Standards-Version: 4.1.1
+Standards-Version: 4.1.4
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/sisu-guice.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/sisu-guice.git
 Homepage: https://github.com/sonatype/sisu-guice
diff --git a/debian/libsisu-guice-java.poms b/debian/libsisu-guice-java.poms
index bce0a88..daf83f3 100644
--- a/debian/libsisu-guice-java.poms
+++ b/debian/libsisu-guice-java.poms
@@ -38,5 +38,6 @@ extensions/servlet/pom.xml --ignore
 extensions/spring/pom.xml --ignore
 extensions/struts2/pom.xml --ignore
 extensions/throwingproviders/pom.xml --ignore
+extensions/testlib/pom.xml --ignore
 extensions/dagger-adapter/pom.xml --ignore
 jdk8-tests/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 6798b4b..1bf433b 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -2,6 +2,7 @@
 org.sonatype.sisu sisu-guice jar * tests test
 biz.aQute bnd * * * *
 com.google.guava guava-testlib * * * *
+com.google.truth truth * * * *
 javax.inject javax.inject-tck * * * *
 org.apache.felix org.apache.felix.framework * * * *
 org.apache.maven.plugins maven-remote-resources-plugin * * * *
diff --git a/debian/patches/allow_maven2.diff b/debian/patches/allow_maven2.diff
deleted file mode 100644
index 1ad8ed6..0000000
--- a/debian/patches/allow_maven2.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Allow building with maven 2
-
---- sisu-guice-3.2.5.orig/pom.xml
-+++ sisu-guice-3.2.5/pom.xml
-@@ -92,9 +92,9 @@ See the Apache License Version 2.0 for t
-     <!-- jdk8-tests module activated only when running under JDK8, below -->
-   </modules>
- 
--  <prerequisites>
-+  <!--prerequisites>
-     <maven>3.0</maven>
--  </prerequisites>
-+  </prerequisites-->
- 
-   <properties>
-     <!--
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d652b17..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-allow_maven2.diff
diff --git a/debian/rules b/debian/rules
index 3d6e6be..b838f4e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,5 +10,3 @@ CGLIB_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libcglib-java
 override_dh_gencontrol:
 	dh_gencontrol -- -Vasm:Version=${ASM_VERSION} -Vcglib:Version=${CGLIB_VERSION}
 
-get-orig-source:
-	uscan --download-current-version --force-download --rename --verbose

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-guice.git