[SCM] modemmanager-qt packaging branch, master, updated. debian/5.9.0-1-3-gd43f027

Maximiliano Curia maxy at moszumanska.debian.org
Sat May 16 12:52:11 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/modemmanager-qt.git;a=commitdiff;h=d43f027

The following commit has been merged in the master branch:
commit d43f0279113568f1ba4570023a6c6277bfd3e311
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue May 12 11:01:20 2015 +0200

    Remove upstream applied patch: upstream_insert_missing_license_text
---
 debian/changelog                                   |  1 +
 debian/patches/series                              |  1 -
 .../patches/upstream_insert_missing_license_text   | 42 ----------------------
 3 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9a40958..01615ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 modemmanager-qt (5.10.0-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.10.0).
+  * Remove upstream applied patch: upstream_insert_missing_license_text
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 11 May 2015 12:21:18 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index c47cfac..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-upstream_insert_missing_license_text
diff --git a/debian/patches/upstream_insert_missing_license_text b/debian/patches/upstream_insert_missing_license_text
deleted file mode 100644
index d300e62..0000000
--- a/debian/patches/upstream_insert_missing_license_text
+++ /dev/null
@@ -1,42 +0,0 @@
-commit 436f5113f00e37bd3eca6d979b7f24475ef625d9
-Author: Jonathan Riddell <jr at jriddell.org>
-Date:   Thu Apr 23 14:55:36 2015 +0200
-
-    insert missing licence text
-
-diff --git a/cmake/FindModemManager.cmake b/cmake/FindModemManager.cmake
-index 708db95..d522e93 100644
---- a/cmake/FindModemManager.cmake
-+++ b/cmake/FindModemManager.cmake
-@@ -10,9 +10,28 @@
- # Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
- # Copyright (c) 2007, Will Stephenson, <wstephenson at kde.org>
- #
--# Redistribution and use is allowed according to the terms of the BSD license.
--# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
--
-+# 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 copyright
-+# notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the copyright
-+# notice, this list of conditions and the following disclaimer in the
-+# documentation and/or other materials provided with the distribution.
-+# 3. The name of the author may not be used to endorse or promote products
-+# derived from this software without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- 
- IF (MODEMMANAGER_INCLUDE_DIRS)
-    # in cache already

-- 
modemmanager-qt packaging



More information about the pkg-kde-commits mailing list