[libgtk2-perl] 01/01: Merge branch 'jessie'

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to branch master
in repository libgtk2-perl.

commit 5d3c83089dcb5c8eb788d37e9e273886ed2c7012
Merge: 3c24dc3 6ddf70e
Author: intrigeri <intrigeri at boum.org>
Date:   Wed Feb 18 18:59:04 2015 +0000

    Merge branch 'jessie'
    
    Conflicts:
    	debian/changelog

 debian/changelog                                   |  9 ++++-
 ...nagement-in-Gtk2-Gdk-Display-list_devices.patch | 47 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 4cdeae6,027f329..548b18a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,17 @@@
- libgtk2-perl (2:1.2492-4) UNRELEASED; urgency=medium
++libgtk2-perl (2:1.2492-5) UNRELEASED; urgency=medium
 +
 +  * Drop debian/tests/control, add Testsuite field to debian/control
 +    instead.
 +
 + -- gregor herrmann <gregoa at debian.org>  Mon, 15 Sep 2014 21:18:46 +0200
 +
+ libgtk2-perl (2:1.2492-4) unstable; urgency=high
+ 
+   * Fix-incorrect-memory-management-in-Gtk2-Gdk-Display-list_devices.patch:
+     new patch, cherry-picked from upstream, that fixes a security issue.
+ 
+  -- intrigeri <intrigeri at debian.org>  Wed, 18 Feb 2015 19:45:09 +0100
+ 
  libgtk2-perl (2:1.2492-3) unstable; urgency=medium
  
    [ Salvatore Bonaccorso ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libgtk2-perl.git