Package: pdfsam
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 5511998e0ab64186dd4490007f15308f1c0b1103 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 18 Apr 2012 16:44:40 +0300
Subject: [PATCH] obsolete-default-jdk-builddep
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
 debian/changelog        |   14 ++++++++++++++
 debian/compat           |    2 +-
 debian/control          |   14 ++++++--------
 debian/pdfsam.classpath |    1 +
 debian/rules            |    8 +++++---
 5 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 debian/pdfsam.classpath

diff --git a/debian/changelog b/debian/changelog
index 6dc7958..07e5987 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+pdfsam (1.1.4-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update to Standards-Version to 3.9.3 and debhelper to 9.
+  * Add build-arch and build-indep targets; use dh_prep in rules file.
+  * Change obsolete depends default-jdk-builddep to default-jdk.
+  * Add new libcommons-httpclient-java due to pdfsam-maine-br1/ant/build.xml.
+  * Add javahelper depends and debian/*.classpath file.
+  * Fix duplicate-in-relation-field (Lintian).
+  * Fix vcs-field-uses-not-recommended-uri-format Lintian (Closes: #669031).
+  * Fix classpath-contains-relative-path (Lintian) with javahelper.
+
+ -- Jari Aalto <jari.aa...@cante.net>  Wed, 18 Apr 2012 16:28:33 +0300
+
 pdfsam (1.1.4-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 2ba54aa..ea2b444 100644
--- a/debian/control
+++ b/debian/control
@@ -3,19 +3,17 @@ Section: text
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Torsten Werner <twer...@debian.org>
-Build-Depends: ant, cdbs, debhelper (>= 5), default-jdk-builddep, 
+Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk,
  libdom4j-java, libitext-java (>= 2), libjaxen-java, libjgoodies-looks-java,
- liblog4j1.2-java
-Standards-Version: 3.8.4
+ liblog4j1.2-java, javahelper
+Standards-Version: 3.9.3
 Homepage: http://www.pdfsam.org
-Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/pdfsam
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/pdfsam/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/pdfsam
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/pdfsam/
 
 Package: pdfsam
 Architecture: all
-Depends: openjdk-6-jre | java2-runtime, libdom4j-java, libitext-java,
- libjaxen-java, libjgoodies-looks-java, liblog4j1.2-java, ${misc:Depends},
- java-wrappers
+Depends: ${misc:Depends}, ${java:Depends}, libdom4j-java, libitext-java, libjaxen-java, libjgoodies-looks-java, liblog4j1.2-java, java-wrappers, libcommons-httpclient-java
 Description: PDF Split and Merge
  PDF Split and Merge is a very simple, easy to use, free, open source
  utility to split and merge pdf files. It has a simple graphical
diff --git a/debian/pdfsam.classpath b/debian/pdfsam.classpath
new file mode 100644
index 0000000..d0036c3
--- /dev/null
+++ b/debian/pdfsam.classpath
@@ -0,0 +1 @@
+usr/share/pdfsam/pdfsam-1.1.4.jar  /usr/share/pdfsam/lib/log4j-1.2.jar /usr/share/pdfsam/lib/dom4j.jar /usr/share/pdfsam/lib/jaxen.jar /usr/share/pdfsam/lib/emp4j-1.0.1.jar /usr/share/pdfsam/lib/itext.jar /usr/share/pdfsam/lib/pdfsam-jcmdline-1.0.3.jar /usr/share/pdfsam/lib/looks.jar /usr/share/pdfsam/lib/pdfsam-console-2.0.6e.jar /usr/share/pdfsam/lib/bcmail-jdk14-138.jar /usr/share/pdfsam/lib/bcprov-jdk14-138.jar /usr/share/pdfsam/lib/pdfsam-langpack.jar /usr/share/java/httpclient.jar
diff --git a/debian/rules b/debian/rules
index 85c1635..aae85b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,20 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/javahelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME            := /usr/lib/jvm/default-java
+JAVA_HOME	     := /usr/lib/jvm/default-java
 DEB_ANT_BUILDFILE    := debian/build.xml
-DEB_JARS             := dom4j itext jaxen log4j-1.2 looks
+DEB_JARS	     := dom4j itext jaxen log4j-1.2 looks
 DEB_ANT_BUILD_TARGET := -Dbuild.dir=$(CURDIR)/build
-DEB_CLASSPATH        := $(DEB_CLASSPATH):$(CURDIR)/build/jcmdline/build:$(CURDIR)/build/emp4j/build:$(CURDIR)/build/pdfsam-console/build:$(CURDIR)/build/pdfsam-langpack-br1/build:$(CURDIR)/build/pdfsam-maine-br1/build:
+DEB_CLASSPATH	     := $(DEB_CLASSPATH):$(CURDIR)/build/jcmdline/build:$(CURDIR)/build/emp4j/build:$(CURDIR)/build/pdfsam-console/build:$(CURDIR)/build/pdfsam-langpack-br1/build:$(CURDIR)/build/pdfsam-maine-br1/build:
 
 clean::
 	$(RM) -rf build
 
 install/pdfsam::
+
 	for JAR in $(DEB_JARS); do \
 	  dh_link /usr/share/java/$$JAR.jar /usr/share/pdfsam/lib/$$JAR.jar; \
 	done
-- 
1.7.9.5

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Reply via email to