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

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Wed Jun 15 10:46:08 2011
New Revision: 28452

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28452
Log:
debian/control.in, debian/rules: When building on Ubuntu, add a dependency
to gnome-icon-theme-full.

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=28452&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/changelog [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/changelog [utf-8] Wed Jun 15 10:46:08 2011
@@ -1,3 +1,10 @@
+gnome-shell (3.0.2-2) UNRELEASED; urgency=low
+
+  * debian/control.in, debian/rules: When building on Ubuntu, add a dependency
+    to gnome-icon-theme-full.
+
+ -- Martin Pitt <mpitt at debian.org>  Wed, 15 Jun 2011 12:45:30 +0200
+
 gnome-shell (3.0.2-1) experimental; urgency=low
 
   [ Rico Tzschichholz ]

Modified: packages/experimental/gnome-shell/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/control?rev=28452&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/control [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/control [utf-8] Wed Jun 15 10:46:08 2011
@@ -70,6 +70,7 @@
          gnome-settings-daemon (>= 2.91.5.1),
          gsettings-desktop-schemas (>= 0.1.7),
          gnome-icon-theme-symbolic (>= 2.91),
+         ${icon-theme:Depends},
          gir1.2-gconf-2.0,
          gir1.2-gkbd-3.0,
          gir1.2-gnomebluetooth-1.0,

Modified: packages/experimental/gnome-shell/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/control.in?rev=28452&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/control.in [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/control.in [utf-8] Wed Jun 15 10:46:08 2011
@@ -65,6 +65,7 @@
          gnome-settings-daemon (>= 2.91.5.1),
          gsettings-desktop-schemas (>= 0.1.7),
          gnome-icon-theme-symbolic (>= 2.91),
+         ${icon-theme:Depends},
          gir1.2-gconf-2.0,
          gir1.2-gkbd-3.0,
          gir1.2-gnomebluetooth-1.0,

Modified: packages/experimental/gnome-shell/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/rules?rev=28452&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/rules [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/rules [utf-8] Wed Jun 15 10:46:08 2011
@@ -6,6 +6,10 @@
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+ifeq ($(shell dpkg-vendor --query vendor),Ubuntu)
+	DEB_DH_GENCONTROL_ARGS += -- -Vicon-theme:Depends=gnome-icon-theme-full
+endif
 
 $(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) ::
 	dh_girepository -p$(cdbs_curpkg) -l src -p /usr/lib/mutter \