[tryton-debian-vcs] tryton-modules-product branch debian-wheezy-2.6 created. 9ac6c109021f16d824df18021d0e20ee41755f26

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.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-product.git;a=commitdiff;h=9ac6c109021f16d824df18021d0e20ee41755f26
commit 9ac6c109021f16d824df18021d0e20ee41755f26
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Nov 21 12:03:29 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 d67c666dd8e59f07a0ffd77409add937691fef4b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 17 13:54:31 2013 +0200

    Releasing debian version 2.6.1-1.

diff --git a/debian/changelog b/debian/changelog
index 5529577..e477250 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-product (2.6.1-1) unstable; urgency=low
+
+  * Removing Daniel from Uploaders. Thanks for your work! (Closes:
+    #704388).
+  * Versioning watch file for Tryton branch 2.6.
+  * Improving update of major version in Depends.
+  * Merging upstream version 2.6.1.
+  * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Thu, 17 Oct 2013 13:21:43 +0200
+
 tryton-modules-product (2.6.0-3) experimental; urgency=low
 
   * Updating Vcs-Git to correct address.
commit d3507202fe83b5480016255812cf99879449795b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 17 13:21:35 2013 +0200

    Updating copyright.

diff --git a/debian/copyright b/debian/copyright
index ca8ed21..846439a 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
            2004-2008 Tiny SPRL
 License: GPL-3+
 
commit cdf52c58fe25a62928817bf941cd028858563d0f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 17 13:21:30 2013 +0200

    Merging upstream version 2.6.1.

diff --git a/CHANGELOG b/CHANGELOG
index 247d489..e4a6969 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2013-10-01
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.0 - 2012-10-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index ede3fac..6e948f6 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.
 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 7e195b3..640092f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_product
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module with products
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
index 9e6da25..a50a272 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.0
+version=2.6.1
 depends:
     ir
     res
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 2500961..97b6fce 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.6.0
+Version: 2.6.1
 Summary: Tryton module with products
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/uom.py b/uom.py
index e9dfbd3..36a0079 100644
--- a/uom.py
+++ b/uom.py
@@ -123,8 +123,8 @@ class Uom(ModelSQL, ModelView):
     @classmethod
     def search_rec_name(cls, name, clause):
         ids = map(int, cls.search(['OR',
-                    (cls._rec_name,) + clause[1:],
-                    ('symbol',) + clause[1:],
+                    (cls._rec_name,) + tuple(clause[1:]),
+                    ('symbol',) + tuple(clause[1:]),
                     ], order=[]))
         return [('id', 'in', ids)]
 
commit ec093476c7f45b3fd175b2de66fd9e49380d17c1
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 aaded30..ce3f72f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ X-Python-Version: >= 2.6
 Package: tryton-modules-product
 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 (Product 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 40a71d5c8eb4eecf6b6df526095a363b3a0ff169
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Apr 24 00:59:42 2013 +0200

    Versioning watch file for Tryton branch 2.6.

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

More information about the tryton-debian-vcs mailing list