Merge lp:~paolorotolo/ubuntu-app-reviews/variety into lp:~ubuntu-app-review-contributors/ubuntu-app-reviews/variety

[Paolo Rotolo]

 * debian/copyright: update to DEP-5.
 * debian/rules: override dh_python2.
 * debian/rules: move crashdb.conf file to the right place (which is due to LP: #1020502).

[Paolo Rotolo (paolorotolo)]

I also installed the app. It worked as expected.

Unmerged revisions

2. By Paolo Rotolo on 2012-07-04

 * debian/copyright: update to DEP-5.
 * debian/rules: override dh_python2.
 * debian/rules: move crashdb.conf file to the right place (which is due to LP: #1020502).

1. By Peter Levi <peter@plpc> on 2012-07-03

=== modified file 'debian/copyright'
--- debian/copyright	2012-07-03 23:15:15 +0000
+++ debian/copyright	2012-07-04 16:14:20 +0000
@@ -1,6 +1,6 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Format: http://dep.debian.net/deps/dep5/
 Name: variety
-Maintainer: Peter Levi <[e-mail]>
+Upstream-Contact: Peter Levi <[e-mail]>
 Source: https://launchpad.net/variety
 
 Files: *
 
=== modified file 'debian/rules'
--- debian/rules	2012-07-03 23:15:15 +0000
+++ debian/rules	2012-07-04 16:14:20 +0000
@@ -10,7 +10,7 @@
 	dh_auto_install -- --install-scripts=/opt/extras.ubuntu.com/variety                 --install-data=/opt/extras.ubuntu.com/variety                 --install-lib=/opt/extras.ubuntu.com/variety
 
 override_dh_python2:
-	dh_python2 /opt/extras.ubuntu.com/variety
+	#dh_python2 /opt/extras.ubuntu.com/variety
 
 
 override_dh_install:
@@ -29,4 +29,8 @@
 	grep -RlZ "gettext.textdomain('variety')" debian/variety/* | xargs -0 -r sed -i "s|gettext\(\.textdomain('variety')\)|locale\.bindtextdomain('variety', '/opt/extras.ubuntu.com/variety/share/locale')\nlocale\1|" 
 	sed -i "s|__variety_data_directory__ =.*|__variety_data_directory__ = '/opt/extras.ubuntu.com/variety/share/variety/'|" debian/variety/opt/extras.ubuntu.com/variety/variety*/varietyconfig.py
 	sed -i 's|        sys.path.insert(0, opt_path)|\0\n    os.putenv("XDG_DATA_DIRS", "%s:%s" % ("/opt/extras.ubuntu.com/variety/share/", os.getenv("XDG_DATA_DIRS", "")))|' debian/variety/opt/extras.ubuntu.com/variety/bin/variety
-	if [ -d debian/variety/opt/extras.ubuntu.com/variety/share/glib-2.0/schemas ]; then glib-compile-schemas debian/variety/opt/extras.ubuntu.com/variety/share/glib-2.0/schemas; fi
 \ No newline at end of file
+	if [ -d debian/variety/opt/extras.ubuntu.com/variety/share/glib-2.0/schemas ]; then glib-compile-schemas debian/variety/opt/extras.ubuntu.com/variety/share/glib-2.0/schemas; fi
+	if [ -f debian/variety/etc/apport/crashdb.conf.d/variety-crashdb.conf ]; then \
+                mkdir -p debian/variety/opt/extras.ubuntu.com/variety/etc/apport/crashdb.conf.d; \
+                mv debian/variety/etc/apport/crashdb.conf.d/variety-crashdb.conf debian/variety/opt/extras.ubuntu.com/variety/etc/apport/crashdb.conf.d; \
+	fi