[osmosis] 08/11: Drop 06-java-7.patch, applied upstream.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri May 27 16:15:31 UTC 2016


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

sebastic pushed a commit to branch master
in repository osmosis.

commit 75b6350ddfaab164e3fdc51593e8e2fad33484ab
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri May 27 17:30:49 2016 +0200

    Drop 06-java-7.patch, applied upstream.
---
 debian/changelog               |  1 +
 debian/patches/06-java-7.patch | 15 ---------------
 debian/patches/series          |  1 -
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 859d95f..7eb7933 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ osmosis (0.45-1) UNRELEASED; urgency=medium
   * Update Vcs-Git URL to use HTTPS.
   * Update watch file to handle more tag conventions.
   * Bump Standards-Version to 3.9.8, no changes.
+  * Drop 06-java-7.patch, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 27 May 2016 17:23:03 +0200
 
diff --git a/debian/patches/06-java-7.patch b/debian/patches/06-java-7.patch
deleted file mode 100644
index 349ab52..0000000
--- a/debian/patches/06-java-7.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Bump source compatibility from 1.6 to 1.7.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: not-needed
-
---- a/build.gradle
-+++ b/build.gradle
-@@ -40,7 +40,7 @@ configure(javaProjects) {
- 	apply plugin: 'maven'
- 	apply plugin: 'signing'
- 
--	sourceCompatibility = 1.6
-+	sourceCompatibility = 1.7
- 
- 	test {
- 		/*
diff --git a/debian/patches/series b/debian/patches/series
index c3b51ec..9fb14cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01-fix_launcher.patch
 02-fix_plexus.patch
 04-osmosis-version.patch
-06-java-7.patch

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



More information about the Pkg-grass-devel mailing list