r52247 - in /desktop/unstable/gjs/debian: changelog control control.in rules

[laney at users.alioth.debian.org]

Author: laney
Date: Wed Mar 15 11:50:25 2017
New Revision: 52247

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52247
Log:
Use dh_girepository - it has an option to look in the source tree for the .gir file


Modified:
    desktop/unstable/gjs/debian/changelog
    desktop/unstable/gjs/debian/control
    desktop/unstable/gjs/debian/control.in
    desktop/unstable/gjs/debian/rules

Modified: desktop/unstable/gjs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/changelog?rev=52247&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gjs/debian/changelog	[utf-8] Wed Mar 15 11:50:25 2017
@@ -1,19 +1,19 @@
-gjs (1.46.0-2) UNRELEASED; urgency=medium
+gjs (1.46.0-2) unstable; urgency=medium
 
   [ Roland Hieber ]
   * Fix typo in package description (Closes: #841138)
 
   [ Iain Lane ]
-  * debian/control{,.in}: Have libgjs0e depend on gir1.2-{glib-2.0,gtk-3.0},
-    since the GjsPrivate library requires GObject, GLib and Gtk. gjs-tests
-    depends transitively on this package, so remove the gir1.2-gtk-3.0
-    dependency from there.
+  * debian/control{,.in}: Have libgjs0e depend on gir dependencies, since the
+    GjsPrivate library requires GObject, GLib and Gtk. gjs-tests depends
+    transitively on this package, so remove the gir1.2-gtk-3.0 dependency from
+    there.
   * d/p/0001-installed-tests-Prepend-pkglibdir-to-library-path.patch: Backport
     an upstream patch to look in pkglibdir for (private) libraries, in the
     installed test runner. Should fix the installed tests, and thus the
     autopkgtests.
 
- -- Andreas Henriksson <andreas at fatal.se>  Tue, 18 Oct 2016 14:20:48 +0200
+ -- Iain Lane <laney at debian.org>  Wed, 15 Mar 2017 11:21:32 +0000
 
 gjs (1.46.0-1) unstable; urgency=medium
 

Modified: desktop/unstable/gjs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/control?rev=52247&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/control	[utf-8] (original)
+++ desktop/unstable/gjs/debian/control	[utf-8] Wed Mar 15 11:50:25 2017
@@ -58,8 +58,7 @@
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gir1.2-gtk-3.0,
-         gir1.2-glib-2.0
+         ${gir:Depends}
 Conflicts: libgjs0, libgjs0a, libgjs0b, libgjs0c, libgjs0d
 Replaces: libgjs0, libgjs0a, libgjs0b, libgjs0c, libgjs0d
 Provides: ${gjs:Provides}

Modified: desktop/unstable/gjs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/control.in?rev=52247&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gjs/debian/control.in	[utf-8] Wed Mar 15 11:50:25 2017
@@ -54,8 +54,7 @@
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gir1.2-gtk-3.0,
-         gir1.2-glib-2.0
+         ${gir:Depends}
 Conflicts: libgjs0, libgjs0a, libgjs0b, libgjs0c, libgjs0d
 Replaces: libgjs0, libgjs0a, libgjs0b, libgjs0c, libgjs0d
 Provides: ${gjs:Provides}

Modified: desktop/unstable/gjs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/rules?rev=52247&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/rules	[utf-8] (original)
+++ desktop/unstable/gjs/debian/rules	[utf-8] Wed Mar 15 11:50:25 2017
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
+
+export DH_VERBOSE=1
 
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
@@ -7,7 +9,7 @@
 LIBMOZJS = $(shell objdump -p debian/tmp/usr/lib/libgjs.so | awk '$$1=="NEEDED" && $$2~/^libmozjs/ { print $$2 }' | sed s/\\.so\\./-/ )
 
 %:
-	dh $@ --with gnome
+	dh $@ --with gnome,gir
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
@@ -16,6 +18,9 @@
 		--enable-installed-tests \
 		--with-xvfb-tests \
 		--with-dbus-tests
+
+override_dh_girepository:
+	dh_girepository -l $(CURDIR) /usr/lib/gjs/girepository-1.0
 
 override_dh_install:
 	dh_install --fail-missing -X.la