summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcpopa <devnull@localhost>2014-05-07 18:03:24 +0300
committercpopa <devnull@localhost>2014-05-07 18:03:24 +0300
commitd0b270a9bb49ecc37209c054a3883321a1d1cc1e (patch)
tree8c8349e0b48bfa3b6338d0e8c0853bbbd9361926
parent21ffd54d9e35f2c65afc820a544042880a05b858 (diff)
parent2e1b081f5ecf86383f6eb35a3b9848d12ec771b2 (diff)
downloadastroid-d0b270a9bb49ecc37209c054a3883321a1d1cc1e.tar.gz
Merge with default.
-rw-r--r--ChangeLog1
-rw-r--r--__pkginfo__.py2
-rw-r--r--debian/changelog6
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ff1b1f4..0df2aef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ Change log for the astroid package (used to be astng)
of builtin descriptors when determining their type
(`classmethod` and `staticmethod`).
+2014-04-30 -- 1.1.1
* `Class.metaclass()` looks in ancestors when the current class
does not define explicitly a metaclass.
diff --git a/__pkginfo__.py b/__pkginfo__.py
index 2c8aa86..85398ff 100644
--- a/__pkginfo__.py
+++ b/__pkginfo__.py
@@ -21,7 +21,7 @@ distname = 'astroid'
modname = 'astroid'
-numversion = (1, 1, 0)
+numversion = (1, 1, 1)
version = '.'.join([str(num) for num in numversion])
install_requires = ['logilab-common >= 0.60.0']
diff --git a/debian/changelog b/debian/changelog
index 6e80b34..04d3688 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+astroid (1.1.1-1) unstable; urgency=low
+
+ * new upstream release
+
+ -- Sylvain Thénault <sylvain.thenault@logilab.fr> Wed, 30 Apr 2014 17:57:52 +0200
+
astroid (1.1.0-1) unstable; urgency=low
* new upstream release