r29708 - in /packages/experimental/caribou/debian: 52libcaribou-gtk-module_add-to-gtk-modules 52libcaribou-gtk3-module_add-to-gtk-modules caribou.install control control.in copyright libcaribou-gtk-module.install libcaribou-gtk3-module.install rules

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Fri Sep 23 17:11:14 UTC 2011 

Author: bigon
Date: Fri Sep 23 17:11:13 2011
New Revision: 29708

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29708
Log:
Drop debian/52libcaribou-gtk3-module_add-to-gtk-modules and debian/52libcaribou-gtk-module_add-to-gtk-modules
Install caribou-gtk3-module.desktop and caribou-gtk-module.desktop in GTK module package
Make the GTK module package depends against caribou, not the opposite
Do not display caribou in application list and start it only in GNOME

Removed:
    packages/experimental/caribou/debian/52libcaribou-gtk-module_add-to-gtk-modules
    packages/experimental/caribou/debian/52libcaribou-gtk3-module_add-to-gtk-modules
Modified:
    packages/experimental/caribou/debian/caribou.install
    packages/experimental/caribou/debian/control
    packages/experimental/caribou/debian/control.in
    packages/experimental/caribou/debian/copyright
    packages/experimental/caribou/debian/libcaribou-gtk-module.install
    packages/experimental/caribou/debian/libcaribou-gtk3-module.install
    packages/experimental/caribou/debian/rules

Modified: packages/experimental/caribou/debian/caribou.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/caribou/debian/caribou.install?rev=29708&op=diff
==============================================================================
--- packages/experimental/caribou/debian/caribou.install [utf-8] (original)
+++ packages/experimental/caribou/debian/caribou.install [utf-8] Fri Sep 23 17:11:13 2011
@@ -1,7 +1,6 @@
 etc
 usr/bin
 usr/lib/caribou
-usr/lib/gnome-settings-daemon-3.0/gtk-modules
 usr/lib/python*
 usr/share/antler
 usr/share/applications

Modified: packages/experimental/caribou/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/caribou/debian/control?rev=29708&op=diff
==============================================================================
--- packages/experimental/caribou/debian/control [utf-8] (original)
+++ packages/experimental/caribou/debian/control [utf-8] Fri Sep 23 17:11:13 2011
@@ -89,7 +89,6 @@
          gir1.2-glib-2.0,
          gir1.2-gtk-3.0,
          gir1.2-clutter-1.0,
-         libcaribou-gtk3-module | libcaribou-gtk-module,
          python-dbus,
          python-pyatspi2,
          ${misc:Depends}
@@ -99,6 +98,8 @@
 Package: libcaribou-gtk-module
 Architecture: any
 Depends: ${shlibs:Depends},
+         caribou (= ${source:Version}),
+         gsettings-desktop-schemas,
          ${misc:Depends}
 Description: Configurable on screen keyboard with scanning mode - module
  An input assistive technology intended for switch and pointer users.
@@ -119,6 +120,8 @@
 Package: libcaribou-gtk3-module
 Architecture: any
 Depends: ${shlibs:Depends},
+         caribou (= ${source:Version}),
+         gsettings-desktop-schemas,
          ${misc:Depends}
 Description: Configurable on screen keyboard with scanning mode - module
  An input assistive technology intended for switch and pointer users.

Modified: packages/experimental/caribou/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/caribou/debian/control.in?rev=29708&op=diff
==============================================================================
--- packages/experimental/caribou/debian/control.in [utf-8] (original)
+++ packages/experimental/caribou/debian/control.in [utf-8] Fri Sep 23 17:11:13 2011
@@ -84,7 +84,6 @@
          gir1.2-glib-2.0,
          gir1.2-gtk-3.0,
          gir1.2-clutter-1.0,
-         libcaribou-gtk3-module | libcaribou-gtk-module,
          python-dbus,
          python-pyatspi2,
          ${misc:Depends}
@@ -94,6 +93,8 @@
 Package: libcaribou-gtk-module
 Architecture: any
 Depends: ${shlibs:Depends},
+         caribou (= ${source:Version}),
+         gsettings-desktop-schemas,
          ${misc:Depends}
 Description: Configurable on screen keyboard with scanning mode - module
  An input assistive technology intended for switch and pointer users.
@@ -114,6 +115,8 @@
 Package: libcaribou-gtk3-module
 Architecture: any
 Depends: ${shlibs:Depends},
+         caribou (= ${source:Version}),
+         gsettings-desktop-schemas,
          ${misc:Depends}
 Description: Configurable on screen keyboard with scanning mode - module
  An input assistive technology intended for switch and pointer users.

Modified: packages/experimental/caribou/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/caribou/debian/copyright?rev=29708&op=diff
==============================================================================
--- packages/experimental/caribou/debian/copyright [utf-8] (original)
+++ packages/experimental/caribou/debian/copyright [utf-8] Fri Sep 23 17:11:13 2011
@@ -27,6 +27,7 @@
 
 Files: debian/*
 Copyright: 2011, Rico Tzschichholz <ricotz at ubuntu.com>
+           2011, Laurent Bigonville <bigon at debian.org>
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

Modified: packages/experimental/caribou/debian/libcaribou-gtk-module.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/caribou/debian/libcaribou-gtk-module.install?rev=29708&op=diff
==============================================================================
--- packages/experimental/caribou/debian/libcaribou-gtk-module.install [utf-8] (original)
+++ packages/experimental/caribou/debian/libcaribou-gtk-module.install [utf-8] Fri Sep 23 17:11:13 2011
@@ -1,2 +1,2 @@
 usr/lib/gtk-2.0/modules/libcaribou*.so
-debian/52libcaribou-gtk-module_add-to-gtk-modules /etc/X11/Xsession.d
+usr/lib/gnome-settings-daemon-3.0/gtk-modules/caribou-gtk-module.desktop

Modified: packages/experimental/caribou/debian/libcaribou-gtk3-module.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/caribou/debian/libcaribou-gtk3-module.install?rev=29708&op=diff
==============================================================================
--- packages/experimental/caribou/debian/libcaribou-gtk3-module.install [utf-8] (original)
+++ packages/experimental/caribou/debian/libcaribou-gtk3-module.install [utf-8] Fri Sep 23 17:11:13 2011
@@ -1,2 +1,2 @@
 usr/lib/gtk-3.0/modules/libcaribou*.so
-debian/52libcaribou-gtk3-module_add-to-gtk-modules /etc/X11/Xsession.d
+usr/lib/gnome-settings-daemon-3.0/gtk-modules/caribou-gtk3-module.desktop

Modified: packages/experimental/caribou/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/caribou/debian/rules?rev=29708&op=diff
==============================================================================
--- packages/experimental/caribou/debian/rules [utf-8] (original)
+++ packages/experimental/caribou/debian/rules [utf-8] Fri Sep 23 17:11:13 2011
@@ -11,6 +11,14 @@
 include /usr/share/cdbs/1/rules/utils.mk
 common-binary-post-install-arch:: list-missing
 
+install/libcaribou-gtk3-module::
+	cp -a modules/caribou-gtk-module.desktop \
+	      debian/tmp/usr/lib/gnome-settings-daemon-3.0/gtk-modules/caribou-gtk3-module.desktop
+
+install/caribou::
+	echo "NoDisplay=true" >> debian/tmp/usr/share/applications/caribou.desktop
+	echo "OnlyShowIn=GNOME;" >> debian/tmp/etc/xdg/autostart/caribou-autostart.desktop
+
 DEB_PYTHON2_MODULE_PACKAGES = caribou
 
 DEB_DH_MAKESHLIBS_ARGS_libcaribou0 += -V -- -c4

More information about the pkg-gnome-commits mailing list