[tryton-debian-vcs] tryton-modules-currency branch debian-wheezy-2.6 created. e94ce87d6d24567e7e5a26d17a184619a6da8018

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:01:55 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-currency.git;a=commitdiff;h=e94ce87d6d24567e7e5a26d17a184619a6da8018
commit e94ce87d6d24567e7e5a26d17a184619a6da8018
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Nov 21 12:02:20 2013 +0100

    Removing inadvertently commited .pc directory.

diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
deleted file mode 100644
index 6857a8d..0000000
--- a/.pc/.quilt_patches
+++ /dev/null
@@ -1 +0,0 @@
-debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
deleted file mode 100644
index c206706..0000000
--- a/.pc/.quilt_series
+++ /dev/null
@@ -1 +0,0 @@
-series
diff --git a/.pc/.version b/.pc/.version
deleted file mode 100644
index 0cfbf08..0000000
--- a/.pc/.version
+++ /dev/null
@@ -1 +0,0 @@
-2
commit 5dcc027ee0f2f36c7601417965b30cfb075146e2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 17 13:54:31 2013 +0200

    Releasing debian version 2.6.2-1.

diff --git a/debian/changelog b/debian/changelog
index 269082e..3df29ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-currency (2.6.2-1) unstable; urgency=low
+
+  * Removing Daniel from Uploaders. Thanks for your work! (Closes:
+    #704380).
+  * 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>  Thu, 17 Oct 2013 13:20:34 +0200
+
 tryton-modules-currency (2.6.1-2) experimental; urgency=low
 
   * Updating Vcs-Git to correct address.
commit beab59ed6a48e5e5d191be9f6fc20a5c35714055
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 17 13:17:20 2013 +0200

    Updating copyright.

diff --git a/debian/copyright b/debian/copyright
index e51a4f8..b97331c 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: 2008-2012 Cédric Krier
+Copyright: 2008-2013 Cédric Krier
            2008-2012 Bertrand Chenal
-           2008-2012 B2CK SPRL
+           2008-2013 B2CK SPRL
 License: GPL-3+
 
 Files: icons/*
commit 40891197eab9702c54b759e261d6ef65924be03b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 17 13:17:16 2013 +0200

    Merging upstream version 2.6.2.

diff --git a/CHANGELOG b/CHANGELOG
index 0f9464e..87b6b87 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.2 - 2013-10-01
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.1 - 2012-11-05
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 2057c72..d7165c7 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2013 Cédric Krier.
 Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2008-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 c34ac53..659f2dc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_currency
-Version: 2.6.1
+Version: 2.6.2
 Summary: Tryton module with currencies
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/currency.py b/currency.py
index 618bd8e..9413411 100644
--- a/currency.py
+++ b/currency.py
@@ -132,12 +132,12 @@ class Currency(ModelSQL, ModelView):
         currencies = None
         field = None
         for field in ('code', 'numeric_code'):
-            currencies = cls.search([(field,) + clause[1:]], limit=1)
+            currencies = cls.search([(field,) + tuple(clause[1:])], limit=1)
             if currencies:
                 break
         if currencies:
-            return [(field,) + clause[1:]]
-        return [(cls._rec_name,) + clause[1:]]
+            return [(field,) + tuple(clause[1:])]
+        return [(cls._rec_name,) + tuple(clause[1:])]
 
     def on_change_with_rate(self):
         now = datetime.date.today()
@@ -169,7 +169,7 @@ class Currency(ModelSQL, ModelView):
             if rates:
                 res[currency.id] = rates[0].id
             else:
-                res[currency.id] = 0.0
+                res[currency.id] = 0
         rate_ids = [x for x in res.values() if x]
         rates = Rate.browse(rate_ids)
         id2rate = {}
diff --git a/tryton.cfg b/tryton.cfg
index d5cade1..dba7ce6 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_currency.egg-info/PKG-INFO b/trytond_currency.egg-info/PKG-INFO
index f70d1d8..483c337 100644
--- a/trytond_currency.egg-info/PKG-INFO
+++ b/trytond_currency.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-currency
-Version: 2.6.1
+Version: 2.6.2
 Summary: Tryton module with currencies
 Home-page: http://www.tryton.org/
 Author: Tryton
commit 2dc0b002dcd6f76296b13eb8ff4a3d56cdb2295e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Apr 27 14:54:48 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 bb0c46e..5f2ce9e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ X-Python-Version: >= 2.6
 Package: tryton-modules-currency
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
  python-pkg-resources
 Description: Tryton Application Platform (Currency Module)
  Tryton is a high-level general purpose application platform written in Python
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 f0ac66f46b38234a3dd2129ac6d4755b3ebf5a21
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Apr 24 00:59:40 2013 +0200

    Versioning watch file for Tryton branch 2.6.

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

More information about the tryton-debian-vcs mailing list