[glassfish] 31/40: UNRELEASED (FTBFS: javax.management.j2ee.statistics.Stats missing) * Convert patches to dep3 format.
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Sep 24 16:00:30 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to annotated tag debian/1%3A2.1.1-b31-1
in repository glassfish.
commit b59a3b17b3823acafe9d305110c8a9a18489558b
Author: Torsten Werner <twerner at debian.org>
Date: Sun May 16 22:22:23 2010 +0000
UNRELEASED (FTBFS: javax.management.j2ee.statistics.Stats missing)
* Convert patches to dep3 format.
---
debian/changelog | 5 ++--
...pserv.diff => 0001-Fix-appserv-api-build.patch} | 18 ++++++++----
.../0002-Fix-glassfish.root-directory.patch | 24 ++++++++++++++++
debian/patches/0003-Disable-SQL-exceptions.patch | 33 ++++++++++++++++++++++
debian/patches/jstl.diff | 25 ----------------
debian/patches/properties.diff | 16 -----------
debian/patches/series | 7 ++---
7 files changed, 76 insertions(+), 52 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 37ab5d4..22fdc35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
glassfish (1:2.1.1-b31-1) unstable; urgency=low
- UNRELEASED
+ UNRELEASED (FTBFS: javax.management.j2ee.statistics.Stats missing)
* New upstream release
* Update debian/watch for release 2.1.1.
+ * Convert patches to dep3 format.
- -- Torsten Werner <twerner at debian.org> Mon, 17 May 2010 00:01:28 +0200
+ -- Torsten Werner <twerner at debian.org> Mon, 17 May 2010 00:18:36 +0200
glassfish (1:2ur2-b04-6) unstable; urgency=low
diff --git a/debian/patches/appserv.diff b/debian/patches/0001-Fix-appserv-api-build.patch
similarity index 53%
rename from debian/patches/appserv.diff
rename to debian/patches/0001-Fix-appserv-api-build.patch
index d1aed11..5956e4f 100644
--- a/debian/patches/appserv.diff
+++ b/debian/patches/0001-Fix-appserv-api-build.patch
@@ -1,8 +1,15 @@
-Description: Fix appserv-api build
-Index: glassfish-2ur2-b04/appserv-api/build.xml
-===================================================================
---- glassfish-2ur2-b04.orig/appserv-api/build.xml 2010-02-17 22:42:49.000000000 -0500
-+++ glassfish-2ur2-b04/appserv-api/build.xml 2010-02-17 22:44:55.000000000 -0500
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Mon, 17 May 2010 00:15:20 +0200
+Subject: [PATCH] Fix appserv-api build
+
+---
+ appserv-api/build.xml | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/appserv-api/build.xml b/appserv-api/build.xml
+index f798d26..0c7eaab 100644
+--- a/appserv-api/build.xml
++++ b/appserv-api/build.xml
@@ -86,9 +86,10 @@
source="${javac.source}"
deprecation="${javac.deprecation}"
@@ -16,3 +23,4 @@ Index: glassfish-2ur2-b04/appserv-api/build.xml
</javac>
</target>
+--
diff --git a/debian/patches/0002-Fix-glassfish.root-directory.patch b/debian/patches/0002-Fix-glassfish.root-directory.patch
new file mode 100644
index 0000000..3227266
--- /dev/null
+++ b/debian/patches/0002-Fix-glassfish.root-directory.patch
@@ -0,0 +1,24 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Mon, 17 May 2010 00:15:22 +0200
+Subject: [PATCH] Fix glassfish.root directory
+
+---
+ bootstrap/project.properties | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bootstrap/project.properties b/bootstrap/project.properties
+index a7e9d70..8fc4177 100644
+--- a/bootstrap/project.properties
++++ b/bootstrap/project.properties
+@@ -46,8 +46,8 @@ glassfish.cvsroot=:pserver:${glassfish.cvs.username}@cvs.dev.java.net:/cvs
+ glassfish.cvstag=SJSAS91_FCS_BRANCH
+ glassfish.cvs.project=glassfish
+ glassfish.cvs.module=bootstrap
+-glassfish.root=${basedir}/../..
+-glassfish.maven=${glassfish.root}/${glassfish.cvs.project}/${glassfish.cvs.module}
++glassfish.root=${basedir}/..
++glassfish.maven=${glassfish.root}/${glassfish.cvs.module}
+
+ # You MUST use absolute path
+ glassfish.home=${glassfish.root}/publish/glassfish
+--
diff --git a/debian/patches/0003-Disable-SQL-exceptions.patch b/debian/patches/0003-Disable-SQL-exceptions.patch
new file mode 100644
index 0000000..9aab747
--- /dev/null
+++ b/debian/patches/0003-Disable-SQL-exceptions.patch
@@ -0,0 +1,33 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Mon, 17 May 2010 00:15:23 +0200
+Subject: [PATCH] Disable SQL exceptions
+
+---
+ .../standard/tag/common/sql/DataSourceWrapper.java | 14 ++++++++++++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+diff --git a/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java b/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
+index 486276b..8fcb5ae 100644
+--- a/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
++++ b/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
+@@ -149,5 +149,19 @@ public class DataSourceWrapper implements DataSource {
+ throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
+ }
+
++ /**
++ * Always throws a SQLException. Not supported.
++ */
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
++ }
++
++ /**
++ * Always throws a SQLException. Not supported.
++ */
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
++ }
++
+
+ }
+--
diff --git a/debian/patches/jstl.diff b/debian/patches/jstl.diff
deleted file mode 100644
index ca50486..0000000
--- a/debian/patches/jstl.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Disable SQL exceptions.
-Index: glassfish-2ur2-b04/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
-===================================================================
---- glassfish-2ur2-b04.orig/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2007-05-05 22:17:53.000000000 -0400
-+++ glassfish-2ur2-b04/appserv-jstl/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java 2010-02-17 22:26:45.000000000 -0500
-@@ -133,5 +133,19 @@
- throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
- }
-
-+ /**
-+ * Always throws a SQLException. Not supported.
-+ */
-+ public <T> T unwrap(Class<T> iface) throws SQLException {
-+ throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
-+ }
-+
-+ /**
-+ * Always throws a SQLException. Not supported.
-+ */
-+ public boolean isWrapperFor(Class<?> iface) throws SQLException {
-+ throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
-+ }
-+
-
- }
diff --git a/debian/patches/properties.diff b/debian/patches/properties.diff
deleted file mode 100644
index 5fb4a13..0000000
--- a/debian/patches/properties.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix glassfish.root directory
-Index: glassfish-2ur2-b04/bootstrap/project.properties
-===================================================================
---- glassfish-2ur2-b04.orig/bootstrap/project.properties 2008-04-11 12:55:29.000000000 -0400
-+++ glassfish-2ur2-b04/bootstrap/project.properties 2010-02-17 22:26:38.000000000 -0500
-@@ -46,8 +46,8 @@
- glassfish.cvstag=SJSAS91_UR2_BRANCH
- glassfish.cvs.project=glassfish
- glassfish.cvs.module=bootstrap
--glassfish.root=${basedir}/../..
--glassfish.maven=${glassfish.root}/${glassfish.cvs.project}/${glassfish.cvs.module}
-+glassfish.root=${basedir}/..
-+glassfish.maven=${glassfish.root}/${glassfish.cvs.module}
-
- # You MUST use absolute path
- glassfish.home=${glassfish.root}/publish/glassfish
diff --git a/debian/patches/series b/debian/patches/series
index 96924ad..1983a47 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-appserv.diff
-properties.diff
-jstl.diff
-
+0001-Fix-appserv-api-build.patch
+0002-Fix-glassfish.root-directory.patch
+0003-Disable-SQL-exceptions.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/glassfish.git
More information about the pkg-java-commits
mailing list