[tryton-debian-vcs] tryton-modules-party branch debian-wheezy-2.6 created. 25a2b2bec3ad3a70207f1b38b984e56cb0ae7023
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:03:41 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-party.git;a=commitdiff;h=25a2b2bec3ad3a70207f1b38b984e56cb0ae7023
commit 25a2b2bec3ad3a70207f1b38b984e56cb0ae7023
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 12:07:17 2013 +0200
Releasing debian version 2.6.1-1.
diff --git a/debian/changelog b/debian/changelog
index 44cca84..33fe346 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-party (2.6.1-1) experimental; urgency=low
+
+ * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704385).
+ * 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> Sat, 04 May 2013 02:39:52 +0200
+
tryton-modules-party (2.6.0-3) experimental; urgency=low
* Updating Vcs-Git to correct address.
commit 1371684ec8cf5390c775507b8cf49f47b6338d62
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 02:13:01 2013 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 58125a4..2a8de3e 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
2008-2011 Udo Spallek
2008-2011 Korbinian Preisler
2008-2011 virtual things
commit 7c23bcfe7f8580173f4fb7f6e2c35fc9712dafdb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 01:56:59 2013 +0200
Merging upstream version 2.6.1.
diff --git a/CHANGELOG b/CHANGELOG
index 23170cf..d8173ee 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2013-05-02
+* 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 dfe7d1e..89aabe7 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) 2008-2011 Udo Spallek.
Copyright (C) 2008-2011 Korbinian Preisler.
Copyright (C) 2008-2011 virtual things.
diff --git a/PKG-INFO b/PKG-INFO
index 48774d1..7c522f7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_party
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module with parties and addresses
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/party.py b/party.py
index 1694c99..c1e0c6e 100644
--- a/party.py
+++ b/party.py
@@ -179,17 +179,7 @@ class Party(ModelSQL, ModelView):
default = {}
default = default.copy()
default['code'] = None
- default['addresses'] = None
- new_parties = []
- for party in parties:
- new_party = super(Party, cls).copy(party, default=default)
- Address.copy([x.id for x in new_party.addresses],
- default={
- 'party': new_party.id,
- })
- new_parties.append(new_party)
-
- return new_parties
+ return super(Party, cls).copy(parties, default=default)
@classmethod
def search_rec_name(cls, name, clause):
diff --git a/tryton.cfg b/tryton.cfg
index 0732da8..bc0df45 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.6.1
depends:
country
ir
diff --git a/trytond_party.egg-info/PKG-INFO b/trytond_party.egg-info/PKG-INFO
index 1045038..77ee530 100644
--- a/trytond_party.egg-info/PKG-INFO
+++ b/trytond_party.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-party
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module with parties and addresses
Home-page: http://www.tryton.org/
Author: Tryton
commit 0c9e4ac5a004166adaa095709ee036f9d218bc16
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 562d11c..3e69e1e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ X-Python-Version: >= 2.6
Package: tryton-modules-party
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-country (>= 2.6), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-country (>= ${version:major}), python-pkg-resources
Recommends: python-vatnumber
Description: Tryton Application Platform (Party 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 bd4c511edc7b3b05f126f3590264013cf613e6d1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Apr 24 00:59:41 2013 +0200
Versioning watch file for Tryton branch 2.6.
diff --git a/debian/watch b/debian/watch
index 2a7101d..eef8d77 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://downloads.tryton.org/current/ .*trytond_party-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*trytond_party-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
--
tryton-modules-party
More information about the tryton-debian-vcs
mailing list