Ubuntu App Reviews

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

  1. koza
  2. Merge into koza
Proposed by Paolo Rotolo on 2012-07-02
Status: Merged
Merged at revision: 3
Proposed branch: lp:~paolorotolo/ubuntu-app-reviews/koza
Merge into: lp:~ubuntu-app-review-contributors/ubuntu-app-reviews/koza
Diff against target: 56 lines (+12/-9)
3 files modified
debian/control (+4/-1)
debian/copyright (+6/-6)
debian/rules (+2/-2)
To merge this branch: bzr merge lp:~paolorotolo/ubuntu-app-reviews/koza
Reviewer Review Type Date Requested Status
Ubuntu App Review Contributors 2012-07-02 Pending
Review via email: mp+113077@code.launchpad.net

Description of the Change

Update copyright to DEP-5 and add python-pyside.qtgui, python-pyside.qtdeclarative and python-pyside.qtuitools to Depends

To post a comment you must log in.
lp:~paolorotolo/ubuntu-app-reviews/koza updated on 2012-07-03
3. By Paolo Rotolo on 2012-07-03

 * Override dh_python2

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2012-07-02 13:06:00 +0000
3+++ debian/control 2012-07-03 15:54:18 +0000
4@@ -18,6 +18,9 @@
5 python-pyside.qtcore,
6 yelp,
7 appmenu-qt,
8- sni-qt
9+ sni-qt,
10+ python-pyside.qtgui,
11+ python-pyside.qtdeclarative,
12+ python-pyside.qtuitools
13 Description: English to Gujarati Dictionary
14 A simple and elegant English to Gujarati Dictionary
15
16=== modified file 'debian/copyright'
17--- debian/copyright 2012-07-02 13:06:00 +0000
18+++ debian/copyright 2012-07-03 15:54:18 +0000
19@@ -1,11 +1,11 @@
20-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
21-Name: koza
22-Maintainer: Ravi Vagadia <ravirdv@gmail.com>
23+Format: http://dep.debian.net/deps/dep5/
24+Upstream-Name: koza
25+Upstream-Contact: Ravi Vagadia <ravirdv@gmail.com>
26 Source: https://launchpad.net/koza
27
28 Files: *
29-Copyright: (C) 2011 Nokia -->
30-Copyright: (C) 2012 Ravi Vagadia <ravirdv@gmail.com>
31+Copyright: 2011, Nokia
32+ 2012, Ravi Vagadia <ravirdv@gmail.com>
33 License: GPL-3
34- The full text of the GPL is distributed in
35+ The full text of the GPL is distributed in
36 /usr/share/common-licenses/GPL-3 on Debian systems.
37
38=== modified file 'debian/rules'
39--- debian/rules 2012-07-02 13:06:00 +0000
40+++ debian/rules 2012-07-03 15:54:18 +0000
41@@ -10,7 +10,7 @@
42 dh_auto_install -- --install-scripts=/opt/extras.ubuntu.com/koza --install-data=/opt/extras.ubuntu.com/koza --install-lib=/opt/extras.ubuntu.com/koza
43
44 override_dh_python2:
45- dh_python2 /opt/extras.ubuntu.com/koza
46+ #dh_python2 /opt/extras.ubuntu.com/koza
47
48
49 override_dh_install:
50@@ -29,4 +29,4 @@
51 grep -RlZ "gettext.textdomain('koza')" debian/koza/* | xargs -0 -r sed -i "s|gettext\(\.textdomain('koza')\)|locale\.bindtextdomain('koza', '/opt/extras.ubuntu.com/koza/share/locale')\nlocale\1|"
52 sed -i "s|__koza_data_directory__ =.*|__koza_data_directory__ = '/opt/extras.ubuntu.com/koza/share/koza/'|" debian/koza/opt/extras.ubuntu.com/koza/koza*/kozaconfig.py
53 sed -i 's| sys.path.insert(0, opt_path)|\0\n os.putenv("XDG_DATA_DIRS", "%s:%s" % ("/opt/extras.ubuntu.com/koza/share/", os.getenv("XDG_DATA_DIRS", "")))|' debian/koza/opt/extras.ubuntu.com/koza/bin/koza
54- if [ -d debian/koza/opt/extras.ubuntu.com/koza/share/glib-2.0/schemas ]; then glib-compile-schemas debian/koza/opt/extras.ubuntu.com/koza/share/glib-2.0/schemas; fi
55\ No newline at end of file
56+ if [ -d debian/koza/opt/extras.ubuntu.com/koza/share/glib-2.0/schemas ]; then glib-compile-schemas debian/koza/opt/extras.ubuntu.com/koza/share/glib-2.0/schemas; fi

Subscribers

People subscribed via source and target branches