[pdfsam] 36/36: Add new preliminary debian directory
Markus Koschany
apo at moszumanska.debian.org
Tue Feb 21 04:20:17 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository pdfsam.
commit 519afe6a31d11af6c00119e959efa96657219fdd
Author: Markus Koschany <apo at debian.org>
Date: Tue Feb 21 05:17:31 2017 +0100
Add new preliminary debian directory
---
debian/README.source | 6 +
debian/ant.properties | 7 --
debian/build.xml | 28 -----
debian/changelog | 6 +
debian/compat | 2 +-
debian/control | 36 ++++--
debian/copyright | 127 +++++++++++-----------
debian/install | 13 +--
debian/maven.ignoreRules | 18 +++
debian/maven.rules | 19 ++++
debian/orig-tar.exclude | 5 -
debian/orig-tar.sh | 19 ----
debian/patches/0001-prefer-debian-build.xml.patch | 66 -----------
debian/patches/0002-fix-the-startup-scripts.patch | 87 ---------------
debian/patches/series | 2 -
debian/pdfsam.poms | 43 ++++++++
debian/rules | 25 +----
debian/watch | 6 +-
18 files changed, 193 insertions(+), 322 deletions(-)
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..306a5e3
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,6 @@
+Latest version of pdfsam requires new build-depdendencies:
+
+https://github.com/torakiki/sejda
+https://github.com/haraldk/TwelveMonkeys
+
+
diff --git a/debian/ant.properties b/debian/ant.properties
deleted file mode 100644
index 4d6d25b..0000000
--- a/debian/ant.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-libs.dir=/usr/share/java
-
-log4j.jar.name=log4j-1.2
-dom4j.jar.name=dom4j
-jaxen.jar.name=jaxen
-itext.jar.name=itext
-looks.jar.name=looks
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index 36d8c5f..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project default="build-jars" name="pdfsam" basedir="..">
-
- <target name="clean" description="Clean up">
- <delete dir="${build.dir}"/>
- <delete dir="classes"/>
- <ant antfile="ant/build.xml" dir="emp4j" target="clean"/>
- <ant antfile="ant/build.xml" dir="jcmdline" target="clean"/>
- <ant antfile="ant/build.xml" dir="pdfsam-console" target="clean"/>
- <ant antfile="ant/build.xml" dir="pdfsam-langpack-br1" target="clean"/>
- <ant antfile="ant/build.xml" dir="pdfsam-maine-br1" target="clean"/>
- <ant antfile="ant/build.xml" dir="pdfsam-merge" target="clean"/>
- <ant antfile="ant/build.xml" dir="pdfsam-split" target="clean"/>
- </target>
-
- <target name="build-jars" description="Build the jar files">
- <mkdir dir="${build.dir}"/>
- <ant antfile="ant/build.xml" dir="emp4j" target="build-jars"/>
- <ant antfile="ant/build.xml" dir="jcmdline" target="build-jars"/>
- <ant antfile="ant/build.xml" dir="pdfsam-console" target="build-jars"/>
- <ant antfile="ant/build.xml" dir="pdfsam-langpack-br1" target="build-jars"/>
- <ant antfile="ant/build.xml" dir="pdfsam-maine-br1" target="build-jars"/>
- <ant antfile="ant/build.xml" dir="pdfsam-merge" target="build-jars"/>
- <ant antfile="ant/build.xml" dir="pdfsam-split" target="build-jars"/>
- </target>
-
-</project>
diff --git a/debian/changelog b/debian/changelog
index f056fc2..f70e27b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pdfsam (3.2.5-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Markus Koschany <apo at debian.org> Tue, 21 Feb 2017 05:10:02 +0100
+
pdfsam (1.1.4-2) unstable; urgency=low
[ Miguel Landaeta ]
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 4c1f01d..22ff09b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,20 +2,36 @@ Source: pdfsam
Section: text
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk,
- libdom4j-java, libitext-java (>= 2), libjaxen-java, libjgoodies-looks-java,
- liblog4j1.2-java, javahelper
-Standards-Version: 3.9.3
+Uploaders:
+ Markus Koschany <apo at debian.org>
+Build-Depends:
+ debhelper (>= 10),
+ default-jdk,
+ javahelper,
+ libdom4j-java,
+ libitext-java (>= 2),
+ libjaxen-java,
+ libjgoodies-looks-java,
+ liblog4j1.2-java,
+ maven-debian-helper
+Standards-Version: 3.9.8
Homepage: http://www.pdfsam.org
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/pdfsam
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/pdfsam/
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/pdfsam.git
+Vcs-Browser: https://anonscm.debian.org/git/pkg-java/pdfsam.git
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, ${java:Depends}, libcommons-httpclient-java
+Depends:
+ java-wrappers,
+ libcommons-httpclient-java,
+ libdom4j-java,
+ libitext-java,
+ libjaxen-java,
+ libjgoodies-looks-java,
+ liblog4j1.2-java,
+ default-jre | java6-runtime,
+ ${java:Depends},
+ ${misc:Depends}
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/copyright b/debian/copyright
index d4eee81..f793661 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -46,12 +46,12 @@ The full text of the GLP-2 can be found in
Copyright for the files below the directory jcmdline/:
The Original Code is the Java jcmdline (command line management) package.
-
+
The Initial Developer of the Original Code is Lynne Lawrence.
-
+
Portions created by the Initial Developer are Copyright (C) 2002
the Initial Developer. All Rights Reserved.
-
+
Contributor(s): Lynne Lawrence <lgl at visuallink.com>
License:
@@ -60,7 +60,7 @@ License:
1.1 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.mozilla.org/MPL/
-
+
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the specific language governing rights and limitations under the
@@ -68,50 +68,50 @@ License:
Mozilla Public License Version 1.1
-
+
1. Definitions.
1.0.1. "Commercial Use"
means distribution or otherwise making the Covered Code available
- to a third party.
-
+ to a third party.
+
1.1. "Contributor"
means each entity that creates or contributes to the creation of
- Modifications.
-
+ Modifications.
+
1.2. "Contributor Version"
means the combination of the Original Code, prior Modifications
used by a Contributor, and the Modifications made by that
- particular Contributor.
-
+ particular Contributor.
+
1.3. "Covered Code"
means the Original Code or Modifications or the combination of the
Original Code and Modifications, in each case including portions
- thereof.
-
+ thereof.
+
1.4. "Electronic Distribution Mechanism"
means a mechanism generally accepted in the software development
- community for the electronic transfer of data.
-
+ community for the electronic transfer of data.
+
1.5. "Executable"
- means Covered Code in any form other than Source Code.
-
+ means Covered Code in any form other than Source Code.
+
1.6. "Initial Developer"
means the individual or entity identified as the Initial Developer
- in the Source Code notice required by Exhibit A.
-
+ in the Source Code notice required by Exhibit A.
+
1.7. "Larger Work"
means a work which combines Covered Code or portions thereof with
- code not governed by the terms of this License.
-
+ code not governed by the terms of this License.
+
1.8. "License"
- means this document.
-
+ means this document.
+
1.8.1. "Licensable"
means having the right to grant, to the maximum extent possible,
whether at the time of the initial grant or subsequently acquired,
- any and all of the rights conveyed herein.
-
+ any and all of the rights conveyed herein.
+
1.9. "Modifications"
means any addition to or deletion from the substance or structure
@@ -120,21 +120,21 @@ License:
1. Any addition to or deletion from the contents of a file
containing Original Code or previous Modifications.
-
+
2. Any new file that contains any part of the Original Code or
- previous Modifications.
+ previous Modifications.
1.10. "Original Code"
means Source Code of computer software code which is described in
the Source Code notice required by Exhibit A as Original Code, and
which, at the time of its release under this License is not
- already Covered Code governed by this License.
-
+ already Covered Code governed by this License.
+
1.10.1. "Patent Claims"
means any patent claim(s), now owned or hereafter acquired,
including without limitation, method, process, and apparatus
- claims, in any patent Licensable by grantor.
-
+ claims, in any patent Licensable by grantor.
+
1.11. "Source Code"
means the preferred form of the Covered Code for making
modifications to it, including all modules it contains, plus any
@@ -144,8 +144,8 @@ License:
another well known, available Covered Code of the Contributor's
choice. The Source Code can be in a compressed or archival form,
provided the appropriate decompression or de-archiving software is
- widely available for no charge.
-
+ widely available for no charge.
+
1.12. "You" (or "Your")
means an individual or a legal entity exercising rights under, and
complying with all of the terms of, this License or a future
@@ -156,7 +156,7 @@ License:
cause the direction or management of such entity, whether by
contract or otherwise, or (b) ownership of more than fifty percent
(50%) of the outstanding shares or beneficial ownership of such
- entity.
+ entity.
2. Source Code License.
2.1. The Initial Developer Grant.
@@ -170,21 +170,21 @@ License:
modify, display, perform, sublicense and distribute the Original
Code (or portions thereof) with or without Modifications, and/or as
part of a Larger Work; and
-
+
2. under Patents Claims infringed by the making, using or selling
of Original Code, to make, have made, use, practice, sell, and
offer for sale, and/or otherwise dispose of the Original Code (or
portions thereof).
-
+
3. the licenses granted in this Section 2.1 (a) and (b) are
effective on the date Initial Developer first distributes Original
Code under the terms of this License.
-
+
4. Notwithstanding Section 2.1 (b) above, no patent license is
granted: 1) for code that You delete from the Original Code; 2)
separate from the Original Code; or 3) for infringements caused by:
i) the modification of the Original Code or ii) the combination of
- the Original Code with other software or devices.
+ the Original Code with other software or devices.
2.2. Contributor Grant.
@@ -197,7 +197,7 @@ License:
created by such Contributor (or portions thereof) either on an
unmodified basis, with other Modifications, as Covered Code and/or
as part of a Larger Work; and
-
+
2. under Patent Claims infringed by the making, using, or selling
of Modifications made by that Contributor either alone and/or in
combination with its Contributor Version (or portions of such
@@ -206,11 +206,11 @@ License:
portions thereof); and 2) the combination of Modifications made by
that Contributor with its Contributor Version (or portions of such
combination).
-
+
3. the licenses granted in Sections 2.2 (a) and 2.2 (b) are
effective on the date Contributor first makes Commercial Use of the
Covered Code.
-
+
4. Notwithstanding Section 2.2 (b) above, no patent license is
granted: 1) for any code that Contributor has deleted from the
Contributor Version; 2) separate from the Contributor Version; 3)
@@ -219,7 +219,7 @@ License:
that Contributor with other software (except as part of the
Contributor Version) or other devices; or 4) under Patent Claims
infringed by Covered Code in the absence of Modifications made by
- that Contributor.
+ that Contributor.
3. Distribution Obligations.
3.1. Application of License.
@@ -234,9 +234,9 @@ License:
version that alters or restricts the applicable version of this
License or the recipients' rights hereunder. However, You may include
an additional document offering the additional rights described in
-
+
Section 3.5.
-
+
3.2. Availability of Source Code.
Any Modification which You create or to which You contribute must be
@@ -250,7 +250,7 @@ License:
has been made available to such recipients. You are responsible for
ensuring that the Source Code version remains available even if the
Electronic Distribution Mechanism is maintained by a third party.
-
+
3.3. Description of Modifications.
You must cause all Covered Code to which You contribute to contain a
@@ -261,9 +261,9 @@ License:
Initial Developer in (a) the Source Code, and (b) in any notice in an
Executable version or related documentation in which You describe the
origin or ownership of the Covered Code.
-
+
3.4. Intellectual Property Matters
-
+
(a) Third Party Claims
If Contributor has knowledge that a license under a third party's
@@ -278,21 +278,21 @@ License:
thereafter and shall take other steps (such as notifying appropriate
mailing lists or newsgroups) reasonably calculated to inform those who
received the Covered Code that new knowledge has been obtained.
-
+
(b) Contributor APIs
If Contributor's Modifications include an application programming
interface and Contributor has knowledge of patent licenses which are
reasonably necessary to implement that API, Contributor must also
include this information in the legal file.
-
+
(c) Representations.
Contributor represents that, except as disclosed pursuant to Section
3.4 (a) above, Contributor believes that Contributor's Modifications
are Contributor's original creation(s) and/or Contributor has
sufficient rights to grant the rights conveyed by this License.
-
+
3.5. Required Notices.
You must duplicate the notice in Exhibit A in each file of the Source
@@ -313,7 +313,7 @@ License:
Developer and every Contributor for any liability incurred by the
Initial Developer or such Contributor as a result of warranty,
support, indemnity or liability terms You offer.
-
+
3.6. Distribution of Executable Versions.
You may distribute Covered Code in Executable form only if the
@@ -337,14 +337,14 @@ License:
Initial Developer and every Contributor for any liability incurred by
the Initial Developer or such Contributor as a result of any such
terms You offer.
-
+
3.7. Larger Works.
You may create a Larger Work by combining Covered Code with other code
not governed by the terms of this License and distribute the Larger
Work as a single product. In such a case, You must make sure the
requirements of this License are fulfilled for the Covered Code.
-
+
4. Inability to Comply Due to Statute or Regulation.
If it is impossible for You to comply with any of the terms of this
@@ -357,19 +357,19 @@ License:
extent prohibited by statute or regulation, such description must be
sufficiently detailed for a recipient of ordinary skill to be able to
understand it.
-
+
5. Application of this License.
This License applies to code to which the Initial Developer has
attached the notice in Exhibit A and to related Covered Code.
-
+
6. Versions of the License.
6.1. New Versions
Netscape Communications Corporation ("Netscape") may publish revised
and/or new versions of the License from time to time. Each version
will be given a distinguishing version number.
-
+
6.2. Effect of New Versions
Once Covered Code has been published under a particular version of the
@@ -378,7 +378,7 @@ License:
of any subsequent version of the License published by Netscape. No one
other than Netscape has the right to modify the terms applicable to
Covered Code created under this License.
-
+
6.3. Derivative Works
If You create or use a modified version of this License (which you may
@@ -441,7 +441,7 @@ License:
then any rights granted to You by such Participant under Sections
2.1(b) and 2.2(b) are revoked effective as of the date You first
made, used, sold, distributed, or had made, Modifications made by
- that Participant.
+ that Participant.
8.3. If You assert a patent infringement claim against Participant
alleging that such Participant's Contributor Version directly or
@@ -456,7 +456,7 @@ License:
end user license agreements (excluding distributors and resellers)
which have been validly granted by You or any distributor hereunder
prior to termination shall survive termination.
-
+
9. Limitation of liability
Under no circumstances and under no legal theory, whether tort
@@ -473,7 +473,7 @@ License:
prohibits such limitation. Some jurisdictions do not allow the
exclusion or limitation of incidental or consequential damages, so
this exclusion and limitation may not apply to you.
-
+
10. U.S. government end users
The Covered Code is a "commercial item," as that term is defined in 48
@@ -483,7 +483,7 @@ License:
12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all
U.S. Government End Users acquire Covered Code with only those rights
set forth herein.
-
+
11. Miscellaneous
This License represents the complete agreement concerning subject
@@ -504,7 +504,7 @@ License:
Any law or regulation which provides that the language of a contract
shall be construed against the drafter shall not apply to this
License.
-
+
12. Responsibility for claims
As between Initial Developer and the Contributors, each party is
@@ -520,5 +520,4 @@ License:
"Multiple-Licensed". "Multiple-Licensed" means that the Initial
Developer permits you to utilize portions of the Covered Code under
Your choice of the MPL or the alternative licenses, if any, specified
- by the Initial Developer in the file described in Exhibit A.
-
+ by the Initial Developer in the file described in Exhibit A.
diff --git a/debian/install b/debian/install
index b0af030..17be58e 100644
--- a/debian/install
+++ b/debian/install
@@ -2,16 +2,11 @@ build/emp4j/dist/*.jar /usr/share/pdfsam/lib/
build/jcmdline/dist/*.jar /usr/share/pdfsam/lib/
build/pdfsam-console/dist/*.jar /usr/share/pdfsam/lib/
build/pdfsam-langpack-br1/dist/*.jar /usr/share/pdfsam/lib/
-
build/pdfsam-maine-br1/dist/*.jar /usr/share/pdfsam/
-template-basic-1/config.xml /usr/share/pdfsam/
-
build/pdfsam-merge/dist/*.jar /usr/share/pdfsam/plugins/merge/
-template-basic-1/plugins/merge/config.xml /usr/share/pdfsam/plugins/merge/
-
build/pdfsam-split/dist/*.jar /usr/share/pdfsam/plugins/split/
-template-basic-1/plugins/split/config.xml /usr/share/pdfsam/plugins/split/
-
-pdfsam-maine-br1/images/pdf.png /usr/share/pdfsam/
-
debian/pdfsam.desktop /usr/share/applications/
+pdfsam-maine-br1/images/pdf.png /usr/share/pdfsam/
+template-basic-1/config.xml /usr/share/pdfsam/
+template-basic-1/plugins/merge/config.xml /usr/share/pdfsam/plugins/merge/
+template-basic-1/plugins/split/config.xml /usr/share/pdfsam/plugins/split/
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..3a46e5f
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,18 @@
+
+ch.qos.logback logback-classic * * * *
+com.google.code.tempus-fugit tempus-fugit * * * *
+com.googlecode.gettext-commons gettext-maven-plugin * * * *
+de.jensd fontawesomefx * * * *
+jdepend jdepend * * * *
+junit junit * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
+org.codehaus.mojo exec-maven-plugin * * * *
+org.hamcrest hamcrest-all * * * *
+org.loadui testFx * * * *
+org.mockito mockito-all * * * *
+org.pdfsam pdfsam-core * * * *
+org.sejda sejda-conversion * * * *
+org.sejda sejda-core * * * *
+org.sejda sejda-injector * * * *
+org.sejda sejda-model * * * *
+org.sejda sejda-sambox * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..2d5dd94
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,19 @@
+
+org.pdfsam pdfsam-alternate-mix jar s/.*/debian/ * *
+org.pdfsam pdfsam-community jar s/.*/debian/ * *
+org.pdfsam pdfsam-core jar s/.*/debian/ * *
+org.pdfsam pdfsam-docs pom s/.*/debian/ * *
+org.pdfsam pdfsam-extract jar s/.*/debian/ * *
+org.pdfsam pdfsam-fx jar s/.*/debian/ * *
+org.pdfsam pdfsam-gui jar s/.*/debian/ * *
+org.pdfsam pdfsam-i18n jar s/.*/debian/ * *
+org.pdfsam pdfsam-merge jar s/.*/debian/ * *
+org.pdfsam pdfsam-msi-installer pom s/.*/debian/ * *
+org.pdfsam pdfsam-parent pom s/.*/debian/ * *
+org.pdfsam pdfsam-rotate jar s/.*/debian/ * *
+org.pdfsam pdfsam-service jar s/.*/debian/ * *
+org.pdfsam pdfsam-simple-split jar s/.*/debian/ * *
+org.pdfsam pdfsam-split-by-bookmarks jar s/.*/debian/ * *
+org.pdfsam pdfsam-split-by-size jar s/.*/debian/ * *
+org.bouncycastle s/bcmail-jdk15on/bcmail/ * s/.*/debian/ * *
+org.bouncycastle s/bcprov-jdk15on/bcprov/ * s/.*/debian/ * *
diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude
deleted file mode 100644
index 754aab8..0000000
--- a/debian/orig-tar.exclude
+++ /dev/null
@@ -1,5 +0,0 @@
-*/apidocs/*
-*.exe
-*.jar
-*.o
-*.pdf
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 4220d8a..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-DIR=pdfsam-$2
-TAR=../pdfsam_$2.orig.tar.gz
-
-# clean up the upstream tarball
-mkdir $DIR
-unzip $3 -d $DIR
-(cd $DIR && for ZIP in *.zip; do unzip $ZIP; rm -f $ZIP; done)
-tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
-rm -rf $DIR $3
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $TAR $origDir
- echo "moved $TAR to $origDir"
-fi
diff --git a/debian/patches/0001-prefer-debian-build.xml.patch b/debian/patches/0001-prefer-debian-build.xml.patch
deleted file mode 100644
index dcfca5a..0000000
--- a/debian/patches/0001-prefer-debian-build.xml.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Torsten Werner <twerner at debian.org>
-Date: Sun, 25 Apr 2010 20:41:55 +0200
-Subject: [PATCH] prefer debian/build.xml
-
-this patch should be checked again if it is really a good idea
----
- pdfsam-maine-br1/ant/build.xml | 45 ----------------------------------------
- 1 files changed, 0 insertions(+), 45 deletions(-)
-
-diff --git a/pdfsam-maine-br1/ant/build.xml b/pdfsam-maine-br1/ant/build.xml
-index 8b64d97..3817ee2 100644
---- a/pdfsam-maine-br1/ant/build.xml
-+++ b/pdfsam-maine-br1/ant/build.xml
-@@ -118,51 +118,6 @@
- </fileset>
- </jar>
-
-- <copy todir="${pdfsam.release.jar.dir}">
-- <fileset dir="${pdfsam.dist.dir}">
-- <include name="*.jar" />
-- </fileset>
-- </copy>
--
-- <!--emp4j-->
-- <ant antfile="${emp4j.dir}/ant/build.xml" dir="${emp4j.dir}" target="build-jars">
-- <property name="emp4j.dist.dir" value="${pdfsam.release.jar.dir}"/>
-- </ant>
-- <copy file="${pdfsam.release.jar.dir}/${emp4j.jar.name}.jar" todir="${libs.dir}" />
--
-- <!--jcmdline-->
-- <ant antfile="${jcmdline.dir}/ant/build.xml" dir="${jcmdline.dir}" target="build-jars">
-- <property name="jcmdline.dist.dir" value="${pdfsam.release.jar.dir}"/>
-- </ant>
-- <copy file="${pdfsam.release.jar.dir}/${jcmdline.jar.name}.jar" todir="${libs.dir}" />
--
-- <!--langpack-->
-- <ant antfile="${langpack.dir}/ant/build.xml" dir="${langpack.dir}" target="build-jars">
-- <property name="pdfsam-langpack.dist.dir" value="${pdfsam.release.jar.dir}"/>
-- </ant>
-- <copy file="${pdfsam.release.jar.dir}/${pdfsam-langpack.jar.name}.jar" todir="${libs.dir}" />
--
-- <!--console-->
-- <ant antfile="${console.dir}/ant/build.xml" dir="${console.dir}" target="build-jars">
-- <property name="pdfsam-console.dist.dir" value="${pdfsam.release.jar.dir}"/>
-- </ant>
-- <copy file="${pdfsam.release.jar.dir}/${pdfsam-console.jar.name}.jar" todir="${libs.dir}" />
--
-- <!--split-->
-- <ant antfile="${split.dir}/ant/build.xml" dir="${split.dir}" target="build-jars">
-- <property name="pdfsam-split.dist.dir" value="${pdfsam.release.jar.dir}"/>
-- </ant>
--
-- <!--merge-->
-- <ant antfile="${merge.dir}/ant/build.xml" dir="${merge.dir}" target="build-jars">
-- <property name="pdfsam-merge.dist.dir" value="${pdfsam.release.jar.dir}"/>
-- </ant>
--
-- <!--mix-->
-- <ant antfile="${mix.dir}/ant/build.xml" dir="${mix.dir}" target="build-jars">
-- <property name="pdfsam-mix.dist.dir" value="${pdfsam.release.jar.dir}"/>
-- </ant>
--
- <antcall target="build-jars-enhanced" />
- </target>
-
---
diff --git a/debian/patches/0002-fix-the-startup-scripts.patch b/debian/patches/0002-fix-the-startup-scripts.patch
deleted file mode 100644
index d96ffa8..0000000
--- a/debian/patches/0002-fix-the-startup-scripts.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From: Torsten Werner <twerner at debian.org>
-Date: Sun, 25 Apr 2010 20:41:57 +0200
-Subject: [PATCH] fix the startup scripts
-
----
- pdfsam-maine-br1/bin/run-console.sh | 16 ++++++++++++----
- pdfsam-maine-br1/bin/run.sh | 15 ++++++++++++---
- 2 files changed, 24 insertions(+), 7 deletions(-)
-
-diff --git a/pdfsam-maine-br1/bin/run-console.sh b/pdfsam-maine-br1/bin/run-console.sh
-index 66120b2..8b93d96 100644
---- a/pdfsam-maine-br1/bin/run-console.sh
-+++ b/pdfsam-maine-br1/bin/run-console.sh
-@@ -14,15 +14,23 @@ die() {
- exit 1
- }
-
-+# use java-wrappers in Debian:
-+. /usr/lib/java-wrappers/java-wrappers.sh
-+find_java_runtime openjdk sun
-
--DIRNAME="../lib/"
--CONSOLEJAR="$DIRNAME/@CONSOLE_JAR_NAME.jar"
-+
-+DIRNAME="/usr/share/pdfsam/lib"
-+CONSOLEJAR=$(echo $DIRNAME/pdfsam-console-*.jar)
-
- # Setup the classpath
- if [ ! -f "$CONSOLEJAR" ]; then
- die "Missing required file: $CONSOLEJAR"
- fi
--CONSOLE_CLASSPATH="$CONSOLEJAR"
-+
-+for jar in $DIRNAME/*.jar
-+do
-+ CONSOLE_CLASSPATH=$CONSOLE_CLASSPATH:$jar
-+done
-
- # Setup the JVM
- if [ "x$JAVA" = "x" ]; then
-@@ -58,4 +66,4 @@ echo ""
- # Execute the JVM in the foreground
- "$JAVA" $JAVA_OPTS \
- -classpath "$CONSOLE_CLASSPATH" \
-- org.pdfsam.console.ConsoleClient "$@"
-\ No newline at end of file
-+ org.pdfsam.console.ConsoleClient "$@"
-diff --git a/pdfsam-maine-br1/bin/run.sh b/pdfsam-maine-br1/bin/run.sh
-index fb6235a..929cd9b 100644
---- a/pdfsam-maine-br1/bin/run.sh
-+++ b/pdfsam-maine-br1/bin/run.sh
-@@ -14,9 +14,13 @@ die() {
- exit 1
- }
-
-+# use java-wrappers in Debian:
-+. /usr/lib/java-wrappers/java-wrappers.sh
-+find_java_runtime openjdk sun
-
--DIRNAME="../"
--PDFSAMJAR="$DIRNAME/@PDFSAM_JAR_NAME.jar"
-+
-+DIRNAME="/usr/share/pdfsam"
-+PDFSAMJAR=$(echo $DIRNAME/pdfsam-*.jar)
-
- # Setup the classpath
- if [ ! -f "$PDFSAMJAR" ]; then
-@@ -24,6 +28,11 @@ if [ ! -f "$PDFSAMJAR" ]; then
- fi
- PDFSAM_CLASSPATH="$PDFSAMJAR"
-
-+for jar in $DIRNAME/lib/*.jar
-+do
-+ PDFSAM_CLASSPATH=$PDFSAM_CLASSPATH:$jar
-+done
-+
- # Setup the JVM
- if [ "x$JAVA" = "x" ]; then
- if [ "x$JAVA_HOME" != "x" ]; then
-@@ -53,4 +62,4 @@ echo ""
- # Execute the JVM in the foreground
- "$JAVA" $JAVA_OPTS \
- -classpath "$PDFSAM_CLASSPATH" \
-- org.pdfsam.guiclient.GuiClient "$@"
-\ No newline at end of file
-+ org.pdfsam.guiclient.GuiClient "$@"
---
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5c912a7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-prefer-debian-build.xml.patch
-0002-fix-the-startup-scripts.patch
diff --git a/debian/pdfsam.poms b/debian/pdfsam.poms
new file mode 100644
index 0000000..5e13231
--- /dev/null
+++ b/debian/pdfsam.poms
@@ -0,0 +1,43 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+pom.xml
+pdfsam-community/pom.xml
+pdfsam-gui/pom.xml
+pdfsam-i18n/pom.xml
+pdfsam-core/pom.xml
+pdfsam-service/pom.xml
+pdfsam-fx/pom.xml
+pdfsam-merge/pom.xml
+pdfsam-simple-split/pom.xml
+pdfsam-split-by-size/pom.xml
+pdfsam-split-by-bookmarks/pom.xml
+pdfsam-alternate-mix/pom.xml
+pdfsam-rotate/pom.xml
+pdfsam-extract/pom.xml
+pdfsam-docs/pom.xml
+pdfsam-msi-installer/pom.xml
diff --git a/debian/rules b/debian/rules
index 2c8f4ad..2457530 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,26 +1,7 @@
#!/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
-DEB_ANT_BUILDFILE := debian/build.xml
-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:
-
-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
- install -D pdfsam-maine-br1/bin/run.sh \
- $(DEB_DESTDIR)/usr/bin/pdfsam
- install -D pdfsam-maine-br1/bin/run-console.sh \
- $(DEB_DESTDIR)/usr/bin/pdfsam-console
+%:
+ dh $@
get-orig-source:
- uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+ uscan --download-current-version --force-download
diff --git a/debian/watch b/debian/watch
index 5c3ed3c..b3fded9 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
-version=3
-http://sf.net/pdfsam/ pdfsam-([\d\.]*)-out-src.zip debian debian/orig-tar.sh
+version=4
+opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/pdfsam-$1\.tar\.gz/,\
+uversionmangle=s/_/./g;s/\.RELEASE// \
+https://github.com/torakiki/pdfsam/tags .*/v?(\d\S+)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/pdfsam.git
More information about the pkg-java-commits
mailing list