merge with stable

authorPierre-Yves David <pierre-yves.david@logilab.fr>
changeset7ea1ee1f433a
branchdefault
phasepublic
hiddenno
parent revision#16291dc305da Added tag yams-debian-version-0.36.0-1 for changeset fb614057f429, #b78a59af2ecb When an entity type inherits from another, we must update copied relation definitions accordingly. Also, we need a creation_rank on RelationDefinition.
child revision#b739d650ba6a add a script which compares two yams schemas (closes #112914)
files modified by this revision
.hgtags
ChangeLog
__pkginfo__.py
debian/changelog
yams.spec
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1363882110 -3600
# Thu Mar 21 17:08:30 2013 +0100
# Node ID 7ea1ee1f433a874c00299edf8dda5fbce6507f4f
# Parent b78a59af2ecb03956270aeaefc72d233c47ffb91
# Parent 16291dc305dab851bf56a624a86adddc0711644d
merge with stable

diff --git a/.hgtags b/.hgtags
@@ -73,5 +73,7 @@
1  fec0fe10612f56a9d1cc06e90bf022af571aefe0 yams-debian-version-0.33.0-1
2  60caa0a406438b322f752d96df59963eecd2e54a yams-version-0.34.0
3  a1b026734347e79847e99adad3b0c9773dfdecd2 yams-debian-version-0.34.0-1
4  71618a9111ffd7d6e75569fe497abbd83d7075df yams-version-0.35.0
5  a4c943bab75d25e5343d788a87dbeea87ea1e5bb yams-debian-version-0.35.0-1
6 +e1f30f2be036ead02388354a8af62ecf2ba269e8 yams-version-0.36.0
7 +fb614057f429914968bc2c152f6525da103aa334 yams-debian-version-0.36.0-1
diff --git a/ChangeLog b/ChangeLog
@@ -1,8 +1,12 @@
8  ChangeLog for yams
9  ------------------
10 
11 +2013-01-23 -- 0.36.0
12 +    * don't translate validation error right away (#109550)
13 +    * fix relation definition inheritance (#115958)
14 +
15  2012-03-08 -- 0.35.0
16      * generic metadata attributes handling (#83813)
17      * fix debian packaging to be installable with python = 2.7 (#83759)
18      * take into account of inheritance relations in schema2dot (#88599)
19      * RichString is now a function
diff --git a/__pkginfo__.py b/__pkginfo__.py
@@ -22,11 +22,11 @@
20 
21  # package name
22  modname = 'yams'
23 
24  # release version
25 -numversion = (0, 35, 0)
26 +numversion = (0, 36, 0)
27  version = '.'.join(str(num) for num in numversion)
28 
29  # license and copyright
30  license = 'LGPL'
31 
diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,11 @@
32 +yams (0.36.0-1) unstable; urgency=low
33 +
34 +  * new upstream release
35 +
36 + -- Aurélien Campéas <aurelien.campeas@logilab.fr>  Wed, 23 Jan 2013 15:45:00 +0100
37 +
38  yams (0.35.0-1) unstable; urgency=low
39 
40    * new upstream release
41 
42   -- David Douard <david.douard@logilab.fr>  Thu, 08 Mar 2012 09:37:08 +0100
diff --git a/yams.spec b/yams.spec
@@ -7,11 +7,11 @@
43  %define __python /usr/bin/python
44  %endif
45 
46  Summary: yams
47  Name: %{python}-yams
48 -Version: 0.35.0
49 +Version: 0.36.0
50  Release: logilab.1%{?dist}
51  Source0: http://download.logilab.org/pub/yams/yams-%{version}.tar.gz
52  License: LGPLv2+
53  Group: Development/Languages/Python
54  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot