Merge lp:~timo-jyrinki/ubuntu/trusty/atk1.0/fix_lp1277460 into lp:ubuntu/trusty/atk1.0

[Timo Jyrinki]

* Add debian/patches/change_editbar_rolename.patch:
    - role: fix name for ATK_ROLE_EDITBAR, to have localized rolename
      string (LP: #1277460)

[Timo Jyrinki (timo-jyrinki)]

Not yet tested by me, but just adjusted for easier landing.

My changes were changing the changelog entry wording and adding the bug number, plus setting the maintainer to Ubuntu Developers.

This would be testable now with apt-add-repository ppa:timo-jyrinki/ppa on trusty. It built ok: https://launchpad.net/~timo-jyrinki/+archive/ppa/+sourcepub/3912057/+listing-archive-extra

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-06 15:57:25 +0000
+++ debian/changelog	2014-02-13 14:02:39 +0000
@@ -1,3 +1,11 @@
+atk1.0 (2.10.0-2ubuntu2) trusty; urgency=medium
+
+  * Add debian/patches/change_editbar_rolename.patch:
+    - role: fix name for ATK_ROLE_EDITBAR, to have localized rolename 
+      string (LP: #1277460)
+
+ -- Attila Hammer <[e-mail]>  Fri, 07 Feb 2014 11:53:38 +0100
+
 atk1.0 (2.10.0-2ubuntu1) trusty; urgency=low
 
   * Build using dh-autoreconf.

=== modified file 'debian/control'
--- debian/control	2013-12-06 15:57:25 +0000
+++ debian/control	2014-02-13 14:02:39 +0000
@@ -6,7 +6,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Andreas Henriksson <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Jordi Mallach <[e-mail]>, Michael Biebl <[e-mail]>, Sjoerd Simons <[e-mail]>
+Uploaders: Andreas Henriksson <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Michael Biebl <[e-mail]>, Sjoerd Simons <[e-mail]>
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/atk1.0
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/atk1.0
 Build-Depends: debhelper (>= 9),

=== modified file 'debian/control.in'
--- debian/control.in	2013-12-06 15:57:25 +0000
+++ debian/control.in	2014-02-13 14:02:39 +0000
@@ -1,7 +1,7 @@
 Source: atk1.0
 Section: libs
 Priority: optional
-Maintainer: Debian GNOME Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
 Uploaders: @GNOME_TEAM@
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/atk1.0
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/atk1.0

=== added file 'debian/patches/change_editbar_rolename.patch'
--- debian/patches/change_editbar_rolename.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/change_editbar_rolename.patch	2014-02-13 14:02:39 +0000
@@ -0,0 +1,21 @@
+commit d94f08ad5f878747f56b637ad2110f3f125517ad
+Author: Alejandro Piñeiro <[e-mail]>
+Date:   Fri Jan 31 15:22:31 2014 +0100
+
+    role: fix name for ATK_ROLE_EDITBAR
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=723292
+
+diff --git a/atk/atkobject.h b/atk/atkobject.h
+index f0cb898..712d68c 100755
+--- a/atk/atkobject.h
++++ b/atk/atkobject.h
+@@ -287,7 +287,7 @@ typedef enum
+   ATK_ROLE_RULER,
+   ATK_ROLE_APPLICATION,
+   ATK_ROLE_AUTOCOMPLETE,
+-  ATK_ROLE_EDITBAR,
++  ATK_ROLE_EDITBAR,          /*<nick=edit-bar>*/
+   ATK_ROLE_EMBEDDED,
+   ATK_ROLE_ENTRY,
+   ATK_ROLE_CHART,

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-03-07 14:39:06 +0000
+++ debian/patches/series	2014-02-13 14:02:39 +0000
@@ -0,0 +1,1 @@
+change_editbar_rolename.patch