[SCM] libjsr166y-java: Parallel computation framework for Java branch, master, updated. debian/0.1.20080107-2-17-gafe7ec9

Miguel Landaeta miguel at miguel.cc
Thu Oct 20 18:50:56 UTC 2011


The following commit has been merged in the master branch:
commit d6bfd9f18c10f526f8055437f4b80aa1bdbf60e6
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Tue Oct 18 20:39:07 2011 -0430

    Add extra166y jar

diff --git a/debian/00TODO b/debian/00TODO
new file mode 100644
index 0000000..d2ae8a1
--- /dev/null
+++ b/debian/00TODO
@@ -0,0 +1,2 @@
+document gpl code in copyright file
+new -doc package
diff --git a/debian/changelog b/debian/changelog
index ecc5f04..3d2bd3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,14 @@
-libjsr166y-java (1.7.0-1) UNRELEASED; urgency=low
+libjsr166y-java (1.7.0-1~miguel1) unstable; urgency=low
 
   * New upstream release.
-  * Removed unnecessary patch 01_workaround_typing_bug.diff.
+  * Refresh patch 01_workaround_typing_bug.diff.
   * Bump Standards-Version to 3.9.2. No changes were required.
   * Update Homepage field.
   * Make copyright file DEP-5 compliant.
-  * Provide POM file with org.codehaus.jsr166-mirror as group ID.
+  * Provide POM files with org.codehaus.jsr166-mirror as group ID.
+  * Add extra166y jar.
 
- -- Miguel Landaeta <miguel at miguel.cc>  Mon, 17 Oct 2011 20:25:37 -0430
+ -- Miguel Landaeta <miguel at miguel.cc>  Tue, 18 Oct 2011 19:08:31 -0430
 
 libjsr166y-java (0.1.20080107-2) unstable; urgency=medium
 
diff --git a/debian/clean b/debian/clean
index 15eb8ee..60a61f5 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1,2 @@
 jsr166y.jar
+extra166y.jar
diff --git a/debian/pom.xml b/debian/extra166y.pom
similarity index 61%
copy from debian/pom.xml
copy to debian/extra166y.pom
index f05fd31..5429ac3 100644
--- a/debian/pom.xml
+++ b/debian/extra166y.pom
@@ -3,6 +3,14 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.codehaus.jsr166-mirror</groupId>
-  <artifactId>jsr166y</artifactId>
+  <artifactId>extra166y</artifactId>
   <version>1.7.0</version>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/debian/javadoc b/debian/javadoc
deleted file mode 100644
index b7f8926..0000000
--- a/debian/javadoc
+++ /dev/null
@@ -1 +0,0 @@
-internal  /usr/share/doc/libjsr166y-java/api
diff --git a/debian/pom.xml b/debian/jsr166y.pom
similarity index 100%
rename from debian/pom.xml
rename to debian/jsr166y.pom
diff --git a/debian/libjsr166y-java.poms b/debian/libjsr166y-java.poms
index 1a7e280..9dc0313 100644
--- a/debian/libjsr166y-java.poms
+++ b/debian/libjsr166y-java.poms
@@ -1 +1,2 @@
-debian/pom.xml
+debian/jsr166y.pom
+debian/extra166y.pom
diff --git a/debian/orig-tar.excludes b/debian/orig-tar.excludes
index e7bea9e..89e8a20 100644
--- a/debian/orig-tar.excludes
+++ b/debian/orig-tar.excludes
@@ -2,9 +2,4 @@ build.xml
 lib
 user.properties.sample
 .cvsignore
-src/extra166y
-src/jsr166x
-src/loops
-src/main
-src/test
 version.properties
diff --git a/debian/patches/01_workaround_typing_bug.diff b/debian/patches/01_workaround_typing_bug.diff
new file mode 100644
index 0000000..fae293f
--- /dev/null
+++ b/debian/patches/01_workaround_typing_bug.diff
@@ -0,0 +1,38 @@
+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: 2011-10-18
+
+--- libjsr166y-java-1.7.0.orig/src/extra166y/AbstractParallelAnyArray.java
++++ libjsr166y-java-1.7.0/src/extra166y/AbstractParallelAnyArray.java
+@@ -1166,7 +1166,7 @@ public abstract class AbstractParallelAn
+             (IntAndObjectPredicate<? super T> selector) {
+             return new ORPap<T>
+                 (ex, origin, fence, array,
+-                 compoundIndexedSelector(this.selector, selector));
++                 compoundIndexedSelector((IntAndObjectPredicate)this.selector, selector));
+         }
+ 
+         public <U> ParallelArrayWithMapping<T, U> withMapping
+@@ -1700,14 +1700,14 @@ public abstract class AbstractParallelAn
+             (Predicate<? super T> selector) {
+             return new ORPap<T>
+                 (ex, origin, fence, array,
+-                 compoundIndexedSelector(this.selector, selector));
++                 compoundIndexedSelector((IntAndObjectPredicate)this.selector, selector));
+         }
+ 
+         public ParallelArrayWithFilter<T> withIndexedFilter
+             (IntAndObjectPredicate<? super T> selector) {
+             return new ORPap<T>
+                 (ex, origin, fence, array,
+-                 compoundIndexedSelector(this.selector, selector));
++                 compoundIndexedSelector((IntAndObjectPredicate)this.selector, selector));
+         }
+ 
+         public <U> ParallelArrayWithMapping<T, U> withMapping
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ce40890
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_workaround_typing_bug.diff
diff --git a/debian/rules b/debian/rules
index 161f852..634c3b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,15 +6,26 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 	dh $@ --with javahelper
 
 override_jh_build:
-	jh_build jsr166y.jar src
+	jh_build jsr166y.jar src/jsr166y
+	mkdir -p javadoc/jsr166y javadoc/extra166y
+	cp -a debian/_jh_build.javadoc/api javadoc/jsr166y
+	jh_build -o"-classpath jsr166y.jar" extra166y.jar src/extra166y
+	cp -a debian/_jh_build.javadoc/api javadoc/extra166y
+	rm -rf javadoc/extra166y/api/jsr166y
 
 override_jh_installlibs:
 	mh_installpoms -plibjsr166y-java
-	mh_installjar -plibjsr166y-java -l debian/pom.xml jsr166y.jar
+	mh_installjar -plibjsr166y-java -l debian/jsr166y.pom jsr166y.jar
+	mh_installjar -plibjsr166y-java -l debian/extra166y.pom extra166y.jar
+
+override_jh_installjavadoc:
+	jh_installjavadoc javadoc/jsr166y usr/share/doc/libjsr166y-java/jsr166y
+	jh_installjavadoc javadoc/extra166y usr/share/doc/libjsr166y-java/extra166y
 
 override_dh_auto_clean:
 	dh_auto_clean
 	mh_clean
+	rm -rf javadoc
 
 get-orig-source:
 	# uscan was not used because upstream doesn't provide an

-- 
libjsr166y-java: Parallel computation framework for Java



More information about the pkg-java-commits mailing list