[pdfsam] 27/36: move branch to the correct location

Markus Koschany apo at moszumanska.debian.org
Tue Feb 21 04:20:16 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 8c60b0ae085935f5afa0007bfa664d2ae580fa6c
Author: Torsten Werner <twerner at debian.org>
Date:   Mon Jan 25 17:29:32 2010 +0000

    move branch to the correct location
---
 branch-1.x.y/debian/ant.properties     |   7 -
 branch-1.x.y/debian/build.xml          |  28 --
 branch-1.x.y/debian/changelog          |  50 ----
 branch-1.x.y/debian/compat             |   1 -
 branch-1.x.y/debian/control            |  21 --
 branch-1.x.y/debian/copyright          | 524 ---------------------------------
 branch-1.x.y/debian/install            |  17 --
 branch-1.x.y/debian/orig-tar.exclude   |   5 -
 branch-1.x.y/debian/orig-tar.sh        |  19 --
 branch-1.x.y/debian/patches/build.diff |  56 ----
 branch-1.x.y/debian/patches/run.diff   |  67 -----
 branch-1.x.y/debian/patches/series     |   2 -
 branch-1.x.y/debian/pdfsam.desktop     |  11 -
 branch-1.x.y/debian/rules              |  23 --
 branch-1.x.y/debian/watch              |   2 -
 15 files changed, 833 deletions(-)

diff --git a/branch-1.x.y/debian/ant.properties b/branch-1.x.y/debian/ant.properties
deleted file mode 100644
index 4d6d25b..0000000
--- a/branch-1.x.y/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/branch-1.x.y/debian/build.xml b/branch-1.x.y/debian/build.xml
deleted file mode 100644
index 36d8c5f..0000000
--- a/branch-1.x.y/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/branch-1.x.y/debian/changelog b/branch-1.x.y/debian/changelog
deleted file mode 100644
index a3a60b3..0000000
--- a/branch-1.x.y/debian/changelog
+++ /dev/null
@@ -1,50 +0,0 @@
-pdfsam (1.1.3-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Torsten Werner <twerner at debian.org>  Fri, 05 Jun 2009 23:16:21 +0200
-
-pdfsam (1.1.2-1) unstable; urgency=low
-
-  * New upstream release
-  * Fix start scripts. (Closes: #521585)
-  * Bump up Standards-Version: 3.8.1 (no changes).
-  * Add Depends: ${misc:Depends}.
-
- -- Torsten Werner <twerner at debian.org>  Sun, 12 Apr 2009 19:36:15 +0200
-
-pdfsam (1.1.1-2) unstable; urgency=low
-
-  [ Miguel Landaeta ]
-  * Change Depends: openjdk-6-jre | java2-runtime. (Closes: #519235)
-
- -- Torsten Werner <twerner at debian.org>  Wed, 25 Mar 2009 22:05:07 +0100
-
-pdfsam (1.1.1-1) unstable; urgency=low
-
-  * New upstream release
-  * Refresh patch run.diff.
-
- -- Torsten Werner <twerner at debian.org>  Tue, 17 Feb 2009 22:48:35 +0100
-
-pdfsam (1.1.0-1) unstable; urgency=low
-
-  * New upstream release
-  * Refresh our patches.
-
- -- Torsten Werner <twerner at debian.org>  Thu, 01 Jan 2009 01:40:52 +0100
-
-pdfsam (1.0.3-1) unstable; urgency=low
-
-  * new upstream release
-  * Add missing copyright information.
-  * Upload package again. (Closes: #496687)
-  * Refresh the patches.
-
- -- Torsten Werner <twerner at debian.org>  Mon, 03 Nov 2008 21:15:23 +0100
-
-pdfsam (1.0.1-1) unstable; urgency=low
-
-  * Initial release. (Closes: #496687)
-
- -- Torsten Werner <twerner at debian.org>  Tue, 26 Aug 2008 20:36:24 +0200
diff --git a/branch-1.x.y/debian/compat b/branch-1.x.y/debian/compat
deleted file mode 100644
index 7ed6ff8..0000000
--- a/branch-1.x.y/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/branch-1.x.y/debian/control b/branch-1.x.y/debian/control
deleted file mode 100644
index c878639..0000000
--- a/branch-1.x.y/debian/control
+++ /dev/null
@@ -1,21 +0,0 @@
-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 (>= 5), default-jdk-builddep, 
- libdom4j-java, libitext-java (>= 2), libjaxen-java, libjgoodies-looks-java,
- liblog4j1.2-java, quilt
-Standards-Version: 3.8.1
-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/
-
-Package: pdfsam
-Architecture: all
-Depends: openjdk-6-jre | java2-runtime, libdom4j-java, libitext-java,
- libjaxen-java, libjgoodies-looks-java, liblog4j1.2-java, ${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
- interface to let the user choose pdf files, split or merge them.
diff --git a/branch-1.x.y/debian/copyright b/branch-1.x.y/debian/copyright
deleted file mode 100644
index d4eee81..0000000
--- a/branch-1.x.y/debian/copyright
+++ /dev/null
@@ -1,524 +0,0 @@
-This package was debianized by Torsten Werner <twerner at debian.org> on
-Tue Aug 26 20:41:49 CEST 2008
-
-It was downloaded from
-http://sourceforge.net/project/showfiles.php?group_id=160044
-
-Most of the code is
-Copyright: 2006-2008 Andrea Vacondio <andrea.vacondio at gmail.com>
-
-The file
-pdfsam-console-br1/src/java/org/pdfsam/console/business/pdf/handlers/UnpackCmdExecutor.java
-is
-
-Copyright (c) 2005-2007 Paulo Soares, Bruno Lowagie, Carsten Hammer
-
-The files in pdfsam-langpack/src/java/org/pdfsam/i18n/resources/ are
-
-Copyright (c) 2006-2008 Rosetta Contributors and Canonical Ltd
-
-The file pdfsam-langpack/src/java/org/pdfsam/i18n/GettextResource.java
-is
-
-Copyright (C) 2001 Free Software Foundation, Inc.
-
-License:
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-The full text of the GLP-2 can be found in
-`/usr/share/common-licenses/GPL-2' on Debian systems.
-
----------------------------------------------------------------------------
-
-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:
-
-  The contents of this file are subject to the Mozilla Public License Version
-  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
-  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. 
-  
-  1.1. "Contributor"
-      means each entity that creates or contributes to the creation of
-      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. 
-  
-  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. 
-  
-  1.4. "Electronic Distribution Mechanism"
-      means a mechanism generally accepted in the software development
-      community for the electronic transfer of data. 
-  
-  1.5. "Executable"
-      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. 
-  
-  1.7. "Larger Work"
-      means a work which combines Covered Code or portions thereof with
-      code not governed by the terms of this License. 
-  
-  1.8. "License"
-      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. 
-  
-  1.9. "Modifications"
-
-      means any addition to or deletion from the substance or structure
-      of either the Original Code or any previous Modifications. When
-      Covered Code is released as a series of files, a Modification is:
-
-	 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. 
-
-  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. 
-  
-  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. 
-  
-  1.11. "Source Code"
-      means the preferred form of the Covered Code for making
-      modifications to it, including all modules it contains, plus any
-      associated interface definition files, scripts used to control
-      compilation and installation of an Executable, or source code
-      differential comparisons against either the Original Code or
-      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. 
-  
-  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
-      version of this License issued under Section 6.1. For legal
-      entities, "You" includes any entity which controls, is controlled
-      by, or is under common control with You. For purposes of this
-      definition, "control" means (a) the power, direct or indirect, to
-      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. 
-
-  2. Source Code License.
-  2.1. The Initial Developer Grant.
-
-  The Initial Developer hereby grants You a world-wide, royalty-free,
-  non-exclusive license, subject to third party intellectual property
-  claims:
-
-     1. under intellectual property rights (other than patent or
-     trademark) Licensable by Initial Developer to use, reproduce,
-     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. 
-
-  2.2. Contributor Grant.
-
-  Subject to third party intellectual property claims, each Contributor
-  hereby grants You a world-wide, royalty-free, non-exclusive license
-
-     1. under intellectual property rights (other than patent or
-     trademark) Licensable by Contributor, to use, reproduce, modify,
-     display, perform, sublicense and distribute the Modifications
-     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
-     combination), to make, use, sell, offer for sale, have made, and/or
-     otherwise dispose of: 1) Modifications made by that Contributor (or
-     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)
-     for infringements caused by: i) third party modifications of
-     Contributor Version or ii) the combination of Modifications made by
-     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. 
-
-  3. Distribution Obligations.
-  3.1. Application of License.
-
-  The Modifications which You create or to which You contribute are
-  governed by the terms of this License, including without limitation
-  Section 2.2. The Source Code version of Covered Code may be
-  distributed only under the terms of this License or a future version
-  of this License released under Section 6.1, and You must include a
-  copy of this License with every copy of the Source Code You
-  distribute. You may not offer or impose any terms on any Source Code
-  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
-  made available in Source Code form under the terms of this License
-  either on the same media as an Executable version or via an accepted
-  Electronic Distribution Mechanism to anyone to whom you made an
-  Executable version available; and if made available via Electronic
-  Distribution Mechanism, must remain available for at least twelve (12)
-  months after the date it initially became available, or at least six
-  (6) months after a subsequent version of that particular Modification
-  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
-  file documenting the changes You made to create that Covered Code and
-  the date of any change. You must include a prominent statement that
-  the Modification is derived, directly or indirectly, from Original
-  Code provided by the Initial Developer and including the name of the
-  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
-  intellectual property rights is required to exercise the rights
-  granted by such Contributor under Sections 2.1 or 2.2, Contributor
-  must include a text file with the Source Code distribution titled
-  "LEGAL" which describes the claim and the party making the claim in
-  sufficient detail that a recipient will know whom to contact. If
-  Contributor obtains such knowledge after the Modification is made
-  available as described in Section 3.2, Contributor shall promptly
-  modify the LEGAL file in all copies Contributor makes available
-  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
-  Code. If it is not possible to put such notice in a particular Source
-  Code file due to its structure, then You must include such notice in a
-  location (such as a relevant directory) where a user would be likely
-  to look for such a notice. If You created one or more Modification(s)
-  You may add your name as a Contributor to the notice described in
-  Exhibit A. You must also duplicate this License in any documentation
-  for the Source Code where You describe recipients' rights or ownership
-  rights relating to Covered Code. You may choose to offer, and to
-  charge a fee for, warranty, support, indemnity or liability
-  obligations to one or more recipients of Covered Code. However, You
-  may do so only on Your own behalf, and not on behalf of the Initial
-  Developer or any Contributor. You must make it absolutely clear than
-  any such warranty, support, indemnity or liability obligation is
-  offered by You alone, and You hereby agree to indemnify the Initial
-  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
-  requirements of Sections 3.1, 3.2, 3.3, 3.4 and 3.5 have been met for
-  that Covered Code, and if You include a notice stating that the Source
-  Code version of the Covered Code is available under the terms of this
-  License, including a description of how and where You have fulfilled
-  the obligations of Section 3.2. The notice must be conspicuously
-  included in any notice in an Executable version, related documentation
-  or collateral in which You describe recipients' rights relating to the
-  Covered Code. You may distribute the Executable version of Covered
-  Code or ownership rights under a license of Your choice, which may
-  contain terms different from this License, provided that You are in
-  compliance with the terms of this License and that the license for the
-  Executable version does not attempt to limit or alter the recipient's
-  rights in the Source Code version from the rights set forth in this
-  License. If You distribute the Executable version under a different
-  license You must make it absolutely clear that any terms which differ
-  from this License are offered by You alone, not by the Initial
-  Developer or any Contributor. You hereby agree to indemnify the
-  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
-  License with respect to some or all of the Covered Code due to
-  statute, judicial order, or regulation then You must: (a) comply with
-  the terms of this License to the maximum extent possible; and (b)
-  describe the limitations and the code they affect. Such description
-  must be included in the legal file described in Section 3.4 and must
-  be included with all distributions of the Source Code. Except to the
-  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
-  License, You may always continue to use it under the terms of that
-  version. You may also choose to use such Covered Code under the terms
-  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
-  only do in order to apply it to code which is not already Covered Code
-  governed by this License), You must (a) rename Your license so that
-  the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", "MPL", "NPL"
-  or any confusingly similar phrase do not appear in your license
-  (except to note that your license differs from this License) and (b)
-  otherwise make it clear that Your version of the license contains
-  terms which differ from the Mozilla Public License and Netscape Public
-  License. (Filling in the name of the Initial Developer, Original Code
-  or Contributor in the notice described in Exhibit A shall not of
-  themselves be deemed to be modifications of this License.)
-
-  7. Disclaimer of warranty
-
-  Covered code is provided under this license on an "as is" basis,
-  without warranty of any kind, either expressed or implied, including,
-  without limitation, warranties that the covered code is free of
-  defects, merchantable, fit for a particular purpose or non-infringing.
-  The entire risk as to the quality and performance of the covered code
-  is with you. Should any covered code prove defective in any respect,
-  you (not the initial developer or any other contributor) assume the
-  cost of any necessary servicing, repair or correction. This disclaimer
-  of warranty constitutes an essential part of this license. No use of
-  any covered code is authorized hereunder except under this disclaimer.
-  8. Termination
-
-  8.1. This License and the rights granted hereunder will terminate
-  automatically if You fail to comply with terms herein and fail to cure
-  such breach within 30 days of becoming aware of the breach. All
-  sublicenses to the Covered Code which are properly granted shall
-  survive any termination of this License. Provisions which, by their
-  nature, must remain in effect beyond the termination of this License
-  shall survive.
-
-  8.2. If You initiate litigation by asserting a patent infringement
-  claim (excluding declatory judgment actions) against Initial Developer
-  or a Contributor (the Initial Developer or Contributor against whom
-  You file such action is referred to as "Participant") alleging that:
-
-     1. such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate
-     prospectively, unless if within 60 days after receipt of notice You
-     either: (i) agree in writing to pay Participant a mutually
-     agreeable reasonable royalty for Your past and future use of
-     Modifications made by such Participant, or (ii) withdraw Your
-     litigation claim with respect to the Contributor Version against
-     such Participant. If within 60 days of notice, a reasonable royalty
-     and payment arrangement are not mutually agreed upon in writing by
-     the parties or the litigation claim is not withdrawn, the rights
-     granted by Participant to You under Sections 2.1 and/or 2.2
-     automatically terminate at the expiration of the 60 day notice
-     period specified above.
-
-     2. any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent,
-     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. 
-
-  8.3. If You assert a patent infringement claim against Participant
-  alleging that such Participant's Contributor Version directly or
-  indirectly infringes any patent where such claim is resolved (such as
-  by license or settlement) prior to the initiation of patent
-  infringement litigation, then the reasonable value of the licenses
-  granted by such Participant under Sections 2.1 or 2.2 shall be taken
-  into account in determining the amount or value of any payment or
-  license.
-
-  8.4. In the event of termination under Sections 8.1 or 8.2 above, all
-  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
-  (including negligence), contract, or otherwise, shall you, the initial
-  developer, any other contributor, or any distributor of covered code,
-  or any supplier of any of such parties, be liable to any person for
-  any indirect, special, incidental, or consequential damages of any
-  character including, without limitation, damages for loss of goodwill,
-  work stoppage, computer failure or malfunction, or any and all other
-  commercial damages or losses, even if such party shall have been
-  informed of the possibility of such damages. This limitation of
-  liability shall not apply to liability for death or personal injury
-  resulting from such party's negligence to the extent applicable law
-  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
-  C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software"
-  and "commercial computer software documentation," as such terms are
-  used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R.
-  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
-  matter hereof. If any provision of this License is held to be
-  unenforceable, such provision shall be reformed only to the extent
-  necessary to make it enforceable. This License shall be governed by
-  California law provisions (except to the extent applicable law, if
-  any, provides otherwise), excluding its conflict-of-law provisions.
-  With respect to disputes in which at least one party is a citizen of,
-  or an entity chartered or registered to do business in the United
-  States of America, any litigation relating to this License shall be
-  subject to the jurisdiction of the Federal Courts of the Northern
-  District of California, with venue lying in Santa Clara County,
-  California, with the losing party responsible for costs, including
-  without limitation, court costs and reasonable attorneys' fees and
-  expenses. The application of the United Nations Convention on
-  Contracts for the International Sale of Goods is expressly excluded.
-  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
-  responsible for claims and damages arising, directly or indirectly,
-  out of its utilization of rights under this License and You agree to
-  work with Initial Developer and Contributors to distribute such
-  responsibility on an equitable basis. Nothing herein is intended or
-  shall be deemed to constitute any admission of liability.
-
-  13. Multiple-licensed code
-
-  Initial Developer may designate portions of the Covered Code as
-  "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. 
-
diff --git a/branch-1.x.y/debian/install b/branch-1.x.y/debian/install
deleted file mode 100644
index b0af030..0000000
--- a/branch-1.x.y/debian/install
+++ /dev/null
@@ -1,17 +0,0 @@
-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/
diff --git a/branch-1.x.y/debian/orig-tar.exclude b/branch-1.x.y/debian/orig-tar.exclude
deleted file mode 100644
index 754aab8..0000000
--- a/branch-1.x.y/debian/orig-tar.exclude
+++ /dev/null
@@ -1,5 +0,0 @@
-*/apidocs/*
-*.exe
-*.jar
-*.o
-*.pdf
diff --git a/branch-1.x.y/debian/orig-tar.sh b/branch-1.x.y/debian/orig-tar.sh
deleted file mode 100755
index 4220d8a..0000000
--- a/branch-1.x.y/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/branch-1.x.y/debian/patches/build.diff b/branch-1.x.y/debian/patches/build.diff
deleted file mode 100644
index 9591f3b..0000000
--- a/branch-1.x.y/debian/patches/build.diff
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: pdfsam-1.1.0/pdfsam-maine-br1/ant/build.xml
-===================================================================
---- pdfsam-1.1.0.orig/pdfsam-maine-br1/ant/build.xml	2008-11-27 18:53:04.000000000 +0100
-+++ pdfsam-1.1.0/pdfsam-maine-br1/ant/build.xml	2009-01-01 01:38:47.000000000 +0100
-@@ -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/branch-1.x.y/debian/patches/run.diff b/branch-1.x.y/debian/patches/run.diff
deleted file mode 100644
index ddeaaf8..0000000
--- a/branch-1.x.y/debian/patches/run.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: pdfsam-1.1.2/pdfsam-maine-br1/bin/run-console.sh
-===================================================================
---- pdfsam-1.1.2.orig/pdfsam-maine-br1/bin/run-console.sh	2009-03-16 18:26:14.000000000 +0100
-+++ pdfsam-1.1.2/pdfsam-maine-br1/bin/run-console.sh	2009-04-12 19:32:02.000000000 +0200
-@@ -15,14 +15,18 @@
- }
- 
- 
--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
-@@ -53,4 +57,4 @@
- # 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 "$@"
-Index: pdfsam-1.1.2/pdfsam-maine-br1/bin/run.sh
-===================================================================
---- pdfsam-1.1.2.orig/pdfsam-maine-br1/bin/run.sh	2009-03-16 18:26:04.000000000 +0100
-+++ pdfsam-1.1.2/pdfsam-maine-br1/bin/run.sh	2009-04-12 19:32:50.000000000 +0200
-@@ -15,8 +15,8 @@
- }
- 
- 
--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 +24,11 @@
- 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 +58,4 @@
- # 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/branch-1.x.y/debian/patches/series b/branch-1.x.y/debian/patches/series
deleted file mode 100644
index 21c603c..0000000
--- a/branch-1.x.y/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-build.diff
-run.diff
diff --git a/branch-1.x.y/debian/pdfsam.desktop b/branch-1.x.y/debian/pdfsam.desktop
deleted file mode 100644
index 511ba33..0000000
--- a/branch-1.x.y/debian/pdfsam.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=pdfsam
-GenericName=PDF split and merge
-GenericName[de]=PDF teilen und zusammenführen
-Comment=A tool to split and merge pdf documents
-Comment[de]=Ein Werkzeug zur Trennung oder Zusammenführung von PDF-Dokumenten
-Exec=pdfsam
-Terminal=false
-Categories=Office;
-Icon=/usr/share/pdfsam/pdf.png
-Type=Application
diff --git a/branch-1.x.y/debian/rules b/branch-1.x.y/debian/rules
deleted file mode 100755
index c893e32..0000000
--- a/branch-1.x.y/debian/rules
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.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:
-
-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
-
-get-orig-source:
-	-uscan --upstream-version 0 --rename    
diff --git a/branch-1.x.y/debian/watch b/branch-1.x.y/debian/watch
deleted file mode 100644
index 5c3ed3c..0000000
--- a/branch-1.x.y/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/pdfsam/ pdfsam-([\d\.]*)-out-src.zip debian debian/orig-tar.sh

-- 
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