Author: varun Date: 2008-12-06 23:05:08 +0000 (Sat, 06 Dec 2008) New Revision: 7550
Added: trunk/libdb-je-java/debian/patches/ trunk/libdb-je-java/debian/patches/RawObject.diff trunk/libdb-je-java/debian/patches/series trunk/libdb-je-java/debian/watch Modified: trunk/libdb-je-java/debian/changelog trunk/libdb-je-java/debian/control trunk/libdb-je-java/debian/rules Log: Add patches/RawObject.diff, thanks to Andreas Jonsson (Closes: #506441) Modified: trunk/libdb-je-java/debian/changelog =================================================================== --- trunk/libdb-je-java/debian/changelog 2008-12-06 23:01:31 UTC (rev 7549) +++ trunk/libdb-je-java/debian/changelog 2008-12-06 23:05:08 UTC (rev 7550) @@ -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 <[EMAIL PROTECTED]> Sat, 06 Dec 2008 17:47:11 -0500 + libdb-je-java (3.3.62-1) unstable; urgency=low * new upstream release Modified: trunk/libdb-je-java/debian/control =================================================================== --- trunk/libdb-je-java/debian/control 2008-12-06 23:01:31 UTC (rev 7549) +++ trunk/libdb-je-java/debian/control 2008-12-06 23:05:08 UTC (rev 7550) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]> Uploaders: Varun Hiremath <[EMAIL PROTECTED]>, Torsten Werner <[EMAIL PROTECTED]> -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 Added: trunk/libdb-je-java/debian/patches/RawObject.diff =================================================================== --- trunk/libdb-je-java/debian/patches/RawObject.diff (rev 0) +++ trunk/libdb-je-java/debian/patches/RawObject.diff 2008-12-06 23:05:08 UTC (rev 7550) @@ -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; Added: trunk/libdb-je-java/debian/patches/series =================================================================== --- trunk/libdb-je-java/debian/patches/series (rev 0) +++ trunk/libdb-je-java/debian/patches/series 2008-12-06 23:05:08 UTC (rev 7550) @@ -0,0 +1 @@ +RawObject.diff Modified: trunk/libdb-je-java/debian/rules =================================================================== --- trunk/libdb-je-java/debian/rules 2008-12-06 23:01:31 UTC (rev 7549) +++ trunk/libdb-je-java/debian/rules 2008-12-06 23:05:08 UTC (rev 7550) @@ -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 -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) Added: trunk/libdb-je-java/debian/watch =================================================================== --- trunk/libdb-je-java/debian/watch (rev 0) +++ trunk/libdb-je-java/debian/watch 2008-12-06 23:05:08 UTC (rev 7550) @@ -0,0 +1,2 @@ +version=3 +http://download.oracle.com/berkeley-db/je-(.*).tar.gz _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
