[libdb-je-java] 08/22: Add patches/RawObject.diff, thanks to Andreas Jonsson (Closes: #506441)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libdb-je-java.

commit 9807738fa05b23fd4ce0f8214f33d1e7b9cc7649
Author: Varun Hiremath <varun at debian.org>
Date:   Sat Dec 6 23:05:08 2008 +0000

    Add patches/RawObject.diff, thanks to Andreas Jonsson (Closes: #506441)
---
 debian/changelog              |  6 ++++++
 debian/control                |  2 +-
 debian/patches/RawObject.diff | 28 ++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 debian/rules                  |  5 +++++
 debian/watch                  |  2 ++
 6 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8a0c3d7..96ab2ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdb-je-java (3.3.62-2) unstable; urgency=low
+
+  * Add patches/RawObject.diff, thanks to Andreas Jonsson (Closes: #506441)
+
+ -- Varun Hiremath <varun at debian.org>  Sat, 06 Dec 2008 17:47:11 -0500
+
 libdb-je-java (3.3.62-1) unstable; urgency=low
 
   * new upstream release
diff --git a/debian/control b/debian/control
index f50f87d..8b35bd9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs, debhelper (>= 5)
+Build-Depends: cdbs, debhelper (>= 5), quilt
 Build-Depends-Indep: ant, java-gcj-compat-dev, glassfish-javaee
 Standards-Version: 3.8.0
 Homepage: http://www.oracle.com/database/berkeley-db/je/index.html
diff --git a/debian/patches/RawObject.diff b/debian/patches/RawObject.diff
new file mode 100644
index 0000000..58ced90
--- /dev/null
+++ b/debian/patches/RawObject.diff
@@ -0,0 +1,28 @@
+Index: libdb-je-java-3.3.62/src/com/sleepycat/persist/raw/RawObject.java
+===================================================================
+--- libdb-je-java-3.3.62.orig/src/com/sleepycat/persist/raw/RawObject.java	2008-12-06 17:17:37.000000000 -0500
++++ libdb-je-java-3.3.62/src/com/sleepycat/persist/raw/RawObject.java	2008-12-06 17:19:16.000000000 -0500
+@@ -10,6 +10,7 @@
+ 
+ import java.util.Arrays;
+ import java.util.Map;
++import java.util.HashMap;
+ import java.util.TreeSet;
+ 
+ import com.sleepycat.persist.evolve.Conversion;
+@@ -58,9 +59,12 @@
+     public RawObject(RawType type,
+                      Map<String,Object> values,
+                      RawObject superObject) {
+-        if (type == null || values == null) {
+-            throw new NullPointerException();
+-        }
++	if (type == null) {
++	    throw new NullPointerException();
++	}
++	if (values == null) {
++	    values = new HashMap<String,Object>();
++	}
+         this.type = type;
+         this.values = values;
+         this.superObject = superObject;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6676cc8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+RawObject.diff
diff --git a/debian/rules b/debian/rules
index ff0b71d..b514c05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 JAVA_HOME 		:= /usr/lib/jvm/java-gcj
 DEB_ANT_BUILD_TARGET	:= jar
@@ -12,5 +13,9 @@ install/libdb-je-java::
 	install -m 644 -D db-je.jar $(DEB_DESTDIR)/usr/share/java/db-je-$(DEB_UPSTREAM_VERSION).jar
 	dh_link /usr/share/java/db-je-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/db-je.jar
 
+binary-predeb/libdb-je-java::
+	# remove empty directories
+	find  $(DEB_DESTDIR) -type 'd' -empty -delete
+
 get-orig-source:
 	sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..aa855f3
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://download.oracle.com/berkeley-db/je-(.*).tar.gz

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