r43817 - in /attic/dasher/debian: changelog control control.in patches/0001-Build-fix-AtspiEventListenerCB-isn-t-const.patch patches/series

[rbalint at users.alioth.debian.org]

Author: rbalint
Date: Thu Oct 30 21:15:29 2014
New Revision: 43817

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43817
Log:
Cherry-pick upstream patch to fix FTBFS (Closes: #755343)

Added:
    attic/dasher/debian/patches/0001-Build-fix-AtspiEventListenerCB-isn-t-const.patch
    attic/dasher/debian/patches/series
Modified:
    attic/dasher/debian/changelog
    attic/dasher/debian/control
    attic/dasher/debian/control.in

Modified: attic/dasher/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/dasher/debian/changelog?rev=43817&op=diff
==============================================================================
--- attic/dasher/debian/changelog	[utf-8] (original)
+++ attic/dasher/debian/changelog	[utf-8] Thu Oct 30 21:15:29 2014
@@ -1,3 +1,10 @@
+dasher (4.11+git20130508.adc653-2) unstable; urgency=medium
+
+  * Cherry-pick upstream patch to fix FTBFS (Closes: #755343)
+  * Add myself to uploaders
+
+ -- Balint Reczey <balint at balintreczey.hu>  Thu, 30 Oct 2014 22:04:05 +0100
+
 dasher (4.11+git20130508.adc653-1) unstable; urgency=low
 
   * New upstream git snapshot.

Modified: attic/dasher/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/dasher/debian/control?rev=43817&op=diff
==============================================================================
--- attic/dasher/debian/control	[utf-8] (original)
+++ attic/dasher/debian/control	[utf-8] Thu Oct 30 21:15:29 2014
@@ -2,12 +2,11 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
-
 Source: dasher
 Section: x11
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Alan Baghumian <alan at technotux.org>,
+Uploaders: Alan Baghumian <alan at technotux.org>,  Balint Reczey <balint at balintreczey.hu>
            Josselin Mouette <joss at debian.org>, Mario Lang <mlang at debian.org>, Sebastian Dröge <slomo at debian.org>
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/attic/dasher
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/attic/dasher

Modified: attic/dasher/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/dasher/debian/control.in?rev=43817&op=diff
==============================================================================
--- attic/dasher/debian/control.in	[utf-8] (original)
+++ attic/dasher/debian/control.in	[utf-8] Thu Oct 30 21:15:29 2014
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Alan Baghumian <alan at technotux.org>,
+Uploaders: Alan Baghumian <alan at technotux.org>, Balint Reczey <balint at balintreczey.hu>
            @GNOME_TEAM@
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/attic/dasher
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/attic/dasher

Added: attic/dasher/debian/patches/0001-Build-fix-AtspiEventListenerCB-isn-t-const.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/dasher/debian/patches/0001-Build-fix-AtspiEventListenerCB-isn-t-const.patch?rev=43817&op=file
==============================================================================
--- attic/dasher/debian/patches/0001-Build-fix-AtspiEventListenerCB-isn-t-const.patch	(added)
+++ attic/dasher/debian/patches/0001-Build-fix-AtspiEventListenerCB-isn-t-const.patch	[utf-8] Thu Oct 30 21:15:29 2014
@@ -0,0 +1,41 @@
+From 49cfdc39b1b8832ba88eb61d04e47841e2d8a96a Mon Sep 17 00:00:00 2001
+From: Patrick Welche <prlw1 at cam.ac.uk>
+Date: Thu, 5 Jun 2014 09:11:30 +0100
+Subject: [PATCH] Build fix: AtspiEventListenerCB isn't const
+
+---
+ Src/Gtk2/dasher_editor_external_atspi.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Src/Gtk2/dasher_editor_external_atspi.cpp b/Src/Gtk2/dasher_editor_external_atspi.cpp
+index 8c60a03..176e2f2 100644
+--- a/Src/Gtk2/dasher_editor_external_atspi.cpp
++++ b/Src/Gtk2/dasher_editor_external_atspi.cpp
+@@ -18,8 +18,8 @@ struct _DasherEditorExternalPrivate {
+ void dasher_editor_external_handle_focus(DasherEditor *pSelf, const AtspiEvent *pEvent);
+ void dasher_editor_external_handle_caret(DasherEditor *pSelf, const AtspiEvent *pEvent);
+ 
+-void focus_listener(const AtspiEvent *pEvent, void *pUserData);
+-void caret_listener(const AtspiEvent *pEvent, void *pUserData);
++void focus_listener(AtspiEvent *pEvent, void *pUserData);
++void caret_listener(AtspiEvent *pEvent, void *pUserData);
+ 
+ static void listen_to_bus(DasherEditor *);
+ static void unlisten_to_bus(DasherEditor *);
+@@ -255,11 +255,11 @@ dasher_editor_external_handle_caret(DasherEditor *pSelf, const AtspiEvent *pEven
+ }
+ 
+ void
+-focus_listener(const AtspiEvent *pEvent, void *pUserData) {
++focus_listener(AtspiEvent *pEvent, void *pUserData) {
+   dasher_editor_external_handle_focus(DASHER_EDITOR(pUserData), pEvent);
+ }
+ 
+ void
+-caret_listener(const AtspiEvent *pEvent, void *pUserData) {
++caret_listener(AtspiEvent *pEvent, void *pUserData) {
+   dasher_editor_external_handle_caret(DASHER_EDITOR(pUserData), pEvent);
+ }
+-- 
+2.1.1
+

Added: attic/dasher/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/dasher/debian/patches/series?rev=43817&op=file
==============================================================================
--- attic/dasher/debian/patches/series	(added)
+++ attic/dasher/debian/patches/series	[utf-8] Thu Oct 30 21:15:29 2014
@@ -0,0 +1 @@
+0001-Build-fix-AtspiEventListenerCB-isn-t-const.patch