[tryton-debian-vcs] tryton-modules-product branch debian-wheezy-2.2 created. 8eaf8bf3a68da463ead8bc1ce4cb63a71b1c8f0b
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:04:46 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-product.git;a=commitdiff;h=8eaf8bf3a68da463ead8bc1ce4cb63a71b1c8f0b
commit 8eaf8bf3a68da463ead8bc1ce4cb63a71b1c8f0b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Nov 21 12:03:38 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 e1b58534a31a604ee9b9e287f1ed9d1ca068a592
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 17 12:55:34 2013 +0200
Releasing debian version 2.2.3-1.
diff --git a/debian/changelog b/debian/changelog
index fe8d2b2..57937e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-product (2.2.3-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.3.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 17 Oct 2013 12:40:51 +0200
+
tryton-modules-product (2.2.2-1) unstable; urgency=low
* Merging upstream version 2.2.2.
commit 548e9c0a2c5d5c200b64fbf8dd46d803798281f3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 17 12:40:39 2013 +0200
Merging upstream version 2.2.3.
diff --git a/CHANGELOG b/CHANGELOG
index 1fdc4b4..c7722c4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.3 - 2013-10-01
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.2 - 2012-09-02
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 83c0f58..244bb5d 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-2011 Bertrand Chenal.
-Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2008-2013 B2CK SPRL.
Copyright (C) 2004-2008 Tiny SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 9b9e8ae..5b612a7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_product
-Version: 2.2.2
+Version: 2.2.3
Summary: Define products, categories of product, units of measure, categories of units of measure.
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 462de08..43d821e 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -10,7 +10,7 @@
'name_fr_FR': 'Produit',
'name_nl_NL': 'Producten',
'name_ru_RU': 'ТМЦ',
- 'version': '2.2.2',
+ 'version': '2.2.3',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 267915e..9aa4c1f 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-product
-Version: 2.2.2
+Version: 2.2.3
Summary: Define products, categories of product, units of measure, categories of units of measure.
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/uom.py b/uom.py
index 9d6d957..358dce0 100644
--- a/uom.py
+++ b/uom.py
@@ -127,8 +127,8 @@ class Uom(ModelSQL, ModelView):
def search_rec_name(self, name, clause):
ids = self.search(['OR',
- (self._rec_name,) + clause[1:],
- ('symbol',) + clause[1:],
+ (self._rec_name,) + tuple(clause[1:]),
+ ('symbol',) + tuple(clause[1:]),
], order=[])
return [('id', 'in', ids)]
commit 10110257ff64c7c4b5b88f8947bc92a122e4ec21
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 3 23:00:00 2012 +0200
Releasing debian version 2.2.2-1.
diff --git a/debian/changelog b/debian/changelog
index 4d9e6b2..fe8d2b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-product (2.2.2-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.2.
+ * Updating year in copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 03 Oct 2012 21:51:34 +0200
+
tryton-modules-product (2.2.1-2) unstable; urgency=low
[ Mathias Behrle ]
commit fee5183def0dea6a4759619835bae39cef0a277d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 3 21:41:37 2012 +0200
Updating year in copyright.
diff --git a/debian/copyright b/debian/copyright
index 5cb3449..4fbf72f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,9 +3,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
2004-2008 Tiny SPRL
- 2008-2011 Cedric Krier
+ 2008-2012 Cedric Krier
2008-2011 Bertrand Chenal
- 2008-2011 B2CK SPRL
+ 2008-2012 B2CK SPRL
License: GPL-3+
Files: icons/*
commit 2cf5d18c4505576eac192759f6c24f080c0120aa
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Sep 12 15:45:19 2012 +0200
Merging upstream version 2.2.2.
diff --git a/CHANGELOG b/CHANGELOG
index 3ac4344..1fdc4b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.2 - 2012-09-02
+* 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 a9feb41..83c0f58 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2012 Cédric Krier.
Copyright (C) 2008-2011 Bertrand Chenal.
-Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2008-2012 B2CK SPRL.
Copyright (C) 2004-2008 Tiny SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 61b54f3..9b9e8ae 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
Name: trytond_product
-Version: 2.2.1
+Version: 2.2.2
Summary: Define products, categories of product, units of measure, categories of units of measure.
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 94e1f65..462de08 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -10,7 +10,7 @@
'name_fr_FR': 'Produit',
'name_nl_NL': 'Producten',
'name_ru_RU': 'ТМЦ',
- 'version' : '2.2.1',
+ 'version': '2.2.2',
'author' : 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/tests/test_product.py b/tests/test_product.py
index 753e24d..c3f5f9d 100644
--- a/tests/test_product.py
+++ b/tests/test_product.py
@@ -64,17 +64,17 @@ class ProductTestCase(unittest.TestCase):
})
transaction.cursor.commit()
- self.failUnlessRaises(Exception, self.uom.write, {
+ self.failUnlessRaises(Exception, self.uom.write, uom_id, {
'rate': 0.0,
})
transaction.cursor.rollback()
- self.failUnlessRaises(Exception, self.uom.write, {
+ self.failUnlessRaises(Exception, self.uom.write, uom_id, {
'factor': 0.0,
})
transaction.cursor.rollback()
- self.failUnlessRaises(Exception, self.uom.write, {
+ self.failUnlessRaises(Exception, self.uom.write, uom_id, {
'rate': 0.0,
'factor': 0.0,
})
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 530b678..267915e 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
Name: trytond-product
-Version: 2.2.1
+Version: 2.2.2
Summary: Define products, categories of product, units of measure, categories of units of measure.
Home-page: http://www.tryton.org/
Author: B2CK
commit 773787d4a93500f8c4cf81535cc18cabe6834847
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:22:23 2012 +0200
Releasing debian version 2.2.1-2.
diff --git a/debian/changelog b/debian/changelog
index 912c690..4d9e6b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+tryton-modules-product (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:22:14 +0200
+
tryton-modules-product (2.2.1-1) unstable; urgency=low
* Merging upstream version 2.2.1.
commit 6a38d1f3c9abc1386403abff894183b46b94e8e9
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:02:29 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 5a2a655..f147fed 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-product.git
commit 31a3abc5241fa3163309ff46c1c7e59361e9caf5
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 3b920a2916b10513bae59900bd470b9658219ca7
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 165d163..5cb3449 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,10 +2,10 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- (C) 2004-2008 Tiny SPRL
- (C) 2008-2011 Cedric Krier
- (C) 2008-2011 Bertrand Chenal
- (C) 2008-2011 B2CK SPRL
+ 2004-2008 Tiny SPRL
+ 2008-2011 Cedric Krier
+ 2008-2011 Bertrand Chenal
+ 2008-2011 B2CK SPRL
License: GPL-3+
Files: icons/*
@@ -14,8 +14,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 7f61819d48c9b73a2174205a848dcc2e1cb37fc4
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 1e12230..5a2a655 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-product.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-product.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-product.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-product.git
X-Python-Version: >= 2.6
Package: tryton-modules-product
commit fb9789434d1e3f106b7f73ff58990c46b83f2ce0
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:52:31 2012 +0200
Updating maintainers field.
diff --git a/debian/control b/debian/control
index 102f846..1e12230 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-product
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-product
More information about the tryton-debian-vcs
mailing list