r49213 - in /desktop/unstable/gnome-shell/debian: changelog rules source_gnome-shell.py

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

Author: jbicha-guest
Date: Thu Jun 30 23:06:54 2016
New Revision: 49213

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49213
Log:
* Update apport hook to recognize gdm3 and to not try to attach
  obsolete log files
* Update Ubuntu's dependency on gnome-icon-theme-full to
  adwaita-icon-theme-full

Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/rules
    desktop/unstable/gnome-shell/debian/source_gnome-shell.py

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=49213&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog	[utf-8] Thu Jun 30 23:06:54 2016
@@ -6,6 +6,12 @@
   [ Michael Biebl ]
   * New upstream release.
   * Refresh patches.
+
+  [ Jeremy Bicha ]
+  * Update apport hook to recognize gdm3 and to not try to attach
+    obsolete log files
+  * Update Ubuntu's dependency on gnome-icon-theme-full to
+    adwaita-icon-theme-full
 
  -- Laurent Bigonville <bigon at debian.org>  Mon, 13 Jun 2016 15:33:36 +0200
 

Modified: desktop/unstable/gnome-shell/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/rules?rev=49213&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/rules	[utf-8] Thu Jun 30 23:06:54 2016
@@ -16,7 +16,7 @@
 include /usr/share/dpkg/default.mk
 
 ifeq ($(shell dpkg-vendor --query vendor),Ubuntu)
-	DEB_DH_GENCONTROL_ARGS += -- -Vicon-theme:Depends=gnome-icon-theme-full
+	DEB_DH_GENCONTROL_ARGS += -- -Vicon-theme:Depends=adwaita-icon-theme-full
 endif
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-compile-warnings=yes

Modified: desktop/unstable/gnome-shell/debian/source_gnome-shell.py
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/source_gnome-shell.py?rev=49213&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/source_gnome-shell.py	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/source_gnome-shell.py	[utf-8] Thu Jun 30 23:06:54 2016
@@ -13,11 +13,11 @@
 def add_info(report):
     attach_gsettings_package(report, 'gnome-shell-common')
     attach_gsettings_schema(report, 'org.gnome.desktop.interface')
-    
+
     result = ''
 
     dm_list = apport.hookutils.command_output(['sh', '-c', 
-	'apt-cache search \"display manager\" | cut -d \' \' -f1 | grep dm$'])
+	'apt-cache search \"display manager\" | cut -d \' \' -f1 | grep -E \"dm$|gdm3\"'])
 
     for line in dm_list.split('\n'):
         if (is_process_running(line)):
@@ -25,12 +25,3 @@
             break
 
     report['DisplayManager'] = result
-
-    HOME = os.path.expanduser("~")
-    if result == 'gdm':
-        attach_file_if_exists(report, HOME+'/.cache/gdm/session.log',key='gdmSessionLog')
-    else:   
-        attach_file_if_exists(report, HOME+'/.xsession-errors',key='XsessionLog')
-
-
-