r25837 - in /packages/experimental/gnome-shell/debian: changelog control control.in rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sat Dec 11 11:09:40 2010
New Revision: 25837

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25837
Log:
* debian/control,
  debian/rules:
  - Remove hack to get the typelibs scanned. Pass the private
    directory to dh_girepository instead. Update the minimum
    build dependency on gobject-introspection accordingly.

Modified:
    packages/experimental/gnome-shell/debian/changelog
    packages/experimental/gnome-shell/debian/control
    packages/experimental/gnome-shell/debian/control.in
    packages/experimental/gnome-shell/debian/rules

Modified: packages/experimental/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/changelog?rev=25837&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/changelog [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/changelog [utf-8] Sat Dec 11 11:09:40 2010
@@ -7,8 +7,11 @@
       + Removed, let's use GTK+3 from now on.
     - debian/patches/03_fix_dconf_service_location.diff:
       + Updated.
-    - debian/rules:
-      + Add a dirty hack so we can find the mutter gir.
+  * debian/control,
+    debian/rules:
+    - Remove hack to get the typelibs scanned. Pass the private
+      directory to dh_girepository instead. Update the minimum
+      build dependency on gobject-introspection accordingly.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 05 Dec 2010 20:08:44 +0100
 

Modified: packages/experimental/gnome-shell/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/control?rev=25837&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/control [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/control [utf-8] Sat Dec 11 11:09:40 2010
@@ -15,7 +15,7 @@
                intltool,
                libgjs-dev (>= 0.7.6),
                gvfs-backends,
-               gobject-introspection (>= 0.9),
+               gobject-introspection (>= 0.9.12-4~),
                gir1.0-atk-1.0 (>= 1.32),
                gir1.0-clutter-1.0 (>= 1.4),
                gir1.0-freedesktop (>= 0.9),

Modified: packages/experimental/gnome-shell/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/control.in?rev=25837&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/control.in [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/control.in [utf-8] Sat Dec 11 11:09:40 2010
@@ -10,7 +10,7 @@
                intltool,
                libgjs-dev (>= 0.7.6),
                gvfs-backends,
-               gobject-introspection (>= 0.9),
+               gobject-introspection (>= 0.9.12-4~),
                gir1.0-atk-1.0 (>= 1.32),
                gir1.0-clutter-1.0 (>= 1.4),
                gir1.0-freedesktop (>= 0.9),

Modified: packages/experimental/gnome-shell/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/rules?rev=25837&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/rules [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/rules [utf-8] Sat Dec 11 11:09:40 2010
@@ -8,20 +8,8 @@
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 $(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) ::
-	# Dirty hack to work-around dh_girepository limitation
-	# Should we make it scan for typelib files everywhere?
-	mkdir -p debian/gnome-shell/usr/lib/girepository-1.0
-	cp debian/gnome-shell/usr/lib/gnome-shell/*typelib \
-		debian/gnome-shell/usr/lib/girepository-1.0/
-	# Also... hrm. What do we do regarding these other "private"
-	# ones?
-	cp /usr/lib/mutter/*typelib \
-		debian/gnome-shell/usr/lib/girepository-1.0/
-	# I'm not proud of this
-	mkdir debian/gnome-shell/usr/share/gir-1.0/
-	cp /usr/lib/mutter/*gir debian/gnome-shell/usr/share/gir-1.0
-	dh_girepository -p$(cdbs_curpkg) -l src:/usr/lib/mutter/
-	rm -rf debian/gnome-shell/usr/lib/girepository-1.0
+	dh_girepository -p$(cdbs_curpkg) -l src -i /usr/lib/mutter/ \
+		/usr/lib/gnome-shell
 	find debian/$(cdbs_curpkg) -name '*.la' -exec rm -f '{}' ';'
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-compile-warnings=yes