r25933 - in /packages/experimental/mutter/debian: changelog control.in rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Mon Dec 13 22:56:13 2010
New Revision: 25933

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25933
Log:
* debian/rules:
  - Remove hack to get translations in /usr/share, no longer needed.
  - Pass the path to the typelibs to dh_girepository to get correct
    dependencies.

Modified:
    packages/experimental/mutter/debian/changelog
    packages/experimental/mutter/debian/control.in
    packages/experimental/mutter/debian/rules

Modified: packages/experimental/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/mutter/debian/changelog?rev=25933&op=diff
==============================================================================
--- packages/experimental/mutter/debian/changelog [utf-8] (original)
+++ packages/experimental/mutter/debian/changelog [utf-8] Mon Dec 13 22:56:13 2010
@@ -6,6 +6,10 @@
     - Build depend on gir1.2 packages.
   * debian/control.in:
     - Fix typo, s/shlib/shlibs/.
+  * debian/rules:
+    - Remove hack to get translations in /usr/share, no longer needed.
+    - Pass the path to the typelibs to dh_girepository to get correct
+      dependencies.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 12 Dec 2010 16:43:17 +0100
 

Modified: packages/experimental/mutter/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/mutter/debian/control.in?rev=25933&op=diff
==============================================================================
--- packages/experimental/mutter/debian/control.in [utf-8] (original)
+++ packages/experimental/mutter/debian/control.in [utf-8] Mon Dec 13 22:56:13 2010
@@ -12,7 +12,7 @@
                gir1.2-json-glib-1.0 (>= 0.12.0-1~),
                libgtk2.0-dev (>= 2.22.0),
                libcanberra-gtk3-dev,
-               gobject-introspection (>= 0.9.12),
+               gobject-introspection (>= 0.9.12-5~),
                libgirepository1.0-dev (>= 0.9.12),
                libjson-glib-dev (>= 0.12.0-1~),
                libclutter-1.0-dev (>= 1.4.0),

Modified: packages/experimental/mutter/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/mutter/debian/rules?rev=25933&op=diff
==============================================================================
--- packages/experimental/mutter/debian/rules [utf-8] (original)
+++ packages/experimental/mutter/debian/rules [utf-8] Mon Dec 13 22:56:13 2010
@@ -11,12 +11,8 @@
 DEB_DH_MAKESHLIBS_ARGS_libmetacity-private0 += -V 'libmutter-private0 (>= 2.91.3)'
 DEB_INSTALL_DOCS_metacity += doc/theme-format.txt
 
-# Hack to make sure mo files end up in /usr/share/locale while I figure
-# out why the hell they are ending up in /usr/lib/locale
-DEB_MAKE_EXTRA_ARGS = CFLAGS="$(or $(CFLAGS_$(cdbs_curpkg)),$(CFLAGS))" CXXFLAGS="$(or $(CXXFLAGS_$(cdbs_curpkg)),$(CXXFLAGS))" CPPFLAGS="$(or $(CPPFLAGS_$(cdbs_curpkg)),$(CPPFLAGS))" LDFLAGS="$(or $(LDFLAGS_$(cdbs_curpkg)),$(LDFLAGS))" $(DEB_MAKE_PARALLEL) DATADIRNAME=share
-
 $(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) ::
-	dh_girepository -p$(cdbs_curpkg)
+	dh_girepository -p$(cdbs_curpkg) /usr/lib/mutter
 
 # This does not work with mutter; disabled, for now.
 # LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed