[SCM] libjsr166y-java: Parallel computation framework for Java branch, master, updated. upstream/1.7.0-5-gbb3f750

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit 5fdaeba8bf7a3c9d84fe6755775aa56c85a37679
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Mon Oct 17 19:14:32 2011 -0430

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index 8f0e122..553b004 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libjsr166y-java (1.7.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Removed unnecessary patch 01_workaround_typing_bug.diff.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Mon, 17 Oct 2011 20:25:37 -0430
+
 libjsr166y-java (0.1.20080107-2) unstable; urgency=medium
 
   [ Miguel Landaeta ]
diff --git a/debian/orig-tar.excludes b/debian/orig-tar.excludes
new file mode 100644
index 0000000..e7bea9e
--- /dev/null
+++ b/debian/orig-tar.excludes
@@ -0,0 +1,10 @@
+build.xml
+lib
+user.properties.sample
+.cvsignore
+src/extra166y
+src/jsr166x
+src/loops
+src/main
+src/test
+version.properties
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index a3ec3f0..88094e8 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -6,11 +6,14 @@ version=`dpkg-parsechangelog | grep '^Version:' | cut -f 2 -d ' ' | sed 's/-[^-]
 echo "version ${version}"
 package=`dpkg-parsechangelog | sed -n 's/^Source: //p'`
 tarball="${package}_${version}.orig.tar.gz"
-dir="${package}-${version}.orig"
-repo="http://svn.codehaus.org/coconut/forkjoin/trunk/jsr166y/"
-revision=`echo $version | sed -e 's/^0\.1\.//' -e 's/$/T1800/'`
+DIR=jsr166
+REMOTE=':pserver:anonymous at gee.cs.oswego.edu/home/jsr166/jsr166'
+TAG='release-1_7_0'
 
-LC_ALL=C TZ=UTC svn export --revision {$revision} "${repo}" "${dir}"
-GZIP=--best tar --numeric --group 0 --owner 0 -c -v -z -f "${tarball}" "${dir}"
+#LC_ALL=C TZ=UTC cvs -d $REMOTE login
+LC_ALL=C TZ=UTC cvs -d $REMOTE export -r $TAG jsr166
 
-rm -rf "${dir}"
+GZIP=--best tar --numeric --group 0 --owner 0 -X debian/orig-tar.excludes \
+    -c -v -z -f "${tarball}" $DIR
+
+rm -rf $DIR
diff --git a/debian/patches/01_workaround_typing_bug.diff b/debian/patches/01_workaround_typing_bug.diff
deleted file mode 100644
index 35febd4..0000000
--- a/debian/patches/01_workaround_typing_bug.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Workaround for a solved typing bug in IcedTea javac compiler
- For a long time the javac had a bug with the handling of wildcard types
- that results in a hole in the type system. Since IcedTea 1.8.2 the bug is
- solved but it broke some code in this package. For more info, please
- visit: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6638712
-Author: Miguel Landaeta <miguel at miguel.cc>
-Bug-Debian: http://bugs.debian.org/602362
-Forwarded: not-needed
-Last-Update: 2010-11-13
-
---- libjsr166y-java-0.1.20080107.orig/src/main/java/jsr166y/forkjoin/ParallelArray.java
-+++ libjsr166y-java-0.1.20080107/src/main/java/jsr166y/forkjoin/ParallelArray.java
-@@ -1654,13 +1654,13 @@ public class ParallelArray<T> implements
-         public WithFilter<T> withFilter(Predicate<? super T> selector) {
-             return new WithBoundedFilter<T>
-                 (pa, firstIndex, upperBound,
--                 Ops.andPredicate(this.selector, selector));
-+                 Ops.andPredicate((Predicate)this.selector, selector));
-         }
- 
-         public WithFilter<T> orFilter(Predicate<? super T> selector) {
-             return new WithBoundedFilter<T>
-                 (pa, firstIndex, upperBound,
--                 Ops.orPredicate(this.selector, selector));
-+                 Ops.orPredicate((Predicate)this.selector, selector));
-         }
- 
-         public <U> WithMapping<T, U> withMapping
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ce40890..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_workaround_typing_bug.diff

-- 
libjsr166y-java: Parallel computation framework for Java