r29716 - /packages/experimental/caribou/debian/

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Fri Sep 23 23:32:40 UTC 2011 

Author: bigon
Date: Fri Sep 23 23:32:39 2011
New Revision: 29716

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29716
Log:
Add libcaribou-common and caribou-antler package
Use multiarch spec

Added:
    packages/experimental/caribou/debian/caribou-antler.install
    packages/experimental/caribou/debian/libcaribou-common.install
Modified:
    packages/experimental/caribou/debian/caribou.install
    packages/experimental/caribou/debian/control
    packages/experimental/caribou/debian/control.in
    packages/experimental/caribou/debian/gir1.2-caribou-1.0.install
    packages/experimental/caribou/debian/libcaribou-dev.install
    packages/experimental/caribou/debian/libcaribou-gtk-module.install
    packages/experimental/caribou/debian/libcaribou-gtk3-module.install
    packages/experimental/caribou/debian/libcaribou0.install
    packages/experimental/caribou/debian/rules

Added: packages/experimental/caribou/debian/caribou-antler.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/caribou/debian/caribou-antler.install?rev=29716&op=file
==============================================================================
--- packages/experimental/caribou/debian/caribou-antler.install (added)
+++ packages/experimental/caribou/debian/caribou-antler.install [utf-8] Fri Sep 23 23:32:39 2011
@@ -1,0 +1,5 @@
+usr/share/antler/
+usr/lib/caribou/antler-keyboard
+usr/share/dbus-1/services/org.gnome.Caribou.Antler.service
+usr/share/glib-2.0/schemas/org.gnome.antler.gschema.xml
+usr/lib/python*/*-packages/caribou/antler

Modified: packages/experimental/caribou/debian/caribou.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/caribou/debian/caribou.install?rev=29716&op=diff
==============================================================================
--- packages/experimental/caribou/debian/caribou.install [utf-8] (original)
+++ packages/experimental/caribou/debian/caribou.install [utf-8] Fri Sep 23 23:32:39 2011
@@ -1,10 +1,9 @@
 etc
 usr/bin
-usr/lib/caribou
-usr/lib/python*
-usr/share/antler
+usr/share/locale
+usr/lib/python*/*-packages/caribou/__init__.py
+usr/lib/python*/*-packages/caribou/i18n.py
+usr/lib/python*/*-packages/caribou/settings/
+usr/lib/python*/*-packages/caribou/daemon/
+usr/share/glib-2.0/schemas/org.gnome.caribou.gschema.xml
 usr/share/applications
-usr/share/caribou
-usr/share/dbus-1
-usr/share/glib-2.0
-usr/share/locale

Modified: packages/experimental/caribou/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/caribou/debian/control?rev=29716&op=diff
==============================================================================
--- packages/experimental/caribou/debian/control [utf-8] (original)
+++ packages/experimental/caribou/debian/control [utf-8] Fri Sep 23 23:32:39 2011
@@ -36,11 +36,23 @@
 Package: libcaribou0
 Architecture: any
 Depends: ${shlibs:Depends},
+         libcaribou-common (= ${source:Version}),
          ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Configurable on screen keyboard with scanning mode - library
  An input assistive technology intended for switch and pointer users.
  .
  This package contains the shared library.
+
+Package: libcaribou-common
+Architecture: all
+Depends: ${misc:Depends}
+Multi-Arch: foreign
+Description: Configurable on screen keyboard with scanning mode - common files
+ An input assistive technology intended for switch and pointer users.
+ .
+ This package contains support files for libcaribou
 
 Package: libcaribou-dev
 Section: libdevel
@@ -74,6 +86,7 @@
 Architecture: any
 Depends: libcaribou0 (= ${binary:Version}),
          ${misc:Depends}
+Multi-Arch: same
 Description: Configurable on screen keyboard - library (debug symbols)
  An input assistive technology intended for switch and pointer users.
  .
@@ -81,7 +94,6 @@
 
 Package: caribou
 Section: gnome
-Priority: extra
 Architecture: all
 Depends: ${python:Depends},
          python-gobject (>= 2.27.92),
@@ -95,10 +107,25 @@
 Description: Configurable on screen keyboard with scanning mode
  An input assistive technology intended for switch and pointer users.
  
+Package: caribou-antler
+Section: gnome
+Priority: extra
+Architecture: all
+Depends: ${python:Depends},
+         caribou (= ${source:Version}),
+         python-gobject (>= 2.27.92),
+         gir1.2-caribou-1.0,
+         gir1.2-glib-2.0,
+         gir1.2-gtk-3.0,
+         gir1.2-clutter-1.0,
+         python-dbus,
+         ${misc:Depends}
+Description: Configurable on screen keyboard with scanning mode
+ An input assistive technology intended for switch and pointer users.
+
 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 (GTK+ 2.0 module)
@@ -120,7 +147,6 @@
 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 (GTK+ 3.0 module)

Modified: packages/experimental/caribou/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/caribou/debian/control.in?rev=29716&op=diff
==============================================================================
--- packages/experimental/caribou/debian/control.in [utf-8] (original)
+++ packages/experimental/caribou/debian/control.in [utf-8] Fri Sep 23 23:32:39 2011
@@ -31,11 +31,23 @@
 Package: libcaribou0
 Architecture: any
 Depends: ${shlibs:Depends},
+         libcaribou-common (= ${source:Version}),
          ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Configurable on screen keyboard with scanning mode - library
  An input assistive technology intended for switch and pointer users.
  .
  This package contains the shared library.
+
+Package: libcaribou-common
+Architecture: all
+Depends: ${misc:Depends}
+Multi-Arch: foreign
+Description: Configurable on screen keyboard with scanning mode - common files
+ An input assistive technology intended for switch and pointer users.
+ .
+ This package contains support files for libcaribou
 
 Package: libcaribou-dev
 Section: libdevel
@@ -69,6 +81,7 @@
 Architecture: any
 Depends: libcaribou0 (= ${binary:Version}),
          ${misc:Depends}
+Multi-Arch: same
 Description: Configurable on screen keyboard - library (debug symbols)
  An input assistive technology intended for switch and pointer users.
  .
@@ -76,7 +89,6 @@
 
 Package: caribou
 Section: gnome
-Priority: extra
 Architecture: all
 Depends: ${python:Depends},
          python-gobject (>= 2.27.92),
@@ -90,10 +102,25 @@
 Description: Configurable on screen keyboard with scanning mode
  An input assistive technology intended for switch and pointer users.
  
+Package: caribou-antler
+Section: gnome
+Priority: extra
+Architecture: all
+Depends: ${python:Depends},
+         caribou (= ${source:Version}),
+         python-gobject (>= 2.27.92),
+         gir1.2-caribou-1.0,
+         gir1.2-glib-2.0,
+         gir1.2-gtk-3.0,
+         gir1.2-clutter-1.0,
+         python-dbus,
+         ${misc:Depends}
+Description: Configurable on screen keyboard with scanning mode
+ An input assistive technology intended for switch and pointer users.
+
 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 (GTK+ 2.0 module)
@@ -115,7 +142,6 @@
 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 (GTK+ 3.0 module)

Modified: packages/experimental/caribou/debian/gir1.2-caribou-1.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/caribou/debian/gir1.2-caribou-1.0.install?rev=29716&op=diff
==============================================================================
--- packages/experimental/caribou/debian/gir1.2-caribou-1.0.install [utf-8] (original)
+++ packages/experimental/caribou/debian/gir1.2-caribou-1.0.install [utf-8] Fri Sep 23 23:32:39 2011
@@ -1,1 +1,1 @@
-usr/lib/girepository-1.0/*
+usr/lib/*/girepository-1.0/* usr/lib/girepository-1.0/

Added: packages/experimental/caribou/debian/libcaribou-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/caribou/debian/libcaribou-common.install?rev=29716&op=file
==============================================================================
--- packages/experimental/caribou/debian/libcaribou-common.install (added)
+++ packages/experimental/caribou/debian/libcaribou-common.install [utf-8] Fri Sep 23 23:32:39 2011
@@ -1,0 +1,1 @@
+usr/share/caribou

Modified: packages/experimental/caribou/debian/libcaribou-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/caribou/debian/libcaribou-dev.install?rev=29716&op=diff
==============================================================================
--- packages/experimental/caribou/debian/libcaribou-dev.install [utf-8] (original)
+++ packages/experimental/caribou/debian/libcaribou-dev.install [utf-8] Fri Sep 23 23:32:39 2011
@@ -1,3 +1,3 @@
 usr/include/*
-usr/lib/libcaribou.so
+usr/lib/*/libcaribou.so
 usr/share/gir-1.0/*.gir

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=29716&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 23:32:39 2011
@@ -1,2 +1,2 @@
-usr/lib/gtk-2.0/modules/libcaribou*.so
-usr/lib/gnome-settings-daemon-3.0/gtk-modules/caribou-gtk-module.desktop
+usr/lib/*/gtk-2.0/modules/libcaribou*.so usr/lib/gtk-2.0/modules/
+usr/lib/*/gnome-settings-daemon-3.0/gtk-modules/caribou-gtk-module.desktop usr/lib/gnome-settings-daemon-3.0/gtk-modules/

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=29716&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 23:32:39 2011
@@ -1,2 +1,2 @@
-usr/lib/gtk-3.0/modules/libcaribou*.so
-usr/lib/gnome-settings-daemon-3.0/gtk-modules/caribou-gtk3-module.desktop
+usr/lib/*/gtk-3.0/modules/libcaribou*.so usr/lib/gtk-3.0/modules/
+usr/lib/*/gnome-settings-daemon-3.0/gtk-modules/caribou-gtk3-module.desktop usr/lib/gnome-settings-daemon-3.0/gtk-modules/

Modified: packages/experimental/caribou/debian/libcaribou0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/caribou/debian/libcaribou0.install?rev=29716&op=diff
==============================================================================
--- packages/experimental/caribou/debian/libcaribou0.install [utf-8] (original)
+++ packages/experimental/caribou/debian/libcaribou0.install [utf-8] Fri Sep 23 23:32:39 2011
@@ -1,1 +1,1 @@
-usr/lib/libcaribou.so.*
+usr/lib/*/libcaribou.so.*

Modified: packages/experimental/caribou/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/caribou/debian/rules?rev=29716&op=diff
==============================================================================
--- packages/experimental/caribou/debian/rules [utf-8] (original)
+++ packages/experimental/caribou/debian/rules [utf-8] Fri Sep 23 23:32:39 2011
@@ -7,19 +7,21 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+
 # List any files which are not installed
 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
+	      debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/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_PYTHON2_MODULE_PACKAGES = caribou caribou-antler
 
 DEB_DH_MAKESHLIBS_ARGS_libcaribou0 += -V -- -c4
 DEB_DH_MAKESHLIBS_ARGS_libcaribou-gtk-module += --no-act

More information about the pkg-gnome-commits mailing list