[libparanamer-java] 01/01: Merge branch 'master' of http://anonscm.debian.org/cgit/pkg-java/libparanamer-java

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository libparanamer-java.

commit 982b0fe556a964df43ae72a6dc5c7c1e31902c0d
Merge: f11186d ea264e8
Author: Markus Koschany <apo at debian.org>
Date:   Tue Jan 26 15:47:21 2016 +0100

    Merge branch 'master' of http://anonscm.debian.org/cgit/pkg-java/libparanamer-java

 debian/changelog   | 8 ++++++++
 debian/maven.rules | 1 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 0a25797,e9ac3a0..d4afd00
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,11 +1,37 @@@
 +libparanamer-java (2.8-1) unstable; urgency=medium
 +
 +  * Imported Upstream version 2.8. (Closes: #798670)
 +    - Switch to libasm4-java. (Closes: #800869)
 +    - Switch from libqdox-java to libqdox2-java.
 +    - Use Build-Depends field because this package only builds for arch:all.
 +  * Vcs-fields: Switch to https.
 +  * Update debian/watch. Watch github repository.
 +  * Add Files-Excluded paragraph and remove javadoc files and one js file
 +    which appears to be not the preferred form of modification.
 +  * Change copyright of debian directory to BSD-3-clause.
 +  * Remove orig-tar.sh script.
 +  * Update maven.rules and maven.ignoreRules for new release.
 +  * Add paranamer-maven-plugin to maven.rules to create an unversioned debian
 +    jar file. This should prevent the FTBFS due to the missing artifact. For
 +    now paranamer-maven-plugin must be ignored in maven.ignoreRules until the
 +    new version enters the archive.
 +  * Drop test patches and skip all tests for now until OpenJDK 8 is the new
 +    default JDK.
 +  * Build with --parallel.
 +  * Set sourceEncoding to UTF-8.
 +  * Update my e-mail address.
 +  * Remove Lintian override.
 +
 + -- Markus Koschany <apo at debian.org>  Tue, 26 Jan 2016 15:40:59 +0100
 +
+ libparanamer-java (2.7+repack-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Depend on libmaven3-core-java instead of libmaven2-core-java
+   * Build with the DH sequencer instead of CDBS
+ 
+  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 13 Nov 2015 22:29:01 +0100
+ 
  libparanamer-java (2.7+repack-1) unstable; urgency=medium
  
    * Team upload.
diff --cc debian/maven.rules
index 5ca1880,d33d612..b136a76
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@@ -1,6 -1,6 +1,5 @@@
 -
 -junit junit jar s/3\..*/3.x/ * *
  junit junit jar s/4\..*/4.x/ * *
 -asm asm * s/3\..*/3.x/ * *
 +org.ow2.asm asm * s/.*/4.x/ * *
  org.mockito s/mockito-all/mockito-core/ * s/.*/debian/ * *
 -org.apache.maven maven-plugin-api * s/.*/3.x/ * *
 +com.thoughtworks.qdox qdox * s/.*/2.x/ * *
 +com.thoughtworks.paranamer paranamer-maven-plugin * s/.*/debian/ * *
- 

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