Ubuntu App Reviews

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

  1. variety
  2. Merge into variety
Proposed by Paolo Rotolo
Status: Needs review
Proposed branch: lp:~paolorotolo/ubuntu-app-reviews/variety
Merge into: lp:~ubuntu-app-review-contributors/ubuntu-app-reviews/variety
Diff against target: 36 lines (+8/-4)
2 files modified
debian/copyright (+2/-2)
debian/rules (+6/-2)
To merge this branch: bzr merge lp:~paolorotolo/ubuntu-app-reviews/variety
Reviewer Review Type Date Requested Status
Ubuntu App Review Contributors Pending
Review via email: mp+113424@code.launchpad.net

Description of the change

 * 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).

To post a comment you must log in.
Revision history for this message
Paolo Rotolo (paolorotolo) wrote :

I also installed the app. It worked as expected.

Reply

Unmerged revisions

2. By 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).

1. By Peter Levi <peter@plpc>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/copyright'
2--- debian/copyright 2012-07-03 23:15:15 +0000
3+++ debian/copyright 2012-07-04 16:14:20 +0000
4@@ -1,6 +1,6 @@
5-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
6+Format: http://dep.debian.net/deps/dep5/
7 Name: variety
8-Maintainer: Peter Levi <peterlevi@peterlevi.com>
9+Upstream-Contact: Peter Levi <peterlevi@peterlevi.com>
10 Source: https://launchpad.net/variety
11
12 Files: *
13
14=== modified file 'debian/rules'
15--- debian/rules 2012-07-03 23:15:15 +0000
16+++ debian/rules 2012-07-04 16:14:20 +0000
17@@ -10,7 +10,7 @@
18 dh_auto_install -- --install-scripts=/opt/extras.ubuntu.com/variety --install-data=/opt/extras.ubuntu.com/variety --install-lib=/opt/extras.ubuntu.com/variety
19
20 override_dh_python2:
21- dh_python2 /opt/extras.ubuntu.com/variety
22+ #dh_python2 /opt/extras.ubuntu.com/variety
23
24
25 override_dh_install:
26@@ -29,4 +29,8 @@
27 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|"
28 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
29 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
30- 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
31\ No newline at end of file
32+ 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
33+ if [ -f debian/variety/etc/apport/crashdb.conf.d/variety-crashdb.conf ]; then \
34+ mkdir -p debian/variety/opt/extras.ubuntu.com/variety/etc/apport/crashdb.conf.d; \
35+ mv debian/variety/etc/apport/crashdb.conf.d/variety-crashdb.conf debian/variety/opt/extras.ubuntu.com/variety/etc/apport/crashdb.conf.d; \
36+ fi

Subscribers

People subscribed via source and target branches