[SCM] packaging libhibernate3-java branch, master, updated. debian/3.6.8.Final-1

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit ebfbcdedbc8a8cc3f5f2ec043b317845aba17e48
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Sun Nov 27 19:26:03 2011 -0430

    Release

diff --git a/debian/changelog b/debian/changelog
index 3ada1c1..e8e9473 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libhibernate3-java (3.6.8.Final-1) unstable; urgency=low
+
+  * New upstream release.
+  * Remove 0004-strict-type-inference-with-generics-code patch.
+    It was merged upstream.
+  * Remove debian/source/local-options.
+    abort-on-upstream-changes option is now default in dpkg-source.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Sun, 27 Nov 2011 17:44:57 -0430
+
 libhibernate3-java (3.6.7.Final-1) unstable; urgency=low
 
   * Team Upload.
diff --git a/debian/patches/0004-strict-type-inference-with-generics-code.patch b/debian/patches/0004-strict-type-inference-with-generics-code.patch
deleted file mode 100644
index ce3485e..0000000
--- a/debian/patches/0004-strict-type-inference-with-generics-code.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description:
-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractPathImpl.java:[194,39]
-invalid inferred types for M; inferred type does not conform to declared bound(s)
-inferred: java.util.Map<K,V>
-bound(s): java.util.Map<capture#829 of ?,capture#332 of ?>
-
-I suspect this failure is because IcedTea 1.8.2 got more
-strict with type inference and generics code. I say this
-since I can rebuild this package without problems with
-1.8.1. Thus, this FTBFS is present in sid and squeeze.
-
-This bug seems to be very similar to #602362.
-The problematic code involves the usage of Java generics and
-since I'm not very experienced with that kind of code I'm
-asking for help.
-
-Bug: http://bugs.debian.org/606295
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-12-28
-Forwarded: yes
---- a/project/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractPathImpl.java
-+++ b/project/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractPathImpl.java
-@@ -191,10 +191,10 @@
- 		if ( attribute.isCollection() ) {
- 			final PluralAttribute<X,Y,?> pluralAttribute = (PluralAttribute<X,Y,?>) attribute;
- 			if ( PluralAttribute.CollectionType.MAP.equals( pluralAttribute.getCollectionType() ) ) {
--				return (PluralAttributePath<Y>) get( (MapAttribute<X,?,?>) pluralAttribute );
-+				return (PluralAttributePath<Y>) this.<Object,Object,Map<Object, Object>>get( (MapAttribute) pluralAttribute );
- 			}
- 			else {
--				return (PluralAttributePath<Y>) get( (PluralAttribute) pluralAttribute );
-+				return (PluralAttributePath<Y>) this.get( (PluralAttribute) pluralAttribute );
- 			}
- 		}
- 		else {
diff --git a/debian/patches/series b/debian/patches/series
index 92bbaa2..c3802f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-disable-modules-that-do-not-build-yet.patch
 0002-disable-tests-for-entitymanager.patch
 0003-fix-up-jdbc4-testing.patch
-0004-strict-type-inference-with-generics-code.patch
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index f74dd46..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,3 +0,0 @@
-# Can't unapply-patches because of mh_patchpom call on pom.xml
-#unapply-patches
-abort-on-upstream-changes

-- 
packaging libhibernate3-java