r38491 - in /packages/experimental/gnome-shell-extensions/debian: changelog patches/git-drop-IsRunnableHelper.patch patches/series rules

[jbicha-guest at users.alioth.debian.org]

Author: jbicha-guest
Date: Sun Jun  9 00:34:35 2013
New Revision: 38491

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=38491
Log:
  - Run autoreconf
* debian/patches/git-drop-IsRunnableHelper.patch:
  - Don't run IsRunnableHelper since it's ignored anyway

Added:
    packages/experimental/gnome-shell-extensions/debian/patches/git-drop-IsRunnableHelper.patch
Modified:
    packages/experimental/gnome-shell-extensions/debian/changelog
    packages/experimental/gnome-shell-extensions/debian/patches/series
    packages/experimental/gnome-shell-extensions/debian/rules

Modified: packages/experimental/gnome-shell-extensions/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell-extensions/debian/changelog?rev=38491&op=diff
==============================================================================
--- packages/experimental/gnome-shell-extensions/debian/changelog [utf-8] (original)
+++ packages/experimental/gnome-shell-extensions/debian/changelog [utf-8] Sun Jun  9 00:34:35 2013
@@ -7,7 +7,9 @@
     - Depend on gnome-session and nautilus 3.8, needed for the new
       Classic mode.
   * debian/rules:
-    - Specify the location of gnome-session-check-accelerated
+    - Run autoreconf
+  * debian/patches/git-drop-IsRunnableHelper.patch:
+    - Don't run IsRunnableHelper since it's ignored anyway
 
  -- Jeremy Bicha <jbicha at ubuntu.com>  Sat, 08 Jun 2013 19:46:26 -0400
 

Added: packages/experimental/gnome-shell-extensions/debian/patches/git-drop-IsRunnableHelper.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell-extensions/debian/patches/git-drop-IsRunnableHelper.patch?rev=38491&op=file
==============================================================================
--- packages/experimental/gnome-shell-extensions/debian/patches/git-drop-IsRunnableHelper.patch (added)
+++ packages/experimental/gnome-shell-extensions/debian/patches/git-drop-IsRunnableHelper.patch [utf-8] Sun Jun  9 00:34:35 2013
@@ -1,0 +1,32 @@
+From 85038e2f5624a1a6fc46c0b8e3649577799610aa Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha at ubuntu.com>
+Date: Sat, 8 Jun 2013 20:22:09 -0400
+Subject: [PATCH] classic: Drop IsRunnableHelper
+
+https://bugzilla.gnome.org/show_bug.cgi?id=701886
+---
+ data/Makefile.am                         | 1 -
+ data/gnome-classic.session.desktop.in.in | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index e203a29..af11e18 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -36,7 +36,6 @@ gsettings_SCHEMAS = $(gsettings_in_files:.xml.in=.xml)
+ 
+ %.desktop.in:%.desktop.in.in
+ 	$(AM_V_GEN) sed \
+-		-e "s|\@libexecdir\@|$(libexecdir)|" \
+ 		-e "s|\@bindir\@|$(bindir)|" \
+ 		-e "s|\@VERSION\@|$(VERSION)|" \
+ 		$< > $@
+diff --git a/data/gnome-classic.session.desktop.in.in b/data/gnome-classic.session.desktop.in.in
+index eddbacc..c52a82a 100644
+--- a/data/gnome-classic.session.desktop.in.in
++++ b/data/gnome-classic.session.desktop.in.in
+@@ -1,4 +1,3 @@
+ [GNOME Session]
+ _Name=GNOME Classic
+ RequiredComponents=gnome-shell-classic;gnome-settings-daemon;nautilus-classic;
+-IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated

Modified: packages/experimental/gnome-shell-extensions/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell-extensions/debian/patches/series?rev=38491&op=diff
==============================================================================
--- packages/experimental/gnome-shell-extensions/debian/patches/series [utf-8] (original)
+++ packages/experimental/gnome-shell-extensions/debian/patches/series [utf-8] Sun Jun  9 00:34:35 2013
@@ -1,0 +1,1 @@
+git-drop-IsRunnableHelper.patch

Modified: packages/experimental/gnome-shell-extensions/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell-extensions/debian/rules?rev=38491&op=diff
==============================================================================
--- packages/experimental/gnome-shell-extensions/debian/rules [utf-8] (original)
+++ packages/experimental/gnome-shell-extensions/debian/rules [utf-8] Sun Jun  9 00:34:35 2013
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
@@ -15,5 +16,4 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS := \
 	--enable-extensions=$(EXTENSIONS_ENABLED) \
-	--enable-classic-mode \
-	--libexecdir=\$${prefix}/lib/gnome-session
+	--enable-classic-mode