[SCM] KDE Base Applications module packaging branch, master, updated. debian/4.4.5-2-54-g509a0cf

Modestas Vainius modax at alioth.debian.org
Tue Mar 29 01:17:19 UTC 2011


The following commit has been merged in the master branch:
commit 835c53483bdef0451b44a3c55c097139e8354c1d
Author: Modestas Vainius <modax at debian.org>
Date:   Tue Mar 29 04:03:20 2011 +0300

    Remove redudant links to common-licenses/BSD.
    
    Verbatim license text was already there.
---
 debian/changelog |    2 ++
 debian/copyright |   10 ----------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e5a373d..ec3755b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,8 @@ kdebase (4:4.6.1-0r1) UNRELEASED; urgency=low
     - libkonqsidebarplugin4a - ABI-0.
   * Remove libkonq from kdebase-apps Depends. It's pretty pointless to have a
     library in there (and it's an indirect dependency anyway).
+  * Remove redudant links to common-licenses/BSD. Verbatim text was already
+    there.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 15 Nov 2010 14:20:25 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 48e731d..8ddfd64 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -259,10 +259,6 @@ Other used licenses:
   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 systems, the complete text of the
-  BSD-like License can be found in
-  /usr/share/common-licenses/BSD
 --
 
 --
@@ -801,10 +797,6 @@ Other used licenses:
   Mozilla Foundation ("Mozilla") nor the names of their contributors may be used
   to endorse or promote products derived from this software without specific prior
   written permission.
-
-  On Debian systems, the complete text of the
-  BSD-like License can be found in
-  /usr/share/common-licenses/BSD
 --
 
 
@@ -914,12 +906,10 @@ Legend:
 
 On Debian systems, you can find the complete texts of these licenses at:
   - Artistic: /usr/share/common-licenses/Artistic
-  - BSD:      /usr/share/common-licenses/BSD
   - GPL:      /usr/share/common-licenses/GPL
   - GPLv2:    /usr/share/common-licenses/GPL-2
   - LGPLv2:   /usr/share/common-licenses/LGPL-2
   - GFDL:     /usr/share/common-licenses/GFDL
-  - BSD:      /usr/share/common-licenses/BSD
 
 -------------------------------------------------------------------------------
 

-- 
KDE Base Applications module packaging



More information about the pkg-kde-commits mailing list