diff options
| author | Emmanuel Bourg <ebourg@apache.org> | 2023-09-29 10:35:25 +0200 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2023-09-29 16:30:43 +0000 |
| commit | 232e7e63ef16e2838f38b2528f255608a73776ea (patch) | |
| tree | 6a203edb4db50a952b1b38fa605b690953a55e17 | |
| parent | dba9b0a6c52689d092043fc3b879621eb87062b2 (diff) | |
0.98.4-7 (patches unapplied)HEADimport/0.98.4-7ubuntu/stonking-develubuntu/stonkingubuntu/resolute-develubuntu/resoluteubuntu/questing-develubuntu/questingubuntu/plucky-develubuntu/pluckyubuntu/oracular-develubuntu/oracularubuntu/noble-proposedubuntu/noble-develubuntu/nobleubuntu/develdebian/sid
Imported using git-ubuntu import.
Notes
Notes:
* Team upload.
* Fixed the build failure with Java 21 (Closes: #1053048)
* No longer generate the javadoc (Closes: #1048009)
* Build with the DH sequencer instead of CDBS
* Standards-Version updated to 4.6.2
* Switch to debhelper level 13
| -rw-r--r-- | debian/ant.properties | 1 | ||||
| -rw-r--r-- | debian/build.xml | 14 | ||||
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 19 | ||||
| -rw-r--r-- | debian/doc-base | 9 | ||||
| -rw-r--r-- | debian/docs | 1 | ||||
| -rw-r--r-- | debian/libcobra-java.jlibs | 1 | ||||
| -rw-r--r-- | debian/patches/02-java8-compatibility.patch | 107 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 19 |
11 files changed, 145 insertions, 39 deletions
diff --git a/debian/ant.properties b/debian/ant.properties index 3a46c7a..103d5e4 100644 --- a/debian/ant.properties +++ b/debian/ant.properties @@ -1,4 +1,3 @@ class.dir=build source.dir=src -doc.dir=doc/api jar.name=cobra.jar diff --git a/debian/build.xml b/debian/build.xml index 1f5fab2..4641155 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - <project default="jar" name="cobra" basedir=".."> <property file="build.properties"/> @@ -11,13 +10,12 @@ <target name="compile" description="Compile the sources"> <mkdir dir="${class.dir}"/> <javac srcdir="${source.dir}" destdir="${class.dir}" - deprecation="true" debug="true" optimize="false"/> - </target> - - <target name="javadoc" description="Creates Javadoc documentation"> - <mkdir dir="${doc.dir}"/> - <javadoc packagenames="*" - sourcepath="${source.dir}" destdir="${doc.dir}"/> + source="8" target="8" + deprecation="true" debug="true" optimize="false"> + <classpath> + <pathelement location="/usr/share/java/js.jar"/> + </classpath> + </javac> </target> <target name="jar" description="Create the jar" depends="compile"> diff --git a/debian/changelog b/debian/changelog index 54da75f..8f329f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libcobra-java (0.98.4-7) unstable; urgency=medium + + * Team upload. + * Fixed the build failure with Java 21 (Closes: #1053048) + * No longer generate the javadoc (Closes: #1048009) + * Build with the DH sequencer instead of CDBS + * Standards-Version updated to 4.6.2 + * Switch to debhelper level 13 + + -- Emmanuel Bourg <ebourg@apache.org> Fri, 29 Sep 2023 10:35:25 +0200 + libcobra-java (0.98.4-6) unstable; urgency=medium * Team upload. diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control index 72606c3..ebdb1b1 100644 --- a/debian/control +++ b/debian/control @@ -2,17 +2,24 @@ Source: libcobra-java Section: java Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Uploaders: Varun Hiremath <varun@debian.org>, Torsten Werner <twerner@debian.org> -Build-Depends: cdbs, debhelper (>= 9) -Build-Depends-Indep: ant, rhino, libxalan2-java, default-jdk -Standards-Version: 3.9.4 -Homepage: http://lobobrowser.org/cobra.jsp +Uploaders: + Varun Hiremath <varun@debian.org>, + Torsten Werner <twerner@debian.org> +Build-Depends: + ant, + debhelper-compat (= 13), + default-jdk, + javahelper, + libxalan2-java, + rhino +Standards-Version: 4.6.2 Vcs-Git: https://salsa.debian.org/java-team/libcobra-java.git Vcs-Browser: https://salsa.debian.org/java-team/libcobra-java +Homepage: http://lobobrowser.org/cobra.jsp Package: libcobra-java Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends} Description: Java HTML Renderer & Parser Cobra is a pure Java HTML renderer and DOM parser that is being developed to support HTML 4, Javascript and CSS 2. diff --git a/debian/doc-base b/debian/doc-base deleted file mode 100644 index b00207a..0000000 --- a/debian/doc-base +++ /dev/null @@ -1,9 +0,0 @@ -Document: libcobra-java -Title: Programmer API for cobra -Author: The XAMJ Project <xamjadmin@users.sourceforge.net> -Abstract: Java HTML Renderer & Parser -Section: Programming - -Format: HTML -Index: /usr/share/doc/libcobra-java/index.html -Files: /usr/share/doc/libcobra-java/*.html diff --git a/debian/docs b/debian/docs deleted file mode 100644 index 68f200e..0000000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -doc/api/* diff --git a/debian/libcobra-java.jlibs b/debian/libcobra-java.jlibs new file mode 100644 index 0000000..8faff16 --- /dev/null +++ b/debian/libcobra-java.jlibs @@ -0,0 +1 @@ +cobra.jar diff --git a/debian/patches/02-java8-compatibility.patch b/debian/patches/02-java8-compatibility.patch new file mode 100644 index 0000000..5cb989f --- /dev/null +++ b/debian/patches/02-java8-compatibility.patch @@ -0,0 +1,107 @@ +Description: Modifies the ListSet class to compile at the Java 8 source/target level +Author: Emmanuel Bourg <ebourg@apache.org> +Forwarded: no +--- a/src/org/lobobrowser/util/ListSet.java ++++ b/src/org/lobobrowser/util/ListSet.java +@@ -25,9 +25,9 @@ +
+ import java.util.*;
+
+-public class ListSet implements List, Set {
+- private final List list = new ArrayList();
+- private final Set set = new HashSet();
++public class ListSet<E> implements List<E>, Set<E> {
++ private final List<E> list = new ArrayList<>();
++ private final Set<E> set = new HashSet<>();
+
+ public ListSet() {
+ super();
+@@ -36,7 +36,7 @@ + /* (non-Javadoc)
+ * @see java.util.List#add(int, E)
+ */
+- public void add(int index, Object element) {
++ public void add(int index, E element) {
+ if(this.set.add(element)) {
+ list.add(index, element);
+ }
+@@ -45,7 +45,7 @@ + /* (non-Javadoc)
+ * @see java.util.List#add(E)
+ */
+- public boolean add(Object o) {
++ public boolean add(E o) {
+ if(this.set.add(o)) {
+ return this.list.add(o);
+ }
+@@ -57,11 +57,11 @@ + /* (non-Javadoc)
+ * @see java.util.List#addAll(java.util.Collection)
+ */
+- public boolean addAll(Collection c) {
++ public boolean addAll(Collection<? extends E> c) {
+ boolean changed = false;
+- Iterator i = c.iterator();
++ Iterator<? extends E> i = c.iterator();
+ while(i.hasNext()) {
+- Object element = i.next();
++ E element = i.next();
+ if(this.add(element)) {
+ changed = true;
+ }
+@@ -72,12 +72,12 @@ + /* (non-Javadoc)
+ * @see java.util.List#addAll(int, java.util.Collection)
+ */
+- public boolean addAll(int index, Collection c) {
++ public boolean addAll(int index, Collection<? extends E> c) {
+ boolean changed = false;
+ int insertIndex = index;
+- Iterator i = c.iterator();
++ Iterator<? extends E> i = c.iterator();
+ while(i.hasNext()) {
+- Object element = i.next();
++ E element = i.next();
+ if(this.set.add(element)) {
+ this.list.add(insertIndex++, element);
+ changed = true;
+@@ -111,7 +111,7 @@ + /* (non-Javadoc)
+ * @see java.util.List#get(int)
+ */
+- public Object get(int index) {
++ public E get(int index) {
+ return this.list.get(index);
+ }
+
+@@ -160,8 +160,8 @@ + /* (non-Javadoc)
+ * @see java.util.List#remove(int)
+ */
+- public Object remove(int index) {
+- Object element = this.list.remove(index);
++ public E remove(int index) {
++ E element = this.list.remove(index);
+ if(element != null) {
+ this.set.remove(element);
+ }
+@@ -210,7 +210,7 @@ + /* (non-Javadoc)
+ * @see java.util.List#set(int, E)
+ */
+- public Object set(int index, Object element) {
++ public E set(int index, E element) {
+ this.set.add(element);
+ return this.list.set(index, element);
+ }
+@@ -229,6 +229,10 @@ + return this.list.subList(fromIndex, toIndex);
+ }
+
++ public Spliterator<E> spliterator() {
++ return this.list.spliterator();
++ }
++
+ /* (non-Javadoc)
+ * @see java.util.List#toArray()
+ */
diff --git a/debian/patches/series b/debian/patches/series index 15568ce..705b027 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 01-compatible-with-java7.diff +02-java8-compatibility.patch diff --git a/debian/rules b/debian/rules index 36735c2..61df6ea 100755 --- a/debian/rules +++ b/debian/rules @@ -1,17 +1,10 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/debhelper.mk +%: + dh $@ --buildsystem=ant --with javahelper -JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILDFILE := debian/build.xml -DEB_ANT_BUILD_TARGET := jar javadoc -DEB_JARS := js xml-apis -ANT_OPTS := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 +override_dh_auto_build: + dh_auto_build -- -f debian/build.xml jar -install/libcobra-java:: - install -m 644 -D cobra.jar $(DEB_DESTDIR)/usr/share/java/cobra-$(DEB_UPSTREAM_VERSION).jar - dh_link /usr/share/java/cobra-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/cobra.jar - -get-orig-source: - -uscan --upstream-version 0 +override_dh_auto_clean: + dh_auto_clean -- -f debian/build.xml |