On Wed, Dec 16, 2015 at 11:29:44PM +0100, Jérôme wrote:
> Rolf, Mattia.
> 
> I just released v0.6.9 which includes the patch from Mattia.
> 
> Note you can drop the recommandation on evolution-data-server and
> python-evolution since v0.6.8.

Dear maintainer,

I've prepared an NMU for gbirthday (versioned as 0.6.9-0.1) and
uploaded it to DELAYED/15.
Please feel free to tell me if I should delay it longer.
Attached there is a debdiff of the package, against what is currently in
experimental.
Also, I did the work in git, I'll push it once it lands on the archive.

Of course, feel free to just tell me if you're going to work on it
instead and prefere me to cancel the upload.

-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  http://mapreri.org                              : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-
diffstat for gbirthday-0.6.7 gbirthday-0.6.9

 .Makefile.swp                              |binary
 .coverage                                  |binary
 Changelog                                  |   22 ++++++++++
 Makefile                                   |    6 +-
 debian/changelog                           |   14 ++++++
 debian/control                             |    1 
 debian/patches/load-from-private-dir.patch |   22 ----------
 debian/patches/remove-too-early-import     |   14 ++++++
 debian/patches/series                      |    2 
 pylint                                     |   17 +++----
 src/gb                                     |    9 ++++
 src/gbirthday/__init__.py                  |   15 ++-----
 src/gbirthday/databases/__init__.py        |    4 -
 src/gbirthday/databases/evolution.py       |   62 -----------------------------
 src/gbirthday/status_icon.py               |    2 
 src/gbirthday/test_conf.py                 |    1 
 16 files changed, 78 insertions(+), 113 deletions(-)

diff -Nru gbirthday-0.6.7/Changelog gbirthday-0.6.9/Changelog
--- gbirthday-0.6.7/Changelog   2012-01-10 23:04:52.000000000 +0000
+++ gbirthday-0.6.9/Changelog   2015-12-16 22:15:07.000000000 +0000
@@ -1,3 +1,25 @@
+0.6.9
+
+        - Minor fixes related to installation
+
+0.6.8
+       - Remove Evolution as supported DB
+
+0.6.7
+       - Fix bug if two birthdates same D-M different Y
+       - Fix bug in .ics export (UID must be unique)
+       - Translation updates: Cesky, Italian, French
+       - Tarball generation improvement in Makefile
+
+0.6.6
+       - GUI revamp
+       - Hide from taskbar
+       - Store config in XDG_CONFIG_HOME or ~/.config
+       - Export gbirthday list as iCalendar file
+       - Use datetime instead of strings
+       - Translation updates: Italian, Finnish
+
+
 0.6.5
        - Reload addressbook, when clickint on 'Save & Close'
        - Properly close about-dialog on 'X'
Binary files /tmp/dQAMnrLqzN/gbirthday-0.6.7/.coverage and 
/tmp/_rabBzvmkc/gbirthday-0.6.9/.coverage differ
diff -Nru gbirthday-0.6.7/debian/changelog gbirthday-0.6.9/debian/changelog
--- gbirthday-0.6.7/debian/changelog    2015-12-16 00:17:43.000000000 +0000
+++ gbirthday-0.6.9/debian/changelog    2015-12-28 17:24:45.000000000 +0000
@@ -1,3 +1,17 @@
+gbirthday (0.6.9-0.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Upload to unstable.
+  * Imported Upstream version 0.6.9.
+  * debian/control: stop recommending evolution-data-server, it's not supported
+    anymore upstream.
+  * debian/patches:
+    + load-from-private-dir.patch: drop as applied upstream.
+    + remove-too-early-import: add to remove a duplicate import, done outside a
+      try/except block, so the program can follow the except stanza properly.
+
+ -- Mattia Rizzolo <mat...@debian.org>  Mon, 28 Dec 2015 17:05:04 +0000
+
 gbirthday (0.6.7-1.1) experimental; urgency=medium
 
   * Non-maintainer upload.
diff -Nru gbirthday-0.6.7/debian/control gbirthday-0.6.9/debian/control
--- gbirthday-0.6.7/debian/control      2015-12-15 13:16:25.000000000 +0000
+++ gbirthday-0.6.9/debian/control      2015-12-28 16:57:34.000000000 +0000
@@ -22,7 +22,6 @@
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
-Recommends: evolution-data-server
 Description: birthday reminder applet
  GBirthday is an applet to help you remember your friends' and contacts'
  birthdays.  It uses the notifcation area for alerts.  Data can be stored
diff -Nru gbirthday-0.6.7/debian/patches/load-from-private-dir.patch 
gbirthday-0.6.9/debian/patches/load-from-private-dir.patch
--- gbirthday-0.6.7/debian/patches/load-from-private-dir.patch  2015-12-15 
13:16:06.000000000 +0000
+++ gbirthday-0.6.9/debian/patches/load-from-private-dir.patch  1970-01-01 
00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-Description: We install gbirthday in a private location in /usr/share/gbirthday
- let's make the launcher cope with this
-Author: Mattia Rizzolo <mat...@debian.org>
-Last-Update: 2015-12-15
-Forwarded: no
-
---- a/src/gb
-+++ b/src/gb
-@@ -1,4 +1,12 @@
- #!/usr/bin/python
- '''import main function from gbirthday and execute it'''
--from gbirthday import main
-+try:
-+    from gbirthday import main
-+except ImportError:
-+    # maybe it's installed in a private location
-+    import os, sys
-+    usr_share_path = os.path.join('/', 'usr', 'share', 'gbirthday')
-+    if os.path.exists(usr_share_path):
-+        sys.path.insert(0, usr_share_path)
-+        from gbirthday import main
- main()
diff -Nru gbirthday-0.6.7/debian/patches/remove-too-early-import 
gbirthday-0.6.9/debian/patches/remove-too-early-import
--- gbirthday-0.6.7/debian/patches/remove-too-early-import      1970-01-01 
00:00:00.000000000 +0000
+++ gbirthday-0.6.9/debian/patches/remove-too-early-import      2015-12-28 
17:17:45.000000000 +0000
@@ -0,0 +1,14 @@
+Description: remove this duplicated import, which is done too early and 
outside of the try/except block
+Author: Mattia Rizzolo <mat...@debian.org>
+Forwarded: yes, to Jérôme <jer...@jolimont.fr>
+Last-Update: 2015-12-28
+
+--- a/src/gb
++++ b/src/gb
+@@ -1,6 +1,5 @@
+ #!/usr/bin/python
+ '''import main function from gbirthday and execute it'''
+-from gbirthday import main
+ try:
+     from gbirthday import main
+ except ImportError:
diff -Nru gbirthday-0.6.7/debian/patches/series 
gbirthday-0.6.9/debian/patches/series
--- gbirthday-0.6.7/debian/patches/series       2015-12-15 13:12:00.000000000 
+0000
+++ gbirthday-0.6.9/debian/patches/series       2015-12-28 17:21:46.000000000 
+0000
@@ -1,2 +1,2 @@
 01_deactivate-nosetests.patch
-load-from-private-dir.patch
+remove-too-early-import
diff -Nru gbirthday-0.6.7/Makefile gbirthday-0.6.9/Makefile
--- gbirthday-0.6.7/Makefile    2012-11-25 18:36:42.000000000 +0000
+++ gbirthday-0.6.9/Makefile    2015-12-16 22:15:07.000000000 +0000
@@ -1,8 +1,8 @@
 bindir = /usr/bin
 datadir = /usr/share
-sitelib = /usr/lib/python2.6/site-packages
+sitelib = $(python -c "from distutils.sysconfig import get_python_lib; print 
get_python_lib(True)")
 pixmaps = $(datadir)/pixmaps
-version = 0.6.7
+version = 0.6.9
 DIST_DIR = dist
 
 install = install -p
@@ -49,7 +49,7 @@
 
 snapshot: clean
        mkdir -p $(DIST_DIR)/gbirthday-$(version)
-       rsync -avz --exclude=.git --exclude=$(DIST_DIR) ./ 
$(DIST_DIR)/gbirthday-$(version)
+       rsync -avz --exclude=.* --exclude=$(DIST_DIR) ./ 
$(DIST_DIR)/gbirthday-$(version)
 
 tar.gz:        snapshot
        cd $(DIST_DIR) && $(tar) -zcf gbirthday-$(version).tar.gz 
gbirthday-$(version)
Binary files /tmp/dQAMnrLqzN/gbirthday-0.6.7/.Makefile.swp and 
/tmp/_rabBzvmkc/gbirthday-0.6.9/.Makefile.swp differ
diff -Nru gbirthday-0.6.7/pylint gbirthday-0.6.9/pylint
--- gbirthday-0.6.7/pylint      2012-02-26 22:40:03.000000000 +0000
+++ gbirthday-0.6.9/pylint      2015-12-16 22:15:07.000000000 +0000
@@ -19,18 +19,15 @@
 then
     command=$(find $1 -name "*.py")
 else
-    command=$(find . -name "*.py")
+    command=$(find . -name "*.py" -not -path "./dist/*")
 fi
 
-pylint --include-ids=y \
-    --disable-msg=C0103 \
-    --disable-msg=C0111 \
-    --disable-msg=C0301 \
-    --disable-msg=C0302 \
-    --disable-msg=R0904 \
-    --disable-msg=R0912 \
-    --disable-msg=R0915 \
-    --disable-msg=W0614 \
+pylint --msg-template='{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}' \
+    --disable=C0111 \
+    --disable=C0302 \
+    --disable=R0904 \
+    --disable=R0912 \
+    --disable=R0915 \
     $command
 
 # --errors-only
diff -Nru gbirthday-0.6.7/src/gb gbirthday-0.6.9/src/gb
--- gbirthday-0.6.7/src/gb      2012-05-23 22:45:39.000000000 +0000
+++ gbirthday-0.6.9/src/gb      2015-12-16 22:15:07.000000000 +0000
@@ -1,4 +1,13 @@
 #!/usr/bin/python
 '''import main function from gbirthday and execute it'''
 from gbirthday import main
+try:
+    from gbirthday import main
+except ImportError:
+    # maybe it's installed in a private location
+    import os, sys
+    usr_share_path = os.path.join('/', 'usr', 'share', 'gbirthday')
+    if os.path.exists(usr_share_path):
+        sys.path.insert(0, usr_share_path)
+        from gbirthday import main
 main()
diff -Nru gbirthday-0.6.7/src/gbirthday/databases/evolution.py 
gbirthday-0.6.9/src/gbirthday/databases/evolution.py
--- gbirthday-0.6.7/src/gbirthday/databases/evolution.py        2012-02-26 
22:40:03.000000000 +0000
+++ gbirthday-0.6.9/src/gbirthday/databases/evolution.py        1970-01-01 
00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-# vim: foldmethod=marker
-#{{{ License header: GPLv2+
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#}}}
-from __future__ import absolute_import
-import gtk
-import os
-import re
-from gbirthday.databases import DataBase
-from gbirthday.gtk_funcs import show_error_msg
-
-class Evolution(DataBase):
-    '''data import from the Evolution address book'''
-    def __init__(self):
-        super(Evolution, self).__init__(title='Evolution', can_save=False, 
-                                        has_config=False)
-        self._split_re = re.compile(r'\r?\n')
-        
-    def parse(self, addressbook=None, conf=None):
-        '''load and parse parse Evolution data files'''
-        # XXX: set addressbook in __init__?
-        self.ab = addressbook
-        try:
-            import evolution
-            # When there is no evolution addressbook, silently abort
-            # parsing.
-            if not evolution.ebook:
-                return
-        except ImportError:
-            show_error_msg(_("You need to install python-evolution to use the 
evolution module"))
-            return
-
-        for book in evolution.ebook.list_addressbooks():
-            ebook = evolution.ebook.open_addressbook(book[1])
-            if not ebook:
-                continue
-            for contact in ebook.get_all_contacts():
-                # contact.props.birth_date{.year, .month, .day} non-existing
-                # -> using vcard
-                vcard = contact.get_vcard_string()
-                self.parse_birthday((contact.props.full_name, vcard), 
addressbook)
-
-    def parse_birthday(self, data, addressbook):
-        '''parse evolution addressbook. the file is in VCard format.'''
-        # TODO change to contact.props.birth_date, no vcard would be needed
-        full_name, vcard = data
-        lines = self._split_re.split(vcard)
-        for line in lines:
-            # if BDAY is in vcard, use this as birthday
-            if line.startswith('BDAY'):
-                addressbook.add(full_name, line.split(':', 1)[1])
diff -Nru gbirthday-0.6.7/src/gbirthday/databases/__init__.py 
gbirthday-0.6.9/src/gbirthday/databases/__init__.py
--- gbirthday-0.6.7/src/gbirthday/databases/__init__.py 2012-05-23 
22:45:39.000000000 +0000
+++ gbirthday-0.6.9/src/gbirthday/databases/__init__.py 2015-12-16 
22:15:07.000000000 +0000
@@ -17,7 +17,6 @@
 
 'DataBase' from which everything inherits:
 - CSV
-- Evolution
 - Lightning
 - MySQL
 - Sunbird
@@ -60,10 +59,9 @@
         pass
 
 from csv import CSV
-from evolution import Evolution
 from lightning import Lightning
 from mysql import MySQL
 from sunbird import Sunbird
 
 mysql_db = MySQL()
-DATABASES = [CSV(), Evolution(), Lightning(), mysql_db, Sunbird()]
+DATABASES = [CSV(), Lightning(), mysql_db, Sunbird()]
diff -Nru gbirthday-0.6.7/src/gbirthday/__init__.py 
gbirthday-0.6.9/src/gbirthday/__init__.py
--- gbirthday-0.6.7/src/gbirthday/__init__.py   2012-05-23 22:45:39.000000000 
+0000
+++ gbirthday-0.6.9/src/gbirthday/__init__.py   2015-12-16 22:15:07.000000000 
+0000
@@ -19,7 +19,6 @@
 data servers:
  - CSV-file (comma-seperated value)
  - MySQL
- - Evolution
  - Thunderbird/Icedove Lightning
  - Sunbrid / IceOwl
 
@@ -114,9 +113,10 @@
 
         self.correct_settings()
 
-    # TODO introduced after 0.6, remove if time has come
     def correct_settings(self):
-        '''correct new settings, e.g. Evolution and not evolution anymore'''
+        '''Update settings from older versions'''
+        
+        # Correct new settings, e.g. Evolution and not evolution anymore'''
         def replace(old, new, changed):
             '''replace old with new'''
             for num, item in enumerate(self.used_databases):
@@ -131,6 +131,7 @@
         changed = replace('csv', 'CSV', changed)
         changed = replace('lightning', 'Lightning', changed)
         changed = replace('sunbird', 'Sunbird', changed)
+        
         if changed:
             self.save()
 
@@ -189,12 +190,8 @@
         self.settings.set("main", "lastday", self.lastday)
         self.settings.set("main", "notify_future_bdays",
                 self.notify_future_bdays)
-        used_db = ""
-        for database in self.used_databases:
-            used_db += database
-            used_db += "|"
-        # db[:-1] because of removing the last "|"
-        self.settings.set("main", "databases", used_db[:-1])
+        used_db = '|'.join(self.used_databases)
+        self.settings.set("main", "databases", used_db)
         self.settings.set("main", "csv_files", self.csv_files)
         
         # mysql
diff -Nru gbirthday-0.6.7/src/gbirthday/status_icon.py 
gbirthday-0.6.9/src/gbirthday/status_icon.py
--- gbirthday-0.6.7/src/gbirthday/status_icon.py        2012-05-23 
22:45:39.000000000 +0000
+++ gbirthday-0.6.9/src/gbirthday/status_icon.py        2015-12-16 
22:15:07.000000000 +0000
@@ -162,7 +162,7 @@
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.''')
         dlg.set_authors([
-                'Andreas Bresser <andr...@phidev.org>',
+                'Andreas Bresser <andreasbres...@gmail.com>',
                 'Stefan Jurco <stefan.ju...@gmail.com>',
                 'Alex Mallo <derna...@gmail.com>',
                 'Thomas Spura <toms...@fedoraproject.org>',
diff -Nru gbirthday-0.6.7/src/gbirthday/test_conf.py 
gbirthday-0.6.9/src/gbirthday/test_conf.py
--- gbirthday-0.6.7/src/gbirthday/test_conf.py  2012-01-10 23:04:52.000000000 
+0000
+++ gbirthday-0.6.9/src/gbirthday/test_conf.py  2015-12-16 22:15:07.000000000 
+0000
@@ -16,7 +16,6 @@
 '''
 Testing the conf class
 '''
-from nose import with_setup
 from .__init__ import Conf
 
 conf = None

Attachment: signature.asc
Description: PGP signature

Reply via email to