[Pkg-cli-apps-commits] [SCM] bareftp branch, master, updated. debian/0.3.4-1-7-g9c284eb

[Stefan Ebner]

The following commit has been merged in the master branch:
commit 9c284eb9529be4a8e886ff578599180e26d95451
Author: Stefan Ebner <sebner at ubuntu.com>
Date:   Fri Oct 15 19:11:35 2010 +0200

    Update copyright to fix lintian warning, re-add removed intltool as b-d

diff --git a/debian/changelog b/debian/changelog
index 64ff55b..54d40f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,7 @@ bareftp (0.3.6-1) UNRELEASED; urgency=low
   * debian/copyright: Updated
   * debian/control: 
     + Bump Standards-Version to 3.9.1
-    + Remove intltool and libtool from Build-Depends
+    + Remove libtool from Build-Depends
   * debian/rules: Remove useless autoreconf and dh_override_clean
 
  -- Stefan Ebner <sebner at ubuntu.com>  Fri, 15 Oct 2010 17:53:44 +0200
diff --git a/debian/control b/debian/control
index caf4f91..85385a0 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 7.0.50),
  libgnome-vfs2.0-cil-dev (>= 2.12),
  libgconf2.0-cil-dev (>= 2.12),
  libgnome-keyring1.0-cil-dev,
+ intltool (>= 0.35)
 Standards-Version: 3.9.1
 Homepage: http://www.bareftp.org/
 Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/bareftp.git
diff --git a/debian/copyright b/debian/copyright
index 6a299b6..50e6ac3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -100,32 +100,26 @@ License: LGPL-2.1
  License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
 License: BSD
- Copyright (c) The Regents of the University of California.
- All rights reserved.
-
  Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. Neither the name of the University nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
- On Debian GNU/Linux systems, the text of the BSD License
- can be found in `/usr/share/common-licenses/BSD'.
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright 
+    notice, this list of conditions and the following disclaimer in 
+    the documentation and/or other materials provided with the distribution.
+
+ 3. The names of the authors may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+ INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ OR PROFITS; OR BUSINESS INTERRUPTION) 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 OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-- 
bareftp