[serp] 05/09: Removed compile-java-1.6.diff (applied upstream)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository serp.

commit ae35cf8e11b102b8e82d04fe77f275c26c91966d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri May 29 17:21:48 2015 +0200

    Removed compile-java-1.6.diff (applied upstream)
---
 debian/changelog                     |  4 +++-
 debian/patches/compile-java-1.6.diff | 15 ---------------
 debian/patches/series                |  1 -
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8977e5a..907e821 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-serp (1.14.1-3) UNRELEASED; urgency=medium
+serp (1.15.1-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Removed compile-java-1.6.diff (applied upstream)
   * Standards-Version updated to 3.9.6 (no changes)
   * Use XZ compression for the upstream tarball
   * Switch to debhelper level 9
diff --git a/debian/patches/compile-java-1.6.diff b/debian/patches/compile-java-1.6.diff
deleted file mode 100644
index d278feb..0000000
--- a/debian/patches/compile-java-1.6.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-# Change the source and target level from 1.3 to 1.6 to create
-# Java 6 compatible bytecode
---- a/pom.xml
-+++ b/pom.xml
-@@ -85,8 +85,8 @@
-       <plugin>
-         <artifactId>maven-compiler-plugin</artifactId>
-         <configuration>
--          <source>1.3</source>
--          <target>1.3</target>
-+          <source>1.6</source>
-+          <target>1.6</target>
-         </configuration>
-       </plugin>
-       <plugin>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 10b4254..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-compile-java-1.6.diff

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