Add bugscripts; transition libgphoto2

4 files changed, 38 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index acaa0b1..fcf55a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,12 @@ shotwell (0.22.0-1) UNRELEASED; urgency=medium
     - New debian/shotwell-dbg.README.Debian.
     - New link from debian/shotwell.README.Debian to
       debian/shotwell-common.README.Debian
+  * debian/control:
+    - For the libgphoto2 transition change the Build-Depends for 
+      libgphoto2-dev to 2.5.4
+  * New bugreporting:
+    - New debian/shotwell.bug-script
+    - New debian/shotwell.install to install the apport file.
 
  -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Fri, 03 Apr 2015 13:16:32 +0200
 
diff --git a/debian/control b/debian/control
index bacf090..93da2a1 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  libgee-0.8-dev (>= 0.8.5),
  libgexiv2-dev (>= 0.4.90),
  libglib2.0-dev (>= 2.30.0),
- libgphoto2-dev (>= 2.4.2),
+ libgphoto2-dev (>= 2.5.4),
  libgstreamer-plugins-base1.0-dev (>= 1.0.0),
  libgstreamer1.0-dev (>= 1.0.0),
  libgtk-3-dev (>= 3.6.0),
diff --git a/debian/shotwell.bug-script b/debian/shotwell.bug-script
new file mode 100644
index 0000000..bcb8409
--- /dev/null
+++ b/debian/shotwell.bug-script
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+REPORTBUG_VERSION=$(dpkg-query -f '${source:Version}' -W reportbug)
+LOG_FILE='~/.cache/shotwell/shotwell.log'
+
+# Depending on whether reportbug is new enough, we either write the output of
+# our various commands to a file and attach them to the report (this needs
+# reportbug ≥ 6.5.0) or just write them to the body of the bug report.
+if dpkg --compare-versions "$REPORTBUG_VERSION" ge "6.5.0"; then
+
+    # We don’t clean up this directory because there is no way to know when
+    # reportbug finished running, and reportbug needs the files around.
+    # Given that those are just a couple of kilobytes in size and people
+    # generally don’t file a lot of bugs, I don’t think it’s a big deal.
+    DIR=$(mktemp -d)
+
+    echo "-- BEGIN ATTACHMENTS --" >&3
+
+    #
+    # logfile
+    #
+    if [ -f ${LOG_FILE} ]; then
+	cat ${LOG_FILE} >$DIR/logfile.user
+	echo $DIR/logfile.user >&3
+    fi
+
+    echo "-- END ATTACHMENTS --" >&3
+fi
diff --git a/debian/shotwell.install b/debian/shotwell.install
new file mode 100644
index 0000000..f89586e
--- /dev/null
+++ b/debian/shotwell.install
@@ -0,0 +1,3 @@
+apport/shotwell.py usr/share/apport/package-hooks/
+usr/bin
+usr/lib