r25858 - in /desktop/experimental/libgnomekbd/debian: changelog control control.in gkbd-capplet.install libgnomekbd-common.install

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sat Dec 11 13:50:58 2010
New Revision: 25858

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25858
Log:
Apply debdiff from seb128 from #606361

Modified:
    desktop/experimental/libgnomekbd/debian/changelog
    desktop/experimental/libgnomekbd/debian/control
    desktop/experimental/libgnomekbd/debian/control.in
    desktop/experimental/libgnomekbd/debian/gkbd-capplet.install
    desktop/experimental/libgnomekbd/debian/libgnomekbd-common.install

Modified: desktop/experimental/libgnomekbd/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/changelog?rev=25858&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/changelog [utf-8] (original)
+++ desktop/experimental/libgnomekbd/debian/changelog [utf-8] Sat Dec 11 13:50:58 2010
@@ -10,9 +10,16 @@
 
   [ Sjoerd Simons ]
   * debian/rules: Add list-missing
-  * debian/debian/libgnomekbd-common.install: Install schemas file
-
- -- Sjoerd Simons <sjoerd at debian.org>  Sat, 04 Dec 2010 19:39:23 +0000
+  * debian/libgnomekbd-common.install: Install schemas file
+  [ Sebastien Bacher ]
+  * (Closes: 606361) gnome-settings-daemon crashed with signal 5 in
+    gkbd_keyboard_drawing_new_dialog(). Move show-layout.ui from
+    gkbd-capplet to libgnomekbd-common and add appropriate replaces
+     - update debian/gkbd-capplet.install
+     - update debian/libgnomekbd-common.install
+     - update debian/control{.in}
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 11 Dec 2010 13:47:58 +0000
 
 libgnomekbd (2.91.2-1) experimental; urgency=low
 

Modified: desktop/experimental/libgnomekbd/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/control?rev=25858&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/control [utf-8] (original)
+++ desktop/experimental/libgnomekbd/debian/control [utf-8] Sat Dec 11 13:50:58 2010
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Loic Minier <lool at dooz.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: debhelper (>= 5),
         dh-autoreconf,
         autotools-dev,
@@ -18,7 +18,7 @@
         libgtk3.0-dev,
         libxklavier-dev (>= 5.0),
         intltool (>= 0.35)
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 
 Package: libgnomekbd-dev
 Section: libdevel
@@ -60,7 +60,9 @@
 Architecture: all
 Depends: ${shlibs:Depends},
         ${misc:Depends}
-Replaces: capplets-data (<< 1:2.17.2)
+Replaces: capplets-data (<< 1:2.17.2),
+	gkbd-capplet (<= 2.91.2-1)
+Breaks: gkbd-capplet (<= 2.91.2-1)
 Description: GNOME library to manage keyboard configuration - common files
  libgnomekbd offers an API to manage the keyboard in GNOME applications.
  .

Modified: desktop/experimental/libgnomekbd/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/control.in?rev=25858&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/control.in [utf-8] (original)
+++ desktop/experimental/libgnomekbd/debian/control.in [utf-8] Sat Dec 11 13:50:58 2010
@@ -13,7 +13,7 @@
         libgtk3.0-dev,
         libxklavier-dev (>= 5.0),
         intltool (>= 0.35)
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 
 Package: libgnomekbd-dev
 Section: libdevel
@@ -55,7 +55,9 @@
 Architecture: all
 Depends: ${shlibs:Depends},
         ${misc:Depends}
-Replaces: capplets-data (<< 1:2.17.2)
+Replaces: capplets-data (<< 1:2.17.2),
+	gkbd-capplet (<= 2.91.2-1)
+Breaks: gkbd-capplet (<= 2.91.2-1)
 Description: GNOME library to manage keyboard configuration - common files
  libgnomekbd offers an API to manage the keyboard in GNOME applications.
  .

Modified: desktop/experimental/libgnomekbd/debian/gkbd-capplet.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/gkbd-capplet.install?rev=25858&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/gkbd-capplet.install [utf-8] (original)
+++ desktop/experimental/libgnomekbd/debian/gkbd-capplet.install [utf-8] Sat Dec 11 13:50:58 2010
@@ -1,3 +1,3 @@
 debian/tmp/usr/bin
 debian/tmp/usr/share/applications
-debian/tmp/usr/share/libgnomekbd
+debian/tmp/usr/share/libgnomekbd/ui/gkbd-*.ui

Modified: desktop/experimental/libgnomekbd/debian/libgnomekbd-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/libgnomekbd-common.install?rev=25858&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/libgnomekbd-common.install [utf-8] (original)
+++ desktop/experimental/libgnomekbd/debian/libgnomekbd-common.install [utf-8] Sat Dec 11 13:50:58 2010
@@ -1,2 +1,3 @@
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/glib-2.0/schemas
+debian/tmp/usr/share/libgnomekbd/ui/show-layout.ui