[tryton-debian-vcs] tryton-modules-currency branch debian-wheezy-2.2 created. ac7752648f9cb6d4636750e647acb152360e5a39
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.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-currency.git;a=commitdiff;h=ac7752648f9cb6d4636750e647acb152360e5a39
commit ac7752648f9cb6d4636750e647acb152360e5a39
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Nov 21 12:02:35 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 b3cfa3bb41c9db67e0bcd032e82fca02bf931df8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 17 12:56:08 2013 +0200
Releasing debian version 2.2.2-1.
diff --git a/debian/changelog b/debian/changelog
index 36ef02f..fa5ad27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-currency (2.2.2-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 17 Oct 2013 12:41:52 +0200
+
tryton-modules-currency (2.2.1-2) unstable; urgency=low
[ Mathias Behrle ]
commit b7fc41fc0a46d1d4b2f669f035158bf6d8be7321
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 17 12:41:45 2013 +0200
Merging upstream version 2.2.2.
diff --git a/CHANGELOG b/CHANGELOG
index 78397d8..5ceafd2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.2 - 2013-10-01
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.1 - 2011-12-26
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 3d2324b..da9ef80 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2013 Cédric Krier.
Copyright (C) 2008-2011 Bertrand Chenal.
-Copyright (C) 2008-2011 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 b4c5d3a..ab20bfc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_currency
-Version: 2.2.1
+Version: 2.2.2
Summary: Define currencies and exchange rate.
Allow to customize the formatting of the currency amount.
diff --git a/__tryton__.py b/__tryton__.py
index 60d2a5a..b214cd4 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Moneda',
'name_es_ES': 'Divisa',
'name_fr_FR': 'Devise',
- 'version': '2.2.1',
+ 'version': '2.2.2',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/currency.py b/currency.py
index dda2b52..95882b6 100644
--- a/currency.py
+++ b/currency.py
@@ -114,12 +114,12 @@ class Currency(ModelSQL, ModelView):
ids = []
field = None
for field in ('code', 'numeric_code'):
- ids = self.search([(field,) + clause[1:]], limit=1)
+ ids = self.search([(field,) + tuple(clause[1:])], limit=1)
if ids:
break
if ids:
- return [(field,) + clause[1:]]
- return [(self._rec_name,) + clause[1:]]
+ return [(field,) + tuple(clause[1:])]
+ return [(self._rec_name,) + tuple(clause[1:])]
def on_change_with_rate(self, vals):
now = datetime.date.today()
@@ -150,7 +150,7 @@ class Currency(ModelSQL, ModelView):
if rate_ids:
res[currency_id] = rate_ids[0]
else:
- res[currency_id] = 0.0
+ res[currency_id] = 0
rate_ids = [x for x in res.values() if x]
rates = rate_obj.browse(rate_ids)
id2rate = {}
diff --git a/trytond_currency.egg-info/PKG-INFO b/trytond_currency.egg-info/PKG-INFO
index e706a2a..a6af9ff 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.2.1
+Version: 2.2.2
Summary: Define currencies and exchange rate.
Allow to customize the formatting of the currency amount.
commit eed783bd74d04c68fcc9d10bf3583ab8b85f0768
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:17:20 2012 +0200
Releasing debian version 2.2.1-2.
diff --git a/debian/changelog b/debian/changelog
index 3ba5ba1..36ef02f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+tryton-modules-currency (2.2.1-2) unstable; urgency=low
+
+ [ Mathias Behrle ]
+ * Updating to Standards-Version: 3.9.3, no changes needed.
+ * Updating year in 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:17:11 +0200
+
tryton-modules-currency (2.2.1-1) unstable; urgency=low
* Merging upstream version 2.2.1.
commit cad1e4d138b6b29e4fffc0a08cf9854828695942
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 85f8122..01b86e4 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-currency.git
commit e931b7f7d005029d202fdb5fd06ae0f25e057670
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 ec8dfab5ebb6e8a4f1553a96eaf5b15b952ba5f2
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:50:24 2012 +0200
Correcting copyright file to match format version 1.0.
diff --git a/debian/copyright b/debian/copyright
index 044f39e..c8f384a 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:
- (C) 2008-2011 Cedric Krier
- (C) 2008-2011 Bertrand Chenal
- (C) 2008-2011 B2CK SPRL
+ 2008-2011 Cedric Krier
+ 2008-2011 Bertrand Chenal
+ 2008-2011 B2CK SPRL
License: GPL-3+
Files: icons/*
@@ -13,8 +13,8 @@ License: public-domain
Files: debian/*
Copyright:
- (C) 2009-2012 Daniel Baumann <daniel at debian.org>
- (C) 2011-2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2009-2012 Daniel Baumann <daniel at debian.org>
+ 2011-2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 9131858724aba66cf1f8951f52e92633d293fc09
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 e056081..85f8122 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-currency.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-currency.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-currency.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-currency.git
X-Python-Version: >= 2.6
Package: tryton-modules-currency
commit 938d46dca963660bd98bc364a1da5f6904c50032
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 7f2c297..e056081 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-currency
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-currency
More information about the tryton-debian-vcs
mailing list