Bug#669157: [PATCH] libitext-java: Helping to fix build-depends-on-obsolete-package default-jdk-builddep

Package: libitext-java
Severity: normal
Tags: patch

Hi,

The build depends list package that has been obsoleted.

See attached patch to help to fix this and other things related
to new features and items reported by Lintian etc.

Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.

Thanks,
Jari



From 5ab80e2208b4c294d79f953b82d97b4bbbf0739c Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Tue, 17 Apr 2012 23:12:07 +0300
Subject: [PATCH] obsolete-default-jdk
Organization: Private

Signed-off-by: Jari Aalto <jari.aalto@cante.net>

debian/changelog | 19 +++++++++++++++-
debian/compat | 2 +-
debian/control | 12 ++++++
debian/copyright | 2 +-
...rd_input.diff => 01-allow-standard-input.patch} | 12 ++-
debian/patches/series | 2 +-
debian/rules | 18 ++++++++++++++-
7 files changed, 40 insertions(+), 27 deletions(-)
rename debian/patches/{01_allow_standard_input.diff => 01-allow-standard-input.patch} (57%)

diff --git a/debian/changelog b/debian/changelog
index 2094d48..297fa5e 100644
a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+libitext-java (2.1.7-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Change obsolete default-jdk-builddep to default-jdk.
+ * Replace debian/patches/01* template with headers and rename file to
+ standard *.patch extension.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix debian-control-has-unusual-field-spacing (Lintian).
+ * Fix duplicate-short-description (Lintian).
+ * Fix needless-dependency-on-jre (Lintian).
+ * Fix missing-classpath (Lintian).
+
+ -- Jari Aalto <jari.aalto@cante.net> Tue, 17 Apr 2012 22:32:28 +0300
+
libitext-java (2.1.7-2) unstable; urgency=low

[ Michael Koch ]
@@ -145,7 +160,3 @@ libitext-java (1.00-1) unstable; urgency=low
* Initial Release.

-
-Local variables:
-mode: debian-changelog
-End:
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 805fe35..5a2c1fe 100644
a/debian/control
+++ b/debian/control
@@ -3,18 +3,18 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Michael Koch <konqueror@gmx.de>, Adriaan Peeters <apeeters@lashout.net>, Torsten Werner <twerner@debian.org>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk-builddep, ant, libbcprov-java,
+Build-Depends: debhelper (>= 9), cdbs, default-jdk, ant, libbcprov-java,
libbcmail-java, libbctsp-java, libdom4j-java, libpdfrenderer-java
-Standards-Version: 3.8.4
+Standards-Version: 3.9.3
Homepage: http://www.lowagie.com/iText/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/t...itext-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java...itext-java

Package: libitext-java
Architecture: all
-Depends: default-jre | java2-runtime, ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: libitext-java-gcj
-Description: Java Library to create and manipulate PDF on the fly
+Description: Java Library to create and manipulate PDF on the fly for Gcj
iText is a library that allows you to generate PDF files on the fly.
The iText classes are very useful for people who need to generate read-only,
platform independent documents containing text, lists, tables and images.
@@ -37,14 +37,14 @@ Description: Java Library to create and manipulate PDF on the fly

Package: libitext-rtf-java
Architecture: all
-Depends: default-jre | java2-runtime, libitext-java (= ${binary:Version}), ${misc:Depends}
+Depends: libitext-java (= ${binary:Version}), ${misc:Depends}
Description: Java Library to create and manipulate RTF files on the fly
iText RTF is a library that allows you to generate RTF files on the fly in
a similar fashion to iText itself.

Package: libitext-rups-java
Architecture: all
-Depends: default-jre | java2-runtime, libitext-java (= ${binary:Version}), ${misc:Depends}
+Depends: libitext-java (= ${binary:Version}), ${misc:Depends}
Description: graphical tool for Reading and Updating PDF Syntax (RUPS)
iText RUPS provides a GUI for visualizing PDF files and investigating their
internal structure.
diff --git a/debian/copyright b/debian/copyright
index eec3a39..3695161 100644
a/debian/copyright
+++ b/debian/copyright
@@ -86,7 +86,7 @@ License:
Library general Public License for more details.

On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
+Public License can be found in `/usr/share/common-licenses/LGPL-2'.

Mozilla Public License Version 1.1

diff --git a/debian/patches/01_allow_standard_input.diff b/debian/patches/01-allow-standard-input.patch
similarity index 57%
rename from debian/patches/01_allow_standard_input.diff
rename to debian/patches/01-allow-standard-input.patch
index 2bca04b..7bb24b8 100644
a/debian/patches/01_allow_standard_input.diff
+++ b/debian/patches/01-allow-standard-input.patch
@@ -1,13 +1,5 @@
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
+From:
+Subject:

libitext-java-2.1.7.orig/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java
+++ libitext-java-2.1.7/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java
diff --git a/debian/patches/series b/debian/patches/series
index 138aae3..87e0c65 100644
a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-01_allow_standard_input.diff
+01-allow-standard-input.patch
diff --git a/debian/rules b/debian/rules
index 6a18479..b8a9538 100755
a/debian/rules
+++ b/debian/rules
@@ -3,19 +3,20 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk

-JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
+JAVA_HOME := /usr/lib/jvm/default-java
+ANT_HOME := /usr/share/ant
DEB_ANT_BUILD_TARGET := jar jar.rtf jar.rups
DEB_ANT_CLEAN_TARGET : DEB_ANT_BUILDFILE := src/build.xml
-DEB_JARS := bcprov bcmail bctsp dom4j pdfrenderer
+DEB_JARS := bcprov bcmail bctsp dom4j pdfrenderer
+CLASS_PATH := /usr/share/java/itext.jar

include /usr/share/gcj/debian_defaults
ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
with_gcj_native := yes
endif

-LIBRARY_PACKAGE := itext
+LIBRARY_PACKAGE := itext

makebuilddir/lib$(LIBRARY_PACKAGE)-java:: debian/stamp-makebuilddir
debian/stamp-makebuilddir:
@@ -30,6 +31,15 @@ install/lib$(LIBRARY_PACKAGE)-java::

install/lib$(LIBRARY_PACKAGE)-rtf-java::
dh_installdirs -plib$(LIBRARY_PACKAGE)-rtf-java usr/share/java
+ # repack with Class-Path
+ cd lib && \
+ jar=iText-rtf.jar ; \
+ file=META-INF/MANIFEST.MF ; \
+ jar -xf $$jar && \
+ sed -i '/^[ \t]*$$/d' $$file && \
+ /bin/echo -e "Class-Path: $(CLASS_PATH)" >> $$file && \
+ jar -cfm $$jar $$file com
+ # install
install -m 644 lib/iText-rtf.jar debian/lib$(LIBRARY_PACKAGE)-rtf-java/usr/share/java/$(LIBRARY_PACKAGE)-rtf-$(DEB_UPSTREAM_VERSION).jar
dh_link -plib$(LIBRARY_PACKAGE)-rtf-java usr/share/java/$(LIBRARY_PACKAGE)-rtf-$(DEB_UPSTREAM_VERSION).jar usr/share/java/$(LIBRARY_PACKAGE)-rtf.jar

1.7.9.5





To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org