[Python-apps-commits] r14369 - in packages/khal/trunk/debian (3 files)

[fpytloun-guest at users.alioth.debian.org]

    Date: Thursday, August 31, 2017 @ 17:36:15
  Author: fpytloun-guest
Revision: 14369

Version 0.9.6-3

Modified:
  packages/khal/trunk/debian/changelog
  packages/khal/trunk/debian/patches/series
Deleted:
  packages/khal/trunk/debian/patches/0002-Reference-license-from-copyright-file.patch

Modified: packages/khal/trunk/debian/changelog
===================================================================
--- packages/khal/trunk/debian/changelog	2017-08-30 12:23:39 UTC (rev 14368)
+++ packages/khal/trunk/debian/changelog	2017-08-31 17:36:15 UTC (rev 14369)
@@ -1,3 +1,9 @@
+khal (1:0.9.6-3) unstable; urgency=medium
+
+  * d/patches: removed patch modifying upstream license file
+
+ -- Filip Pytloun <filip at pytloun.cz>  Thu, 17 Aug 2017 15:22:24 +0200
+
 khal (1:0.9.6-2) unstable; urgency=medium
 
   * Fix FTBFS by marking test that requires stdin as xfail,

Deleted: packages/khal/trunk/debian/patches/0002-Reference-license-from-copyright-file.patch
===================================================================
--- packages/khal/trunk/debian/patches/0002-Reference-license-from-copyright-file.patch	2017-08-30 12:23:39 UTC (rev 14368)
+++ packages/khal/trunk/debian/patches/0002-Reference-license-from-copyright-file.patch	2017-08-31 17:36:15 UTC (rev 14369)
@@ -1,41 +0,0 @@
-From fa3b335e5e4105aac11aa9dab4c062435bcde16e Mon Sep 17 00:00:00 2001
-From: Filip Pytloun <filip at pytloun.cz>
-Date: Fri, 12 Aug 2016 20:09:20 +0200
-Subject: [PATCH 2/6] Reference license from copyright file
-
----
- doc/source/license.rst | 20 ++------------------
- 1 file changed, 2 insertions(+), 18 deletions(-)
-
-diff --git a/doc/source/license.rst b/doc/source/license.rst
-index 0c6cf9f..1f52202 100644
---- a/doc/source/license.rst
-+++ b/doc/source/license.rst
-@@ -1,22 +1,6 @@
- License
- -------
--khal is released under the Expat/MIT License::
- 
--    Copyright (c) 2013-2017 Christian Geier et al.
-+khal is released under the Expat/MIT License.
- 
--    Permission is hereby granted, free of charge, to any person obtaining a copy of
--    this software and associated documentation files (the "Software"), to deal in
--    the Software without restriction, including without limitation the rights to
--    use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
--    the Software, and to permit persons to whom the Software is furnished to do so,
--    subject to the following conditions:
--
--    The above copyright notice and this permission notice shall be included in all
--    copies or substantial portions of the Software.
--
--    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
--    FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
--    COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
--    IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
--    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+For full text of this license see ``/usr/share/doc/khal-doc/copyright``
--- 
-2.11.0
-

Modified: packages/khal/trunk/debian/patches/series
===================================================================
--- packages/khal/trunk/debian/patches/series	2017-08-30 12:23:39 UTC (rev 14368)
+++ packages/khal/trunk/debian/patches/series	2017-08-31 17:36:15 UTC (rev 14369)
@@ -1,5 +1,4 @@
 0001-No-RSS-news-in-docs.patch
-0002-Reference-license-from-copyright-file.patch
 0003-Fix-intersphinx-mapping.patch
 0004-Fix-tests-failing-due-to-timezone.patch
 0005-Avoid-privacy-breach-in-sphinx-doc.patch