[tryton-debian-vcs] tryton-modules-calendar-classification branch debian-wheezy-2.2 created. 7caabb9061e040113d87f78d2dac5cd37176ee93
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 16:59:38 UTC 2013
The following commit has been merged in the debian-wheezy-2.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-calendar-classification.git;a=commitdiff;h=7caabb9061e040113d87f78d2dac5cd37176ee93
commit 7caabb9061e040113d87f78d2dac5cd37176ee93
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 3 23:00:00 2012 +0200
Releasing debian version 2.2.1-1.
diff --git a/debian/changelog b/debian/changelog
index 44bb6aa..6428938 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-calendar-classification (2.2.1-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.1.
+ * Updating year in copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 03 Oct 2012 21:50:12 +0200
+
tryton-modules-calendar-classification (2.2.0-2) unstable; urgency=low
[ Mathias Behrle ]
commit fb17a67715b151e951605feb4cc6089dc54f40a4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 3 21:43:46 2012 +0200
Updating year in copyright.
diff --git a/debian/copyright b/debian/copyright
index 5904fe7..aa54b57 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- 2009-2011 Cedric Krier
+ 2009-2012 Cedric Krier
2009-2011 Bertrand Chenal
- 2009-2011 B2CK SPRL
+ 2009-2012 B2CK SPRL
License: GPL-3+
Files: debian/*
commit de7397112f6f19a8720e145f6099e0487b24e1e4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Sep 12 15:53:55 2012 +0200
Merging upstream version 2.2.1.
diff --git a/CHANGELOG b/CHANGELOG
index cd6df99..4c219a0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.1 - 2012-09-02
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.0 - 2011-10-24
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 1245dd5..0650193 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2011 Cédric Krier.
+Copyright (C) 2009-2012 Cédric Krier.
Copyright (C) 2009-2011 Bertrand Chenal.
-Copyright (C) 2009-2011 B2CK SPRL.
+Copyright (C) 2009-2012 B2CK SPRL.
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
diff --git a/PKG-INFO b/PKG-INFO
index 433407a..e7a639b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_calendar_classification
-Version: 2.2.0
+Version: 2.2.1
Summary: Handle classification of event
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 1c2675d..cecf234 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -9,7 +9,7 @@
'name_es_ES' : 'Clasificación del calendario',
'name_fr_FR' : 'Classification calendrier',
'name_ru_RU' : 'Классификация по календарю',
- 'version' : '2.2.0',
+ 'version' : '2.2.1',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/calendar.py b/calendar.py
index a6cca08..9cd6cfa 100644
--- a/calendar.py
+++ b/calendar.py
@@ -56,7 +56,7 @@ class Event(ModelSQL):
if 'vevent' in record:
vevent = record['vevent']
if vevent:
- vevent = vobject.readOne(vevent)
+ vevent = vobject.readOne(str(vevent))
if hasattr(vevent, 'summary'):
vevent.summary.value = summary
diff --git a/trytond_calendar_classification.egg-info/PKG-INFO b/trytond_calendar_classification.egg-info/PKG-INFO
index d9e62ab..b7c2aa7 100644
--- a/trytond_calendar_classification.egg-info/PKG-INFO
+++ b/trytond_calendar_classification.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-calendar-classification
-Version: 2.2.0
+Version: 2.2.1
Summary: Handle classification of event
Home-page: http://www.tryton.org/
Author: B2CK
commit f1f0e9984a53481f689ac0db8267866d361ee368
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:11:57 2012 +0200
Releasing debian version 2.2.0-2.
diff --git a/debian/changelog b/debian/changelog
index f0c394f..44bb6aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+tryton-modules-calendar-classification (2.2.0-2) unstable; urgency=low
+
+ [ Mathias Behrle ]
+ * Updating to Standards-Version: 3.9.3, no changes needed.
+ * Updating year in copyright.
+ * Adding myself to copyright.
+ * Adding Format header for DEP5.
+
+ [ Daniel Baumann ]
+ * Updating maintainers field.
+ * Updating vcs fields.
+ * Correcting copyright file to match format version 1.0.
+ * Switching to xz compression.
+ * Updating to debhelper version 9.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 30 Jun 2012 18:11:25 +0200
+
tryton-modules-calendar-classification (2.2.0-1) unstable; urgency=low
* Bumping X-Python-Version to >=2.6.
commit 746cf76914ba7805afa1bca0fe39cbdfc00eab1a
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:02:28 2012 +0200
Updating to debhelper version 9.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 66e02f2..76bae54 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-calendar-classification.git
commit bc4b50d406b08f87cd2d498f6bd2ca89d6683253
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:54:36 2012 +0200
Switching to xz compression.
diff --git a/debian/rules b/debian/rules
index e32b791..1ae0776 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,3 +7,6 @@ override_dh_auto_clean:
dh_auto_clean
rm -rf *.egg-info
+
+override_dh_builddeb:
+ dh_builddeb -- -Zxz -z9
diff --git a/debian/source/options b/debian/source/options
index d053b65..22a4de9 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
-compression = gzip
+compression = xz
compression-level = 9
commit 99a148e6c447b62021780bcb3a7847052b77f983
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:50:23 2012 +0200
Correcting copyright file to match format version 1.0.
diff --git a/debian/copyright b/debian/copyright
index 6f4de75..5904fe7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,15 +2,15 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- (C) 2009-2011 Cedric Krier
- (C) 2009-2011 Bertrand Chenal
- (C) 2009-2011 B2CK SPRL
+ 2009-2011 Cedric Krier
+ 2009-2011 Bertrand Chenal
+ 2009-2011 B2CK SPRL
License: GPL-3+
Files: debian/*
Copyright:
- (C) 2010-2012 Daniel Baumann <daniel at debian.org>
- (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2010-2012 Daniel Baumann <daniel at debian.org>
+ 2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 990670490e986585fb1585628a455e7da996699f
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:55:04 2012 +0200
Updating vcs fields.
diff --git a/debian/control b/debian/control
index 2c04949..66e02f2 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
-Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-calendar-classification.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-calendar-classification.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-calendar-classification.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-calendar-classification.git
X-Python-Version: >= 2.6
Package: tryton-modules-calendar-classification
commit ab716f155435c0c0999af335076e33f1a88ca535
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:52:30 2012 +0200
Updating maintainers field.
diff --git a/debian/control b/debian/control
index db5c25d..2c04949 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-calendar-classification
Section: python
Priority: optional
-Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
--
tryton-modules-calendar-classification
More information about the tryton-debian-vcs
mailing list