[azureus] 02/04: Remove trailing whitespace

Thu Aug 20 19:36:19 UTC 2015

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository azureus.

commit 61c19d27eb0fbce95f9dcf62092de6ec89728956
Author: Markus Koschany <apo at gambaru.de>
Date:   Thu Aug 20 21:03:41 2015 +0200

    Remove trailing whitespace
---
 debian/README.Debian    |   4 +-
 debian/README.multiuser |  52 +++++-----
 debian/azureus.manifest |   4 +-
 debian/changelog        |  27 ++---
 debian/control          |   2 +-
 debian/copyright        | 262 ++++++++++++++++++++++++------------------------
 debian/watch            |   2 +-
 7 files changed, 177 insertions(+), 176 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index f04a7a3..95f7f8c 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -4,8 +4,8 @@ azureus for Debian
  * Azureus in Debian will start the classic interface by default when the vuze package
    isn't installed.
    If it is, then the azureus executable will start the user preferred's interface.
- * Please note that the new interface won't work without the vuze package installed, 
-   so if you need to use it, install that package first. 
+ * Please note that the new interface won't work without the vuze package installed,
+   so if you need to use it, install that package first.
  * The vuze package is actually kind of dummy package, providing the dependencies
    necessary to run the new interface.
  * Azureus in Debian has been patched to prevent updates to the Core and SWT components,
diff --git a/debian/README.multiuser b/debian/README.multiuser
index e2812e0..4336008 100644
--- a/debian/README.multiuser
+++ b/debian/README.multiuser
@@ -8,77 +8,77 @@ This package contains a patch to fix Launchpad bug 222630,
 Rationale
 ---------
 
-Azureus uses tcp port 6880 bound to localhost for instance detection and 
+Azureus uses tcp port 6880 bound to localhost for instance detection and
 command-line parameter passing.
 
 This implementation has the following drawbacks:
 
-  - It is not possible to run more than one instance per machine. Port 6880 is 
+  - It is not possible to run more than one instance per machine. Port 6880 is
     hard coded.
 
-  - Any local user can control another user's instance by passing command line 
+  - Any local user can control another user's instance by passing command line
     arguments. This is a security vulnerability.
-     
-A single-user system seems to be assumed. This patch restores user's environment 
+
+A single-user system seems to be assumed. This patch restores user's environment
 isolation.
 
 
 Design
 ------
 
-Listen port 6880 is substituted by a random port allocated in the ephemeral 
-range 49152-65535, as per IANA specification. The listener also chooses a random 
-key that must be sent by connecting clients as authentication. The port number 
-and the key are then saved in the localport.lock file in the Azureus 
+Listen port 6880 is substituted by a random port allocated in the ephemeral
+range 49152-65535, as per IANA specification. The listener also chooses a random
+key that must be sent by connecting clients as authentication. The port number
+and the key are then saved in the localport.lock file in the Azureus
 configuration directory, which is in the user's home and thus private.
 
-A new instance checks for the presence of the lock file. If it is found the port 
+A new instance checks for the presence of the lock file. If it is found the port
 and the key are used to connect to the running instance.
 
 
 Implementation
 --------------
 
-The patch is designed to have minimum impact on the codebase to facilitate 
+The patch is designed to have minimum impact on the codebase to facilitate
 merging of future upstream versions.
 
-It is to be noted that there is a certain amount of code duplication in Azureus: 
+It is to be noted that there is a certain amount of code duplication in Azureus:
 most different UIs have their own code for managing port 6880.
 
-A new class, org.gudy.azureus2.core3.util.LocalSocketHelper, is introduced. This 
-class, with its connect() and listen() methods, is a drop-in replacement for any 
-call to "new Socket(...)" and new "ServerSocket(...)" involving port 6880. Port 
+A new class, org.gudy.azureus2.core3.util.LocalSocketHelper, is introduced. This
+class, with its connect() and listen() methods, is a drop-in replacement for any
+call to "new Socket(...)" and new "ServerSocket(...)" involving port 6880. Port
 selection and authentication are handled automatically.
 
-The rest of the modifications are mostly one line changes implementing the 
-substitution described above. In addition, references to port 6880 are removed 
-from all code involving port selection. Port validation logic that used to 
+The rest of the modifications are mostly one line changes implementing the
+substitution described above. In addition, references to port 6880 are removed
+from all code involving port selection. Port validation logic that used to
 exclude port 6880 has been updated to respect the ephemeral range instead.
 
 
 Possible issues
 ---------------
 
-The call to SystemProperties.getUserPath() in LocalSocketHelper() can cause 
-PlatformManager to be initialized sooner than it should. It seems to work, but 
-upstream says this is not advisable. As a workaround -Dazureus.config.path is 
-passed on the command line, avoiding the invocation of the platform-specific 
+The call to SystemProperties.getUserPath() in LocalSocketHelper() can cause
+PlatformManager to be initialized sooner than it should. It seems to work, but
+upstream says this is not advisable. As a workaround -Dazureus.config.path is
+passed on the command line, avoiding the invocation of the platform-specific
 code that discovers the user's home directory.
 
 
 Note for mergers
 ----------------
 
-When merging a new upstream version, the merger should search for "6880" and 
-apply the correct substitution. Also, any port selection in the range x-65535 
+When merging a new upstream version, the merger should search for "6880" and
+apply the correct substitution. Also, any port selection in the range x-65535
 should be done in the range x-49151 instead.
 
 
 Further development
 -------------------
 
-This patch is a quick fix, a proper rewrite is desirable. Any efforts should 
-start with reducing code duplication. That would increase the chances of this 
+This patch is a quick fix, a proper rewrite is desirable. Any efforts should
+start with reducing code duplication. That would increase the chances of this
 being accepted upstream.
 
 
diff --git a/debian/azureus.manifest b/debian/azureus.manifest
index b67a831..6806204 100644
--- a/debian/azureus.manifest
+++ b/debian/azureus.manifest
@@ -1,4 +1,4 @@
 usr/share/java/azureus.jar:
- Class-Path: /usr/share/java/commons-cli.jar /usr/share/java/log4j-1.2.jar /usr/share/java/swt-gtk-4.3.jar 
- Main-Class: org.gudy.azureus2.ui.common.Main 
+ Class-Path: /usr/share/java/commons-cli.jar /usr/share/java/log4j-1.2.jar /usr/share/java/swt-gtk-4.3.jar
+ Main-Class: org.gudy.azureus2.ui.common.Main
  Debian-Java-Home: /usr/lib/jvm/default-java
diff --git a/debian/changelog b/debian/changelog
index 3df0e91..6ba8cd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ azureus (5.6.2.0-1) UNRELEASED; urgency=medium
   * Upgrade to latest upstream version. (Closes: #724867, #642189)
   * Updated dependency on swt3 to swt4. (Closes: #588033, #638026)
   * Adopt the azureus package. (Closes: #710908)
-  * Switch to dh with javahelper build system. 
+  * Switch to dh with javahelper build system.
   * Checkout source from svn to get build files.
   * Exclude jars and non-Linux platform-specific files from upstream tarball.
   * Unbundle json simple to use Debian dependency.
@@ -22,6 +22,7 @@ azureus (5.6.2.0-1) UNRELEASED; urgency=medium
 
   [ Markus Koschany ]
   * debian/control: Use cgit and https for Vcs-Browser.
+  * vuze.desktop: Add keywords and remove encoding key.
 
  -- Stephen Nelson <stephen at eccostudio.com>  Wed, 12 Aug 2015 22:10:44 +0100
 
@@ -74,11 +75,11 @@ azureus (4.3.0.6-1) unstable; urgency=low
 
 azureus (4.3.0.0-1) unstable; urgency=low
 
-  * New upstream release. 
+  * New upstream release.
   * Use "3.0 (quilt)" source package format.
   * debian/control: Allow uploads for Debian Maintainers.
   * debian/azureus.1: Get rid of duplicate "azureus" around Synopsis.
-  * debian/patches: 
+  * debian/patches:
     - Remove fixes/multi-announce-deadlock.diff. Reason: upstream.
     - Remove fixes/utf8-encoding.diff. Reason: upstream.
     - Remove fixes/encoding.diff. Reason: unneeded.
@@ -90,10 +91,10 @@ azureus (4.3.0.0-1) unstable; urgency=low
 azureus (4.2.0.8-3) unstable; urgency=low
 
   * debian/patches:
-    - Fix multi-announce torrent issues. Closes: #551363. 
-      Thanks: Arron Mogge. 
+    - Fix multi-announce torrent issues. Closes: #551363.
+      Thanks: Arron Mogge.
     - Refresh patches now that DEP-3 is git-alike.
-  * debian/rules: Change new deprecated variable PATCHES_DIR by 
+  * debian/rules: Change new deprecated variable PATCHES_DIR by
     QUILT_PATCH_DIR.
 
  -- Adrian Perez <adrianperez.deb at gmail.com>  Fri, 23 Oct 2009 15:02:04 -0400
@@ -134,10 +135,10 @@ azureus (4.2.0.4-1) unstable; urgency=low
     - Update maintainer.
     - Update Standards-Version to 3.8.2.
     - Add Homepage field.
-    - Update Vuze description to reflect some of it's new features and 
+    - Update Vuze description to reflect some of it's new features and
       the package role.
     - Build-Depends on ant, cdbs, quilt, debhelper (>= 7.0).
-    - Build-Depends-Indep on openjdk-6-jre | sun-java5-jre | 
+    - Build-Depends-Indep on openjdk-6-jre | sun-java5-jre |
       sun-java6-jre. Closes: #515015, #398014.
     - Drop fastjar build dependency.
     - Add Vcs-Svn and Vcs-Browser fields.
@@ -152,9 +153,9 @@ azureus (4.2.0.4-1) unstable; urgency=low
     - multiuser.patch: Import multiuser patch. Closes: #329018.
       Thanks to Stefano Maioli.
     - Disable component update patches: Closes: #455351.
-        + updater-dont-initialize-swt-updatechecker.patch: 
-          Prevent Azureus' updater from upgrading SWT libraries.  
-        + updater-dont-register-core-updatechecker.patch: 
+        + updater-dont-initialize-swt-updatechecker.patch:
+          Prevent Azureus' updater from upgrading SWT libraries.
+        + updater-dont-register-core-updatechecker.patch:
           Prevent Azureus' updater from upgrading the core version of Azureus.
     - Add patch descriptions, with DEP-3 compliance.
   * debian/copyright:
@@ -164,7 +165,7 @@ azureus (4.2.0.4-1) unstable; urgency=low
   * debian/watch: Update file.
   * debian/compat: Bump compatibility to 7.
   * debian/docs: Remove reference to README.txt.
-  * debian/azureus.desktop: 
+  * debian/azureus.desktop:
     - Fix handling file associations. Closes: #491624.
       Thanks to Stefano Maioli.
   * debian/vuze.links: usr/bin/vuze is now a symbolic link to azureus.
@@ -183,7 +184,7 @@ azureus (4.2.0.4-1) unstable; urgency=low
   * debian/wrappers/azureus:
     - Detect installed JVM and set classpath.
     - User interface override applies only when vuze is not installed.
-  
+
  -- Adrian Perez <adrianperez.deb at gmail.com>  Wed, 12 Aug 2009 11:35:24 -0400
 
 azureus (3.1.1.0-4) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index ab15cf7..582b958 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: azureus 
+Source: azureus
 Section: net
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
diff --git a/debian/copyright b/debian/copyright
index d2a27b9..30a37ef 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,13 +12,13 @@ Copyright: 2000-2003, IBM Corporation
 License: CPL
 
 Files: azureus2/src/com/aelitis/azureus/core/peermanager/utils/BTPeerIDByteDecoder.java
-Copyright: 2003-2006, Azureus Software Inc 
+Copyright: 2003-2006, Azureus Software Inc
            2002-2004, Alon Rohter
 License: GPL-2+
 
 Files: azureus2/src/org/gudy/azureus2/* uis/src/org/gudy/azureus2/*
 Copyright: 2008-2009, Vuze Inc
-           2003-2009, Azureus Software Inc 
+           2003-2009, Azureus Software Inc
 License: GPL-2
 
 Files: azureus2/src/org/gudy/azureus2/core3/util/BrokenMd5Hasher.java
@@ -89,15 +89,15 @@ License: LGPL-2.1
  License can be found in /usr/share/common-licenses/LGPL-2.1.
 
 License: CPL
- THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC 
- LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM 
+ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
+ LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
  CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
  .
  1. DEFINITIONS
  .
  "Contribution" means:
  .
-     a) in the case of the initial Contributor, the initial code and 
+     a) in the case of the initial Contributor, the initial code and
  documentation distributed under this Agreement, and
  .
      b) in the case of each subsequent Contributor:
@@ -106,83 +106,83 @@ License: CPL
  .
      ii) additions to the Program;
  .
-     where such changes and/or additions to the Program originate from and are 
- distributed by that particular Contributor. A Contribution 'originates' from a 
- Contributor if it was added to the Program by such Contributor itself or anyone 
- acting on such Contributor's behalf. Contributions do not include additions to 
- the Program which: (i) are separate modules of software distributed in 
- conjunction with the Program under their own license agreement, and (ii) are 
+     where such changes and/or additions to the Program originate from and are
+ distributed by that particular Contributor. A Contribution 'originates' from a
+ Contributor if it was added to the Program by such Contributor itself or anyone
+ acting on such Contributor's behalf. Contributions do not include additions to
+ the Program which: (i) are separate modules of software distributed in
+ conjunction with the Program under their own license agreement, and (ii) are
  not derivative works of the Program.
  .
  "Contributor" means any person or entity that distributes the Program.
  .
- "Licensed Patents " mean patent claims licensable by a Contributor which are 
- necessarily infringed by the use or sale of its Contribution alone or when 
+ "Licensed Patents " mean patent claims licensable by a Contributor which are
+ necessarily infringed by the use or sale of its Contribution alone or when
  combined with the Program.
  .
  "Program" means the Contributions distributed in accordance with this Agreement.
  .
- "Recipient" means anyone who receives the Program under this Agreement, 
+ "Recipient" means anyone who receives the Program under this Agreement,
  including all Contributors.
  .
  2. GRANT OF RIGHTS
  .
-     a) Subject to the terms of this Agreement, each Contributor hereby grants 
- Recipient a non-exclusive, worldwide, royalty-free copyright license to 
- reproduce, prepare derivative works of, publicly display, publicly perform, 
- distribute and sublicense the Contribution of such Contributor, if any, and 
+     a) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free copyright license to
+ reproduce, prepare derivative works of, publicly display, publicly perform,
+ distribute and sublicense the Contribution of such Contributor, if any, and
  such derivative works, in source code and object code form.
  .
-     b) Subject to the terms of this Agreement, each Contributor hereby grants 
- Recipient a non-exclusive, worldwide, royalty-free patent license under 
- Licensed Patents to make, use, sell, offer to sell, import and otherwise 
- transfer the Contribution of such Contributor, if any, in source code and 
- object code form. This patent license shall apply to the combination of the 
- Contribution and the Program if, at the time the Contribution is added by the 
- Contributor, such addition of the Contribution causes such combination to be 
- covered by the Licensed Patents. The patent license shall not apply to any 
- other combinations which include the Contribution. No hardware per se is 
+     b) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free patent license under
+ Licensed Patents to make, use, sell, offer to sell, import and otherwise
+ transfer the Contribution of such Contributor, if any, in source code and
+ object code form. This patent license shall apply to the combination of the
+ Contribution and the Program if, at the time the Contribution is added by the
+ Contributor, such addition of the Contribution causes such combination to be
+ covered by the Licensed Patents. The patent license shall not apply to any
+ other combinations which include the Contribution. No hardware per se is
  licensed hereunder.
  .
-     c) Recipient understands that although each Contributor grants the licenses 
- to its Contributions set forth herein, no assurances are provided by any 
- Contributor that the Program does not infringe the patent or other intellectual 
- property rights of any other entity. Each Contributor disclaims any liability 
- to Recipient for claims brought by any other entity based on infringement of 
- intellectual property rights or otherwise. As a condition to exercising the 
- rights and licenses granted hereunder, each Recipient hereby assumes sole 
- responsibility to secure any other intellectual property rights needed, if any. 
- For example, if a third party patent license is required to allow Recipient to 
- distribute the Program, it is Recipient's responsibility to acquire that 
+     c) Recipient understands that although each Contributor grants the licenses
+ to its Contributions set forth herein, no assurances are provided by any
+ Contributor that the Program does not infringe the patent or other intellectual
+ property rights of any other entity. Each Contributor disclaims any liability
+ to Recipient for claims brought by any other entity based on infringement of
+ intellectual property rights or otherwise. As a condition to exercising the
+ rights and licenses granted hereunder, each Recipient hereby assumes sole
+ responsibility to secure any other intellectual property rights needed, if any.
+ For example, if a third party patent license is required to allow Recipient to
+ distribute the Program, it is Recipient's responsibility to acquire that
  license before distributing the Program.
  .
-     d) Each Contributor represents that to its knowledge it has sufficient 
- copyright rights in its Contribution, if any, to grant the copyright license 
+     d) Each Contributor represents that to its knowledge it has sufficient
+ copyright rights in its Contribution, if any, to grant the copyright license
  set forth in this Agreement.
  .
  3. REQUIREMENTS
  .
- A Contributor may choose to distribute the Program in object code form under 
+ A Contributor may choose to distribute the Program in object code form under
  its own license agreement, provided that:
  .
      a) it complies with the terms and conditions of this Agreement; and
  .
      b) its license agreement:
  .
-     i) effectively disclaims on behalf of all Contributors all warranties and 
- conditions, express and implied, including warranties or conditions of title 
- and non-infringement, and implied warranties or conditions of merchantability 
+     i) effectively disclaims on behalf of all Contributors all warranties and
+ conditions, express and implied, including warranties or conditions of title
+ and non-infringement, and implied warranties or conditions of merchantability
  and fitness for a particular purpose;
  .
-     ii) effectively excludes on behalf of all Contributors all liability for 
- damages, including direct, indirect, special, incidental and consequential 
+     ii) effectively excludes on behalf of all Contributors all liability for
+ damages, including direct, indirect, special, incidental and consequential
  damages, such as lost profits;
  .
-     iii) states that any provisions which differ from this Agreement are 
+     iii) states that any provisions which differ from this Agreement are
  offered by that Contributor alone and not by any other party; and
  .
-     iv) states that source code for the Program is available from such 
- Contributor, and informs licensees how to obtain it in a reasonable manner on 
+     iv) states that source code for the Program is available from such
+ Contributor, and informs licensees how to obtain it in a reasonable manner on
  or through a medium customarily used for software exchange.
  .
  When the Program is made available in source code form:
@@ -191,115 +191,115 @@ License: CPL
  .
      b) a copy of this Agreement must be included with each copy of the Program.
  .
- Contributors may not remove or alter any copyright notices contained within the 
+ Contributors may not remove or alter any copyright notices contained within the
  Program.
  .
- Each Contributor must identify itself as the originator of its Contribution, if 
- any, in a manner that reasonably allows subsequent Recipients to identify the 
+ Each Contributor must identify itself as the originator of its Contribution, if
+ any, in a manner that reasonably allows subsequent Recipients to identify the
  originator of the Contribution.
  .
  4. COMMERCIAL DISTRIBUTION
  .
- Commercial distributors of software may accept certain responsibilities with 
- respect to end users, business partners and the like. While this license is 
- intended to facilitate the commercial use of the Program, the Contributor who 
- includes the Program in a commercial product offering should do so in a manner 
- which does not create potential liability for other Contributors. Therefore, if 
- a Contributor includes the Program in a commercial product offering, such 
- Contributor ("Commercial Contributor") hereby agrees to defend and indemnify 
- every other Contributor ("Indemnified Contributor") against any losses, damages 
- and costs (collectively "Losses") arising from claims, lawsuits and other legal 
- actions brought by a third party against the Indemnified Contributor to the 
- extent caused by the acts or omissions of such Commercial Contributor in 
- connection with its distribution of the Program in a commercial product 
- offering. The obligations in this section do not apply to any claims or Losses 
- relating to any actual or alleged intellectual property infringement. In order 
- to qualify, an Indemnified Contributor must: a) promptly notify the Commercial 
- Contributor in writing of such claim, and b) allow the Commercial Contributor 
- to control, and cooperate with the Commercial Contributor in, the defense and 
- any related settlement negotiations. The Indemnified Contributor may 
+ Commercial distributors of software may accept certain responsibilities with
+ respect to end users, business partners and the like. While this license is
+ intended to facilitate the commercial use of the Program, the Contributor who
+ includes the Program in a commercial product offering should do so in a manner
+ which does not create potential liability for other Contributors. Therefore, if
+ a Contributor includes the Program in a commercial product offering, such
+ Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+ every other Contributor ("Indemnified Contributor") against any losses, damages
+ and costs (collectively "Losses") arising from claims, lawsuits and other legal
+ actions brought by a third party against the Indemnified Contributor to the
+ extent caused by the acts or omissions of such Commercial Contributor in
+ connection with its distribution of the Program in a commercial product
+ offering. The obligations in this section do not apply to any claims or Losses
+ relating to any actual or alleged intellectual property infringement. In order
+ to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+ Contributor in writing of such claim, and b) allow the Commercial Contributor
+ to control, and cooperate with the Commercial Contributor in, the defense and
+ any related settlement negotiations. The Indemnified Contributor may
  participate in any such claim at its own expense.
  .
- For example, a Contributor might include the Program in a commercial product 
- offering, Product X. That Contributor is then a Commercial Contributor. If that 
- Commercial Contributor then makes performance claims, or offers warranties 
- related to Product X, those performance claims and warranties are such 
- Commercial Contributor's responsibility alone. Under this section, the 
- Commercial Contributor would have to defend claims against the other 
- Contributors related to those performance claims and warranties, and if a court 
- requires any other Contributor to pay any damages as a result, the Commercial 
+ For example, a Contributor might include the Program in a commercial product
+ offering, Product X. That Contributor is then a Commercial Contributor. If that
+ Commercial Contributor then makes performance claims, or offers warranties
+ related to Product X, those performance claims and warranties are such
+ Commercial Contributor's responsibility alone. Under this section, the
+ Commercial Contributor would have to defend claims against the other
+ Contributors related to those performance claims and warranties, and if a court
+ requires any other Contributor to pay any damages as a result, the Commercial
  Contributor must pay those damages.
  .
  5. NO WARRANTY
  .
- EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN 
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR 
- IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, 
- NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each 
- Recipient is solely responsible for determining the appropriateness of using 
- and distributing the Program and assumes all risks associated with its exercise 
- of 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 
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+ IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+ NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+ Recipient is solely responsible for determining the appropriateness of using
+ and distributing the Program and assumes all risks associated with its exercise
+ of 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 
- CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST 
- PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY 
- WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS 
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+ CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+ PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
  GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  .
  7. GENERAL
  .
- If any provision of this Agreement is invalid or unenforceable under applicable 
- law, it shall not affect the validity or enforceability of the remainder of the 
- terms of this Agreement, and without further action by the parties hereto, such 
- provision shall be reformed to the minimum extent necessary to make such 
+ If any provision of this Agreement is invalid or unenforceable under applicable
+ law, it shall not affect the validity or enforceability of the remainder of the
+ terms of this Agreement, and without further action by the parties hereto, such
+ provision shall be reformed to the minimum extent necessary to make such
  provision valid and enforceable.
  .
- If Recipient institutes patent litigation against a Contributor with respect to 
- a patent applicable to software (including a cross-claim or counterclaim in a 
- lawsuit), then any patent licenses granted by that Contributor to such 
- Recipient under this Agreement shall terminate as of the date such litigation 
- is filed. In addition, if Recipient institutes patent litigation against any 
- entity (including a cross-claim or counterclaim in a lawsuit) alleging that the 
- Program itself (excluding combinations of the Program with other software or 
- hardware) infringes such Recipient's patent(s), then such Recipient's rights 
- granted under Section 2(b) shall terminate as of the date such litigation is 
+ If Recipient institutes patent litigation against a Contributor with respect to
+ a patent applicable to software (including a cross-claim or counterclaim in a
+ lawsuit), then any patent licenses granted by that Contributor to such
+ Recipient under this Agreement shall terminate as of the date such litigation
+ is filed. In addition, if Recipient institutes patent litigation against any
+ entity (including a cross-claim or counterclaim in a lawsuit) alleging that the
+ Program itself (excluding combinations of the Program with other software or
+ hardware) infringes such Recipient's patent(s), then such Recipient's rights
+ granted under Section 2(b) shall terminate as of the date such litigation is
  filed.
  .
- All Recipient's rights under this Agreement shall terminate if it fails to 
- comply with any of the material terms or conditions of this Agreement and does 
- not cure such failure in a reasonable period of time after becoming aware of 
- such noncompliance. If all Recipient's rights under this Agreement terminate, 
- Recipient agrees to cease use and distribution of the Program as soon as 
- reasonably practicable. However, Recipient's obligations under this Agreement 
- and any licenses granted by Recipient relating to the Program shall continue 
+ All Recipient's rights under this Agreement shall terminate if it fails to
+ comply with any of the material terms or conditions of this Agreement and does
+ not cure such failure in a reasonable period of time after becoming aware of
+ such noncompliance. If all Recipient's rights under this Agreement terminate,
+ Recipient agrees to cease use and distribution of the Program as soon as
+ reasonably practicable. However, Recipient's obligations under this Agreement
+ and any licenses granted by Recipient relating to the Program shall continue
  and survive.
  .
- Everyone is permitted to copy and distribute copies of this Agreement, but in 
- order to avoid inconsistency the Agreement is copyrighted and may only be 
- modified in the following manner. The Agreement Steward reserves the right to 
- publish new versions (including revisions) of this Agreement from time to time. 
- No one other than the Agreement Steward has the right to modify this Agreement. 
- IBM is the initial Agreement Steward. IBM may assign the responsibility to 
- serve as the Agreement Steward to a suitable separate entity. Each new version 
- of the Agreement will be given a distinguishing version number. The Program 
- (including Contributions) may always be distributed subject to the version of 
- the Agreement under which it was received. In addition, after a new version of 
- the Agreement is published, Contributor may elect to distribute the Program 
- (including its Contributions) under the new version. Except as expressly stated 
- in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to 
- the intellectual property of any Contributor under this Agreement, whether 
- expressly, by implication, estoppel or otherwise. All rights in the Program not 
+ Everyone is permitted to copy and distribute copies of this Agreement, but in
+ order to avoid inconsistency the Agreement is copyrighted and may only be
+ modified in the following manner. The Agreement Steward reserves the right to
+ publish new versions (including revisions) of this Agreement from time to time.
+ No one other than the Agreement Steward has the right to modify this Agreement.
+ IBM is the initial Agreement Steward. IBM may assign the responsibility to
+ serve as the Agreement Steward to a suitable separate entity. Each new version
+ of the Agreement will be given a distinguishing version number. The Program
+ (including Contributions) may always be distributed subject to the version of
+ the Agreement under which it was received. In addition, after a new version of
+ the Agreement is published, Contributor may elect to distribute the Program
+ (including its Contributions) under the new version. Except as expressly stated
+ in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+ the intellectual property of any Contributor under this Agreement, whether
+ expressly, by implication, estoppel or otherwise. All rights in the Program not
  expressly granted under this Agreement are reserved.
  .
- This Agreement is governed by the laws of the State of New York and the 
- intellectual property laws of the United States of America. No party to this 
- Agreement will bring a legal action under this Agreement more than one year 
- after the cause of action arose. Each party waives its rights to a jury trial 
+ This Agreement is governed by the laws of the State of New York and the
+ intellectual property laws of the United States of America. No party to this
+ Agreement will bring a legal action under this Agreement more than one year
+ after the cause of action arose. Each party waives its rights to a jury trial
  in any resulting litigation.
- 
+
diff --git a/debian/watch b/debian/watch
index 75f680b..19339ab 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/(\d)(?=\d)/$1\./g" \
- http://sf.net/azureus/Vuze_(.+)_source\.zip debian debian/orig-tar.sh 
+ http://sf.net/azureus/Vuze_(.+)_source\.zip debian debian/orig-tar.sh

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/azureus.git

