Shipped apport hook contains diff lines

[Dan Watkins]

As you can see here:

```
$ head -n3 /usr/share/apport/package-hooks/source_gnome-screensaver.py ubuntu/devel [ 17:38:44 ]
+#!/usr/bin/python
+
'''Apport package hook for gnome-screensaver
```

This means that I can't report bugs (including this one!) using ubuntu-bug, because I get this:

```
ERROR: hook /usr/share/apport/package-hooks/source_gnome-screensaver.py crashed:
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/apport/report.py", line 203, in _run_hook
    exec(compile(fd.read(), hook, 'exec'), symb)
  File "/usr/share/apport/package-hooks/source_gnome-screensaver.py", line 1
    +#!/usr/bin/python
                     ^
SyntaxError: invalid syntax
```

[Sebastien Bacher (seb128)]

Thank you for your bug report, screensaver != screenshot, I'm reassigning to the right component.

That was reported before and fixed in Debian, it now needs to be merged to Ubuntu
https://salsa.debian.org/gnome-team/gnome-screensaver/commit/792b8063

[Launchpad Janitor (janitor)]

This bug was fixed in the package gnome-screensaver - 3.6.1-8ubuntu3.2

---------------
gnome-screensaver (3.6.1-8ubuntu3.2) eoan; urgency=medium

  * debian/source_gnome-screensaver.py:
    - backport a fix from Debian for a merge error (lp: #1804709)
    - use python3 (lp: #1804710)
  * debian/patches/03_fix_ltsp-fading.patch:
    - fix an invalid return call leading to a build error

 -- Sebastien Bacher <email address hidden> Mon, 19 Aug 2019 17:31:01 +0200