[Python-apps-commits] r13590 - in packages/khal/trunk/debian (7 files)

Mon Sep 5 08:44:30 UTC 2016

Date: Monday, September 5, 2016 @ 08:44:26
  Author: fpytloun-guest
Revision: 13590

[svn-inject] Applying Debian modifications (0.8.3-1) to trunk

Added:
  packages/khal/trunk/debian/TODO.Debian
  packages/khal/trunk/debian/install
Modified:
  packages/khal/trunk/debian/changelog
  packages/khal/trunk/debian/control
  packages/khal/trunk/debian/copyright
  packages/khal/trunk/debian/patches/0001-No-RSS-news-in-docs.patch
  packages/khal/trunk/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch

Added: packages/khal/trunk/debian/TODO.Debian
===================================================================

--- packages/khal/trunk/debian/TODO.Debian	                        (rev 0)
+++ packages/khal/trunk/debian/TODO.Debian	2016-09-05 08:44:26 UTC (rev 13590)
@@ -0,0 +1,14 @@
+
+Failing tests
+-------------
+
+Following tests are failing and are disabled for now:
+
+tests/khalendar_aux_test.py
+
+    TestExpand.test_expand_dtb
+    TestExpandNoRR.test_expand_dtb
+    TestSpecial.test_another_problem
+
+    These tests are failing probably due to wrongly setup timezone in build
+    environment.

Modified: packages/khal/trunk/debian/changelog
===================================================================
--- packages/khal/trunk/debian/changelog	2016-09-04 19:05:49 UTC (rev 13589)
+++ packages/khal/trunk/debian/changelog	2016-09-05 08:44:26 UTC (rev 13590)
@@ -1,5 +1,5 @@
-khal (0.8.2-1) unstable; urgency=medium
+khal (0.8.3-1) unstable; urgency=medium
 
   * initial release (Closes: #745025)
 
- -- Filip Pytloun <filip at pytloun.cz>  Tue, 23 Aug 2016 17:30:17 +0200
+ -- Filip Pytloun <filip at pytloun.cz>  Mon, 05 Sep 2016 10:06:20 +0200

Modified: packages/khal/trunk/debian/control
===================================================================
--- packages/khal/trunk/debian/control	2016-09-04 19:05:49 UTC (rev 13589)
+++ packages/khal/trunk/debian/control	2016-09-05 08:44:26 UTC (rev 13590)
@@ -4,12 +4,12 @@
 Section: utils
 Priority: optional
 Build-Depends: debhelper (>= 9),
+               dh-exec,
                dh-python (>= 2.20160609~),
-               dh-exec,
                locales,
                python3-alabaster,
                python3-all,
-               python3-click (>= 5.0),
+               python3-click (>= 3.2),
                python3-configobj,
                python3-dateutil,
                python3-doc,
@@ -32,7 +32,7 @@
 
 Package: khal
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}
+Depends: python3-pkg-resources, ${misc:Depends}, ${python3:Depends}
 Recommends: python3-setproctitle
 Description: Standards based CLI and terminal calendar program
  Features:

Modified: packages/khal/trunk/debian/copyright
===================================================================
--- packages/khal/trunk/debian/copyright	2016-09-04 19:05:49 UTC (rev 13589)
+++ packages/khal/trunk/debian/copyright	2016-09-05 08:44:26 UTC (rev 13590)
@@ -3,7 +3,7 @@
 Source: https://github.com/pimutils/khal
 
 Files: *
-Copyright: 2013-2016 Christian Geier <khal at lostpackets.de>
+Copyright: 2013-2016 Christian Geier et al.
 License: Expat
 
 Files: debian/*

Added: packages/khal/trunk/debian/install
===================================================================
--- packages/khal/trunk/debian/install	                        (rev 0)
+++ packages/khal/trunk/debian/install	2016-09-05 08:44:26 UTC (rev 13590)
@@ -0,0 +1,2 @@
+#! /usr/bin/dh-exec --with=install
+khal.conf.sample => /usr/share/doc/khal/examples/khal.conf


Property changes on: packages/khal/trunk/debian/install
___________________________________________________________________
Added: svn:executable
   + *

Modified: packages/khal/trunk/debian/patches/0001-No-RSS-news-in-docs.patch
===================================================================
--- packages/khal/trunk/debian/patches/0001-No-RSS-news-in-docs.patch	2016-09-04 19:05:49 UTC (rev 13589)
+++ packages/khal/trunk/debian/patches/0001-No-RSS-news-in-docs.patch	2016-09-05 08:44:26 UTC (rev 13590)
@@ -33,38 +33,3 @@
     faq
     license
 -   news
-diff --git a/doc/source/news.rst b/doc/source/news.rst
-deleted file mode 100644
-index 8082086..0000000
---- a/doc/source/news.rst
-+++ /dev/null
-@@ -1,29 +0,0 @@
--News
--====
--
--Below is a list of new releases and other khal related news. This is also
--available as an `rss feed <https://lostpackets.de/khal/index.rss>`_ |rss|.
--
-- .. |rss| image:: images/rss.png
--        :target: https://lostpackets.de/khal/index.rss
--
--.. feed::
--    :rss: index.rss
--    :title: khal news
--    :link: http://lostpackets.de/khal/
--
--    news/khal082
--    news/khal081
--    news/khal08
--    news/khal07
--    news/khal06
--    news/khal05
--    news/khal04
--    news/31c3
--    news/khal031
--    news/khal03
--    news/khal02
--    news/khal011
--    news/khal01
--    news/30c3
--    news/callfortesting

Modified: packages/khal/trunk/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch
===================================================================
--- packages/khal/trunk/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch	2016-09-04 19:05:49 UTC (rev 13589)
+++ packages/khal/trunk/debian/patches/0004-Fix-tests-failing-due-to-timezone.patch	2016-09-05 08:44:26 UTC (rev 13590)
@@ -9,20 +9,16 @@
  tests/ui/test_calendarwidget.py | 2 ++
  3 files changed, 7 insertions(+)
 
-diff --git a/tests/cal_display_test.py b/tests/cal_display_test.py
-index e871c2f..f7a7652 100644
 --- a/tests/cal_display_test.py
 +++ b/tests/cal_display_test.py
-@@ -138,6 +138,7 @@ example_de = [
-     '\x1b[1mM\xe4r \x1b[0m27 28 29  1  2  3  4 ']
+@@ -172,6 +172,7 @@
+     '\x1b[1mM\xe4r.\x1b[0m27 28 29  1  2  3  4 ']
  
  
 + at pytest.mark.skip
  def test_vertical_month():
-     locale.setlocale(locale.LC_ALL, 'en_US.utf-8')
+     locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
      vert_str = vertical_month(month=12, year=2011,
-diff --git a/tests/khalendar_aux_test.py b/tests/khalendar_aux_test.py
-index 363c4c5..1a7c21e 100644
 --- a/tests/khalendar_aux_test.py
 +++ b/tests/khalendar_aux_test.py
 @@ -1,6 +1,7 @@
@@ -33,7 +29,7 @@
  
  from khal.khalendar import aux
  
-@@ -314,6 +315,7 @@ class TestExpand(object):
+@@ -314,6 +315,7 @@
                  for start, _ in dtstart] == self.offset_berlin
          assert [end.utcoffset() for _, end in dtstart] == self.offset_berlin
  
@@ -41,7 +37,7 @@
      def test_expand_dtb(self):
          vevent = _get_vevent(event_dtb)
          dtstart = aux.expand(vevent, berlin)
-@@ -385,6 +387,7 @@ class TestExpandNoRR(object):
+@@ -385,6 +387,7 @@
                  for start, _ in dtstart] == self.offset_berlin
          assert [end.utcoffset() for _, end in dtstart] == self.offset_berlin
  
@@ -49,7 +45,7 @@
      def test_expand_dtb(self):
          vevent = _get_vevent(event_dtb_norr)
          dtstart = aux.expand(vevent, berlin)
-@@ -591,6 +594,7 @@ class TestSpecial(object):
+@@ -591,6 +594,7 @@
          assert dtstart[0][0] == date(2009, 10, 31)
          assert dtstart[-1][0] == date(2037, 10, 31)
  
@@ -57,8 +53,6 @@
      def test_another_problem(self):
          vevent = _get_vevent(another_problem)
          dtstart = aux.expand(vevent, berlin)
-diff --git a/tests/ui/test_calendarwidget.py b/tests/ui/test_calendarwidget.py
-index 25cc58a..123b2f9 100644
 --- a/tests/ui/test_calendarwidget.py
 +++ b/tests/ui/test_calendarwidget.py
 @@ -1,6 +1,7 @@
@@ -69,7 +63,7 @@
  
  from khal.ui.calendarwidget import CalendarWidget
  
-@@ -36,6 +37,7 @@ def test_set_focus_date():
+@@ -36,6 +37,7 @@
          assert frame.focus_date == day
  
  


