[tryton-debian-vcs] tryton-modules-calendar branch debian-wheezy-2.6 created. c8cc228b7655d4878f2a606aecab5736c13f141b

Wed Nov 27 16:59:30 UTC 2013

The following commit has been merged in the debian-wheezy-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-calendar.git;a=commitdiff;h=c8cc228b7655d4878f2a606aecab5736c13f141b
commit c8cc228b7655d4878f2a606aecab5736c13f141b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 12:07:17 2013 +0200

    Releasing debian version 2.6.2-1.

diff --git a/debian/changelog b/debian/changelog
index d2eec17..afd68c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-calendar (2.6.2-1) experimental; urgency=low
+
+  * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704373).
+  * Versioning watch file for Tryton branch 2.6.
+  * Improving update of major version in Depends.
+  * Merging upstream version 2.6.2.
+  * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sat, 04 May 2013 02:38:53 +0200
+
 tryton-modules-calendar (2.6.1-2) experimental; urgency=low
 
   * Updating Vcs-Git to correct address.
commit b5ffe02c2cb262ee47d6dd5797d5dc3bb6eec16a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 02:14:01 2013 +0200

    Updating copyright.

diff --git a/debian/copyright b/debian/copyright
index cbad1dd..34d373e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2009-2012 Cédric Krier
+Copyright: 2009-2013 Cédric Krier
            2009-2012 Bertrand Chenal
-           2009-2012 B2CK SPRL
+           2009-2013 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 0bb612083ffb5c6c823a02ca353b14eb7567cd49
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 02:12:26 2013 +0200

    Merging upstream version 2.6.2.

diff --git a/CHANGELOG b/CHANGELOG
index ce8b818..ffa7322 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.2 - 2013-05-02
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.1 - 2012-12-23
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 8ad4b79..39f9196 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2012 Cédric Krier.
+Copyright (C) 2009-2013 Cédric Krier.
 Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2012 B2CK SPRL.
+Copyright (C) 2009-2013 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 37e5095..c3673f6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_calendar
-Version: 2.6.1
+Version: 2.6.2
 Summary: Tryton module for CalDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/calendar_.py b/calendar_.py
index 1e63623..8dc2fce 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -1604,6 +1604,7 @@ class EventRDate(ModelSQL, ModelView):
 class EventExDate(EventRDate):
     'Exception Date'
     __name__ = 'calendar.event.exdate'
+    _table = 'calendar_event_exdate'  # Needed to override EventRDate._table
 
 
 class RRule(ModelSQL, ModelView):
diff --git a/tryton.cfg b/tryton.cfg
index 76539b5..b334dad 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.1
+version=2.6.2
 depends:
     ir
     res
diff --git a/trytond_calendar.egg-info/PKG-INFO b/trytond_calendar.egg-info/PKG-INFO
index 664e32b..ee96ee8 100644
--- a/trytond_calendar.egg-info/PKG-INFO
+++ b/trytond_calendar.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-calendar
-Version: 2.6.1
+Version: 2.6.2
 Summary: Tryton module for CalDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
commit d4efc4ee3e24ad59a0ca85418e36b6ada90b3dfb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Apr 27 14:54:47 2013 +0200

    Improving update of major version in Depends.
    
    Pulling the major version for Depends directly from the package version.
    Thanks to Ilya Melnikov for pushing the idea.

diff --git a/debian/control b/debian/control
index a079af5..7c0ffcb 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,9 @@ X-Python-Version: >= 2.6
 Package: tryton-modules-calendar
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6), python-dateutil,
- python-tz, python-vobject, python-webdav, python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ python-dateutil, python-tz, python-vobject, python-webdav,
+ python-pkg-resources
 Description: Tryton Application Platform (Calendar Module)
  Tryton is a high-level general purpose application platform written in Python
  and using PostgreSQL as database engine. It is the core base of a complete
diff --git a/debian/rules b/debian/rules
index 1ae0776..0f63ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+
 %:
 	dh ${@} --with python2
 
@@ -8,5 +10,8 @@ override_dh_auto_clean:
 
 	rm -rf *.egg-info
 
+override_dh_gencontrol:
+	dh_gencontrol -- -Vversion:major="$(MAJOR)"
+
 override_dh_builddeb:
 	dh_builddeb -- -Zxz -z9
commit f9b57c7c6860dc98a3483b26436e11644ae6111a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Apr 24 00:59:38 2013 +0200

    Versioning watch file for Tryton branch 2.6.

diff --git a/debian/watch b/debian/watch
index 01a1855..cf1540c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://downloads.tryton.org/current/ .*trytond_calendar-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*trytond_calendar-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
-- 
tryton-modules-calendar

