[sezpoz] 02/08: Removed the patches (fixed upstream)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Apr 2 16:13:15 UTC 2015


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

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

commit 83e499da86b250b95543f92457d75bffb057d6a0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Apr 2 16:36:37 2015 +0200

    Removed the patches (fixed upstream)
---
 debian/changelog                      |  5 ++++-
 debian/patches/build.patch            | 18 ------------------
 debian/patches/fix-java7-compat.patch | 21 ---------------------
 debian/patches/series                 |  2 --
 4 files changed, 4 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 56f29f2..4c58aaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
-sezpoz (1.9-3) UNRELEASED; urgency=medium
+sezpoz (1.10-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Fixes the Java 8 compatibility (Closes: #750745)
+    - Removed the Java 7 compatibility patch (fixed upstream)
   * debian/control:
     - Standards-Version updated to 3.9.6 (no changes)
     - Removed the deprecated DM-Upload-Allowed field
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
deleted file mode 100644
index 09ecf9a..0000000
--- a/debian/patches/build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Disable performance testing and demo elements
- of build process as not required for packaging and pull extra 
- depends.
-Author: James Page <james.page at canonical.com>
-Forwarded: not-needed
-
-Index: sezpoz/pom.xml
-===================================================================
---- sezpoz.orig/pom.xml	2011-03-17 13:18:17.000000000 +0000
-+++ sezpoz/pom.xml	2011-06-03 13:13:44.102717856 +0100
-@@ -105,7 +105,5 @@
-     </reporting>
-     <modules>
-         <module>sezpoz</module>
--        <!--<module>perftest</module>-->
--        <module>demo</module>
-     </modules>
- </project>
diff --git a/debian/patches/fix-java7-compat.patch b/debian/patches/fix-java7-compat.patch
deleted file mode 100644
index 96f2698..0000000
--- a/debian/patches/fix-java7-compat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix compilation error on JDK 7u1.
- (${java.vendor} is now "Oracle Corporation".)
-Author: jglick
-Origin: http://java.net/projects/sezpoz/sources/svn/revision/156
-
---- a/sezpoz/pom.xml (revision 155)
-+++ b/sezpoz/pom.xml (revision 156)
-@@ -14,10 +14,9 @@
-         <profile>
-             <id>default-tools.jar</id>
-             <activation>
--                <property>
--                    <name>java.vendor</name>
--                    <value>Sun Microsystems Inc.</value>
--                </property>
-+                <file>
-+                    <exists>${java.home}/../lib/tools.jar</exists>
-+                </file>
-             </activation>
-             <dependencies>
-                 <dependency>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 185b715..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-build.patch
-fix-java7-compat.patch

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



More information about the pkg-java-commits mailing list