Hi all,

I plan to fix #802416 and #965924.

The debdiff is as attachment.

I'll wait for 5 days. And then upload it to delay queue.

Teşekkürler,
Paul
diff -Nru zemberek-ooo-1.0~rc2/debian/changelog 
zemberek-ooo-1.0~rc2/debian/changelog
--- zemberek-ooo-1.0~rc2/debian/changelog       2022-12-12 09:55:38.000000000 
+0800
+++ zemberek-ooo-1.0~rc2/debian/changelog       2022-12-12 09:47:05.000000000 
+0800
@@ -1,3 +1,11 @@
+zemberek-ooo (1.0~rc2-10.5) unstable; urgency=low
+
+  * Non-maintainer upload. (Closes: #1017942)
+  * Bump debhelper compat to 10. (Closes: #965924)
+  * Fix FTBFS due to missing ure-link (Closes: #802416)
+
+ -- Ying-Chun Liu (PaulLiu) <paul...@debian.org>  Mon, 12 Dec 2022 09:47:05 
+0800
+
 zemberek-ooo (1.0~rc2-10.4) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru zemberek-ooo-1.0~rc2/debian/compat zemberek-ooo-1.0~rc2/debian/compat
--- zemberek-ooo-1.0~rc2/debian/compat  2022-12-12 09:55:38.000000000 +0800
+++ zemberek-ooo-1.0~rc2/debian/compat  2022-12-12 08:36:14.000000000 +0800
@@ -1 +1 @@
-5
+10
diff -Nru zemberek-ooo-1.0~rc2/debian/control 
zemberek-ooo-1.0~rc2/debian/control
--- zemberek-ooo-1.0~rc2/debian/control 2022-12-12 09:55:38.000000000 +0800
+++ zemberek-ooo-1.0~rc2/debian/control 2022-12-12 09:46:55.000000000 +0800
@@ -2,8 +2,8 @@
 Section: text
 Priority: optional
 Maintainer: Rail Aliev <r...@i-rs.ru>
-Build-Depends: cdbs, debhelper (>= 5), libreoffice-dev, quilt, ant
-Build-Depends-Indep: default-jdk, libreoffice-java-common, libzemberek-java, 
libzemberek-tr-java, unzip
+Build-Depends: cdbs, debhelper (>= 10), libreoffice-dev, quilt, ant
+Build-Depends-Indep: default-jdk, libreoffice-java-common, libzemberek-java, 
libzemberek-tr-java, unzip, ure-java
 Build-Conflicts: libreoffice-common (<< 1:3.5.0~)
 Standards-Version: 3.8.2
 Homepage: http://code.google.com/p/zemberek/
diff -Nru zemberek-ooo-1.0~rc2/debian/patches/build.xml.diff 
zemberek-ooo-1.0~rc2/debian/patches/build.xml.diff
--- zemberek-ooo-1.0~rc2/debian/patches/build.xml.diff  2022-12-12 
09:55:38.000000000 +0800
+++ zemberek-ooo-1.0~rc2/debian/patches/build.xml.diff  2022-12-12 
09:04:50.000000000 +0800
@@ -2,19 +2,35 @@
 # authour via email. Applied in trunk.
 # Upstream: http://code.google.com/p/zemberek/source/detail?r=414
 ===================================================================
+Index: zemberek-ooo-1.0~rc2/build.xml
+===================================================================
 --- zemberek-ooo-1.0~rc2.orig/build.xml
 +++ zemberek-ooo-1.0~rc2/build.xml
-@@ -45,11 +45,11 @@
+@@ -1,4 +1,4 @@
+-<?xml version="1.0" encoding="ISO-8859-1" ?>
++<?xml version="1.0" encoding="UTF-8" ?>
+ 
+ <project default="build-all">
+ 
+@@ -45,11 +45,7 @@
        </path>
        
        <path id="ooo3.classpath">
 -              <fileset dir="${openoffice.root.dir}/ure/share/java">
-+              <fileset dir="${openoffice.root.dir}/ure-link/share/java">
-                       <include name="**/*.jar" />
-                       <include name="**/*.zip" />
-               </fileset>
+-                      <include name="**/*.jar" />
+-                      <include name="**/*.zip" />
+-              </fileset>
 -              <fileset dir="${openoffice.root.dir}/basis3.0/program/classes">
 +              <fileset dir="${openoffice.root.dir}/program/classes">
                        <include name="**/*.jar" />
                        <include name="**/*.zip" />
                </fileset>
+@@ -57,7 +53,7 @@
+ 
+       <target name="compile-java" depends="init" description="compile all 
java files">
+               <javac srcdir="${src.dir}" destdir="${build.classes.dir}" 
source="1.5" target="1.5"
+-      deprecation="${compile.deprecation}" debug="${compile.debug}" 
optimize="${compile.optimize}">
++      deprecation="${compile.deprecation}" debug="${compile.debug}" 
optimize="${compile.optimize}" encoding="utf-8">
+                       <classpath>
+                               <fileset dir="${lib.dir}">
+                                       <include name="**/*.jar" />
diff -Nru zemberek-ooo-1.0~rc2/debian/rules zemberek-ooo-1.0~rc2/debian/rules
--- zemberek-ooo-1.0~rc2/debian/rules   2022-12-12 09:55:38.000000000 +0800
+++ zemberek-ooo-1.0~rc2/debian/rules   2022-12-12 09:41:39.000000000 +0800
@@ -2,7 +2,6 @@
   
 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/default-java
 DEB_JARS       := zemberek zemberek-tr
diff -Nru zemberek-ooo-1.0~rc2/debian/source/format 
zemberek-ooo-1.0~rc2/debian/source/format
--- zemberek-ooo-1.0~rc2/debian/source/format   1970-01-01 08:00:00.000000000 
+0800
+++ zemberek-ooo-1.0~rc2/debian/source/format   2022-12-12 08:35:40.000000000 
+0800
@@ -0,0 +1 @@
+3.0 (quilt)

Attachment: OpenPGP_0x44173FA13D058888.asc
Description: OpenPGP public key

Attachment: OpenPGP_signature
Description: OpenPGP digital signature

Reply via email to