uncommitted - dita-ot
Ready changes
Summary
Import uploads missing from VCS:Diff
diff --git a/debian/changelog b/debian/changelog
index c0d5161..620a7df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,20 @@
-dita-ot (1.5.3-2) UNRELEASED; urgency=low
+dita-ot (1.5.3+dfsg-1) unstable; urgency=medium
- * Remove self from Uploaders
+ * Non-maintainer upload.
+ * Repack the tarball and remove non-free chm files. Otherwise the package
+ will be autorejected.
+ * Add encoding.patch and fix FTBFS with Java 9. (Closes: #893129)
- -- Mathieu Malaterre <malat@debian.org> Thu, 11 Apr 2013 12:30:54 +0200
+ -- Markus Koschany <apo@debian.org> Sat, 14 Apr 2018 00:56:09 +0200
+
+dita-ot (1.5.3-2) unstable; urgency=medium
+
+ * Team upload.
+ * Fix build-indep issue. Closes: #831915
+ Thanks to Santiago Vila for patch
+ * Bump Std-Vers to 3.9.8, no changes needed
+
+ -- Mathieu Malaterre <malat@debian.org> Mon, 29 Aug 2016 08:18:47 +0200
dita-ot (1.5.3-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d33af7b..2faa2c1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,14 @@ Section: java
Priority: optional
Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org>
Uploaders: Jakub Adam <jakub.adam@ktknet.cz>
-Build-Depends: debhelper (>= 8~), cdbs, ant, javahelper,
-Build-Depends-Indep: default-jdk, libcommons-codec-java, libxerces2-java,
- libsaxon-java, libicu4j-4.4-java, libxml-commons-resolver1.1-java
-Standards-Version: 3.9.3
+Build-Depends: ant, cdbs, debhelper (>= 8~), javahelper
+Build-Depends-Indep: default-jdk,
+ libcommons-codec-java,
+ libicu4j-4.4-java,
+ libsaxon-java,
+ libxerces2-java,
+ libxml-commons-resolver1.1-java
+Standards-Version: 3.9.8
Vcs-Git: git://git.debian.org/git/pkg-java/dita-ot.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/dita-ot.git
Homepage: http://dita-ot.sourceforge.net
diff --git a/debian/copyright b/debian/copyright
index 647a1f9..e08d9fe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -169,7 +169,7 @@ License: CPL-1.0
rights under this Agreement, including but not limited to the risks and costs of
program errors, compliance with applicable laws, damage to or loss of data,
programs or equipment, and unavailability or interruption of operations.
- .
+ .
6. DISCLAIMER OF LIABILITY
.
EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
diff --git a/debian/patches/encoding.patch b/debian/patches/encoding.patch
new file mode 100644
index 0000000..51cd178
--- /dev/null
+++ b/debian/patches/encoding.patch
@@ -0,0 +1,54 @@
+From: Markus Koschany <apo@debian.org>
+Date: Sat, 14 Apr 2018 00:55:08 +0200
+Subject: encoding
+
+Fix FTBFS with Java 9 by specifying the encoding.
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=893129
+---
+ buildPackage.xml | 4 ++--
+ demo/fo/buildPackage.xml | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/buildPackage.xml b/buildPackage.xml
+index 697ac21..969f94f 100644
+--- a/buildPackage.xml
++++ b/buildPackage.xml
+@@ -72,7 +72,7 @@
+ value="${version}"/>
+ <javac srcdir="${build.dir}" destdir="${bin.dir}"
+ excludes="com/**,org/dita/dost/junit/**, org/dita/dost/invoker/JavaInvoker.java" debug="on"
+- source="1.5" target="1.5">
++ source="1.5" target="1.5" encoding="iso-8859-1">
+ <classpath>
+ <pathelement location="${lib.dir}/resolver.jar"/>
+ <pathelement location="${lib.dir}/commons-codec-1.4.jar"/>
+@@ -547,4 +547,4 @@
+ </copy>
+ </target>
+
+-</project>
+\ No newline at end of file
++</project>
+diff --git a/demo/fo/buildPackage.xml b/demo/fo/buildPackage.xml
+index d55da00..3102218 100644
+--- a/demo/fo/buildPackage.xml
++++ b/demo/fo/buildPackage.xml
+@@ -48,7 +48,7 @@
+ <target name="build-java" depends="init-java, check-icu4j, build-xep-java">
+ <javac srcdir="${src.dir}" destdir="${bin.dir}"
+ debug="on" excludes="com/idiominc/ws/opentopic/fo/xep/**"
+- source="1.5" target="1.5">
++ source="1.5" target="1.5" encoding="iso-8859-1">
+ <classpath refid="build.class.path"/>
+ </javac>
+ </target>
+@@ -57,7 +57,7 @@
+ <javac srcdir="${src.dir}/com/idiominc/ws/opentopic/fo/xep/"
+ destdir="${bin.dir}"
+ source="1.5" target="1.5"
+- debug="on">
++ debug="on" encoding="iso-8859-1">
+ <classpath refid="build.class.path"/>
+ </javac>
+ </target>
diff --git a/debian/patches/series b/debian/patches/series
index c1a241a..ddc2e68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
debian-custom-build.patch
same-loader-for-tasks.patch
distribution-saxon-compat.patch
+encoding.patch
diff --git a/debian/rules b/debian/rules
index bbbf9cd..fe507cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,12 @@ DEB_ANT_BUILDFILE := buildPackage.xml
DEB_ANT_BUILD_TARGET := package-java update-doc package-binary-minimum
DEB_ANT_CLEAN_TARGET := clean-package clean-java cleanup
+build: build-arch build-indep
+
+build-arch:
+
# Minimal version does not install fo.jar
-build:
+build-indep:
cd demo/fo && CLASSPATH=$(DEB_CLASSPATH) ant -f buildPackage.xml package-java
DITA_OT_DIR=debian/dita-ot/usr/share/dita-ot
@@ -27,4 +31,4 @@ clean::
xsl/preprocess/mapref.xsl xsl/map2plugin.xsl catalog-dita.xml
get-orig-source:
- uscan --download-version $(DEB_UPSTREAM_VERSION) --verbose --force-download
+ uscan --download-version $(DEB_UPSTREAM_VERSION) --verbose --force-download --rename
diff --git a/debian/watch b/debian/watch
index c0df453..90ac501 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://sf.net/dita-ot/DITA-OT([\d\.]+)_src\.tar\.gz
+http://sf.net/dita-ot/DITA-OT([\d\.]+)_src\.tar\.gz debian jh_repack
diff --git a/doc/installguide/installing/installing_map.chm b/doc/installguide/installing/installing_map.chm
deleted file mode 100644
index 796bfa7..0000000
Binary files a/doc/installguide/installing/installing_map.chm and /dev/null differ
diff --git a/doc/quickstartguide.chm b/doc/quickstartguide.chm
deleted file mode 100644
index 437c183..0000000
Binary files a/doc/quickstartguide.chm and /dev/null differ
diff --git a/doc/readme.chm b/doc/readme.chm
deleted file mode 100644
index 5d0485e..0000000
Binary files a/doc/readme.chm and /dev/null differ
Debdiff
File lists identical (after any substitutions)
No differences were encountered between the control files of package dita-ot
No differences were encountered between the control files of package dita-ot-doc