[tryton-debian-vcs] tryton-modules-company branch debian-wheezy-2.2 created. e363536e0056b2717533df36f82c96898863ef58
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:00:51 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-company.git;a=commitdiff;h=e363536e0056b2717533df36f82c96898863ef58
commit e363536e0056b2717533df36f82c96898863ef58
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 19 19:25:26 2013 +0100
Releasing debian version 2.2.2-1.
diff --git a/debian/changelog b/debian/changelog
index e85d930..94df17c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-company (2.2.2-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.2.
+ * Updating to Standards-Version: 3.9.4, no changes needed.
+ * Removing obsolete Dm-Upload-Allowed
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sun, 24 Feb 2013 22:11:14 +0100
+
tryton-modules-company (2.2.1-2) unstable; urgency=low
[ Mathias Behrle ]
commit 864216245131d678e0210e238081d1d483baff5c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 22:09:31 2013 +0100
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 022b33e..1bd3064 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright:
- 2008-2011 Cedric Krier
+Copyright: 2008-2012 Cédric Krier
2008-2011 Bertrand Chenal
- 2008-2011 B2CK SPRL
+ 2008-2012 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 0ef1046d6bb995f6e4050816a3887268f8abf761
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 22:01:47 2013 +0100
Removing obsolete Dm-Upload-Allowed
diff --git a/debian/control b/debian/control
index 69ce8c4..8ae6dbe 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: python
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 (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
commit ad98a8fa5829c04623e769ca45bde9d849222ec4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 22:01:09 2013 +0100
Updating to Standards-Version: 3.9.4, no changes needed.
diff --git a/debian/control b/debian/control
index 0d6ed5c..69ce8c4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ 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 (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-company.git
Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-company.git
commit bea8867068bbc2229a97a20fddead9ad08c3b28b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 19:46:16 2013 +0100
Merging upstream version 2.2.2.
diff --git a/CHANGELOG b/CHANGELOG
index f9fcbce..d6e6ac2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.2 - 2012-12-23
+* 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..26f578f 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.
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 e7fab0f..3573a16 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_company
-Version: 2.2.1
+Version: 2.2.2
Summary: Define company and employee.
Add main and current company on users preferences.
Add company on properties.
diff --git a/__tryton__.py b/__tryton__.py
index 10fabc3..4f592d2 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -9,7 +9,7 @@
'name_es_ES': 'Empresa',
'name_fr_FR': 'Société',
'name_nl_NL': 'Bedrijf',
- 'version': '2.2.1',
+ 'version': '2.2.2',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/company.py b/company.py
index 6e15d19..1102651 100644
--- a/company.py
+++ b/company.py
@@ -225,11 +225,12 @@ class Property(ModelSQL, ModelView):
res['company'] = user.company.id
return res
- def search(self, domain, offset=0, limit=None, order=None, count=False):
+ def search(self, domain, offset=0, limit=None, order=None, count=False,
+ query_string=False):
if Transaction().user == 0 and not 'user' in Transaction().context:
domain = ['AND', domain[:], ('company', '=', False)]
- return super(Property, self).search(domain, offset=offset,
- limit=limit, order=order, count=count)
+ return super(Property, self).search(domain, offset=offset, limit=limit,
+ order=order, count=count, query_string=query_string)
Property()
diff --git a/trytond_company.egg-info/PKG-INFO b/trytond_company.egg-info/PKG-INFO
index 57ff09b..fa23cae 100644
--- a/trytond_company.egg-info/PKG-INFO
+++ b/trytond_company.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-company
-Version: 2.2.1
+Version: 2.2.2
Summary: Define company and employee.
Add main and current company on users preferences.
Add company on properties.
commit c6f596fa2cc576f19f422fd1da787e587a7df1a9
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:14:32 2012 +0200
Releasing debian version 2.2.1-2.
diff --git a/debian/changelog b/debian/changelog
index 033c684..e85d930 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+tryton-modules-company (2.2.1-2) unstable; urgency=low
+
+ [ Mathias Behrle ]
+ * Updating to Standards-Version: 3.9.3, no changes needed.
+ * Updating year in copyright.
+ * Adding myself to 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:13:25 +0200
+
tryton-modules-company (2.2.1-1) unstable; urgency=low
* Merging upstream version 2.2.1.
commit 0bb9f2074b73415b3bf8f4e0f58c4290d3e56cdd
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 d084ad1..0d6ed5c 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-company.git
commit 7b55fb5f86aee4c73f8ff1ae7eca4ebb3c3f0364
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 278b363ff253cb5c3d0d66ad07218564dc56652c
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:50:23 2012 +0200
Correcting copyright file to match format version 1.0.
diff --git a/debian/copyright b/debian/copyright
index d2ad74d..022b33e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,15 +2,15 @@ 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: debian/*
Copyright:
- (C) 2009-2012 Daniel Baumann <daniel at debian.org>
- (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2009-2012 Daniel Baumann <daniel at debian.org>
+ 2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 62e641d2b2264617379d493785ef3637bb794d31
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 ffb2189..d084ad1 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-company.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-company.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-company.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-company.git
X-Python-Version: >= 2.6
Package: tryton-modules-company
commit bbd4f45d4feb97ffba5c0b2747ed1414a62adc39
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 76077f5..ffb2189 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-company
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-company
More information about the tryton-debian-vcs
mailing list