r55007 - in /packages/unstable/rhythmbox/debian: changelog control rhythmbox-data.install source_rhythmbox.py

[bigon at users.alioth.debian.org]

Author: bigon
Date: Thu Feb  8 13:23:16 2018
New Revision: 55007

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=55007
Log:
debian/source_rhythmbox.py: Install apport hook (thanks to Ubuntu)

Added:
    packages/unstable/rhythmbox/debian/source_rhythmbox.py
Modified:
    packages/unstable/rhythmbox/debian/changelog
    packages/unstable/rhythmbox/debian/control
    packages/unstable/rhythmbox/debian/rhythmbox-data.install

Modified: packages/unstable/rhythmbox/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/changelog?rev=55007&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/changelog	[utf-8] (original)
+++ packages/unstable/rhythmbox/debian/changelog	[utf-8] Thu Feb  8 13:23:16 2018
@@ -7,8 +7,9 @@
   [ Laurent Bigonville ]
   * debian/patches/fix_mediakeys_api.patch: Fix use of mediakeys D-Bus API
   * debian/control.in: Bump Standards-Version to 4.1.3 (no further changes)
-
- -- Laurent Bigonville <bigon at debian.org>  Thu, 08 Feb 2018 14:00:03 +0100
+  * debian/source_rhythmbox.py: Install apport hook (thanks to Ubuntu)
+
+ -- Laurent Bigonville <bigon at debian.org>  Thu, 08 Feb 2018 14:13:34 +0100
 
 rhythmbox (3.4.2-1) unstable; urgency=medium
 

Modified: packages/unstable/rhythmbox/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/control?rev=55007&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/control	[utf-8] (original)
+++ packages/unstable/rhythmbox/debian/control	[utf-8] Thu Feb  8 13:23:16 2018
@@ -53,7 +53,7 @@
                      docbook-xsl (>= 1.54.1),
                      docbook-utils (>= 0.6.11),
 Build-Conflicts: libmusicbrainz3-dev
-Standards-Version: 4.0.0
+Standards-Version: 4.1.3
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/rhythmbox/
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/rhythmbox/
 

Modified: packages/unstable/rhythmbox/debian/rhythmbox-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/rhythmbox-data.install?rev=55007&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/rhythmbox-data.install	[utf-8] (original)
+++ packages/unstable/rhythmbox/debian/rhythmbox-data.install	[utf-8] Thu Feb  8 13:23:16 2018
@@ -4,3 +4,4 @@
 usr/share/locale
 usr/share/rhythmbox/rhythmbox.gep
 usr/share/glib-2.0/schemas
+debian/source_rhythmbox.py usr/share/apport/package-hooks

Added: packages/unstable/rhythmbox/debian/source_rhythmbox.py
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/source_rhythmbox.py?rev=55007&op=file
==============================================================================
--- packages/unstable/rhythmbox/debian/source_rhythmbox.py	(added)
+++ packages/unstable/rhythmbox/debian/source_rhythmbox.py	[utf-8] Thu Feb  8 13:23:16 2018
@@ -0,0 +1,43 @@
+import os
+import re
+
+import apport.packaging
+import apport.hookutils
+
+def mask_string (str):
+    MASK = '##MASKED##'
+    return str.group(1) + MASK
+
+def mask_values(gconfinfo):
+    """ strip personal/private information from the GConf entries """
+    pattrn = re.compile ('((add_dir|library_locations|download_prefix|share_password|share_name|username|password)=)(.*)$',
+    re.IGNORECASE)
+    newReport = ""
+    for line in gconfinfo.splitlines():
+        line = pattrn.sub (mask_string, line)
+        newReport += line + '\n'
+    return newReport
+
+def add_info(report, ui):
+    response = ui.choice("How would you describe the issue?", [
+            "problem with the interface",
+            "problem with sound",
+            "problem with playback of audio files",
+            "other problem",
+            ], False)
+
+    if response == None: # user cancelled
+        raise StopIteration
+# TODO: port to gsettings
+#    if response[0] == 0: # an issue about rhythmbox interface
+#        apport.hookutils.attach_gconf(report, 'rhythmbox')
+#        report['GConfNonDefault'] = mask_values(report['GConfNonDefault'])
+    if response[0] == 1: # the issue is a sound one
+        os.execlp('apport-bug', 'apport-bug', 'audio')
+    if response[0] == 2: # the issue is a codec one
+        report.add_package_info("libgstreamer1.0-0")
+        return
+
+    report["LogAlsaMixer"] = apport.hookutils.command_output(["/usr/bin/amixer"])
+    report["GstreamerVersions"] = apport.hookutils.package_versions("gstreamer*")
+    report["XorgLog"] = apport.hookutils.read_file("/var/log/Xorg.0.log")