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

Proposed by Paolo Rotolo
Status: Merged
Merged at revision: 5
Proposed branch: lp:~paolorotolo/ubuntu-app-reviews/cuttlefish
Merge into: lp:~ubuntu-app-review-contributors/ubuntu-app-reviews/cuttlefish
Diff against target: 82 lines (+15/-14)
4 files modified
cuttlefish/indicator.py (+1/-1)
debian/control (+10/-6)
debian/copyright (+3/-5)
debian/rules (+1/-2)
To merge this branch: bzr merge lp:~paolorotolo/ubuntu-app-reviews/cuttlefish
Reviewer Review Type Date Requested Status
Ubuntu App Review Contributors Pending
Review via email: mp+114002@code.launchpad.net

Description of the change

 * remove .rtupdate file
 * remove superfluous entries

To post a comment you must log in.
3. By Paolo Rotolo

 * put .rtupdate file back.
 * remove cdbs from build-dependency.
 * Change debherlper version from build-dependency.
 * Update Standards-Version from 3.8.3 to 3.9.3.
 * Update the package's description.

4. By Paolo Rotolo

 * Mark cuttlefish/indicator.py as executable.
 * Update description.

5. By Paolo Rotolo

 * debian/copyright: update to DEP-5.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cuttlefish/indicator.py'
2--- cuttlefish/indicator.py 2012-07-09 15:13:15 +0000
3+++ cuttlefish/indicator.py 2012-07-10 15:33:19 +0000
4@@ -1,4 +1,4 @@
5-#!/usr/bin/python
6+!/usr/bin/python
7 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
8 ### BEGIN LICENSE
9 # Copyright (C) 2012 Alexander von Bremen-Kuehne <noneed4anick@gmail.com>
10
11=== modified file 'debian/control'
12--- debian/control 2012-07-09 15:13:15 +0000
13+++ debian/control 2012-07-10 15:33:19 +0000
14@@ -1,13 +1,12 @@
15 Source: cuttlefish
16 Section: python
17 Priority: extra
18-Build-Depends: cdbs (>= 0.4.43),
19- debhelper (>= 6),
20+Build-Depends: debhelper (>= 8),
21 libglib2.0-bin,
22 python (>= 2.6.6-3~),
23 python-distutils-extra (>= 2.10)
24 Maintainer: Alexander von Bremen-Kühne <noneed4anick@gmail.com>
25-Standards-Version: 3.8.3
26+Standards-Version: 3.9.3
27 XS-Python-Version: current
28
29 Package: cuttlefish
30@@ -28,6 +27,11 @@
31 gir1.2-gmenu-3.0,
32 gir1.2-appindicator3-0.1,
33 yelp
34-Description: A simple reactive tool
35- Cuttlefish is an event driven tool that will adapt the appearance and
36- settings of your system according to the environment
37+Description: Realises reflexes on your computer
38+ Cuttlefish is a simple tool, which realises reflexes on your computer
39+ by executing actions when specific events are triggered.
40+ You can configure the tool in such way that cuttlefish can
41+ for example change your default printer according
42+ to the currently connected wireless network,
43+ or lock/unlock your computer, when a specific
44+ USB device is connected/disconnected.
45
46=== modified file 'debian/copyright'
47--- debian/copyright 2012-07-09 15:13:15 +0000
48+++ debian/copyright 2012-07-10 15:33:19 +0000
49@@ -1,11 +1,9 @@
50-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
51-Name: cuttlefish
52-Maintainer: Alexander von Bremen-Kühne <noneed4anick@gmail.com>
53+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
54+Upstream-Name: cuttlefish
55+Upstream-Contact: Alexander von Bremen-Kühne <noneed4anick@gmail.com>
56 Source: https://launchpad.net/cuttlefish
57
58 Files: *
59-Copyright: (C) 2012 Alexander von Bremen-Kuehne &lt;noneed4anick@gmail.com&gt;
60-Copyright: (C) 2012 Alexander von Bremen-Kuehne &lt;noneed4anick@gmail.com&gt;</property>
61 Copyright: (C) 2012 Alexander von Bremen-Kuehne <noneed4anick@gmail.com>
62 License: GPL-3
63 The full text of the GPL is distributed in
64
65=== modified file 'debian/rules'
66--- debian/rules 2012-07-09 15:13:15 +0000
67+++ debian/rules 2012-07-10 15:33:19 +0000
68@@ -12,7 +12,6 @@
69 override_dh_python2:
70 dh_python2 /opt/extras.ubuntu.com/cuttlefish
71
72-
73 override_dh_install:
74 dh_install
75 mkdir -p debian/cuttlefish/opt/extras.ubuntu.com/cuttlefish/bin
76@@ -29,4 +28,4 @@
77 grep -RlZ "gettext.textdomain('cuttlefish')" debian/cuttlefish/* | xargs -0 -r sed -i "s|gettext\(\.textdomain('cuttlefish')\)|locale\.bindtextdomain('cuttlefish', '/opt/extras.ubuntu.com/cuttlefish/share/locale')\nlocale\1|"
78 sed -i "s|__cuttlefish_data_directory__ =.*|__cuttlefish_data_directory__ = '/opt/extras.ubuntu.com/cuttlefish/share/cuttlefish/'|" debian/cuttlefish/opt/extras.ubuntu.com/cuttlefish/cuttlefish*/cuttlefishconfig.py
79 sed -i 's| sys.path.insert(0, opt_path)|\0\n os.putenv("XDG_DATA_DIRS", "%s:%s" % ("/opt/extras.ubuntu.com/cuttlefish/share/", os.getenv("XDG_DATA_DIRS", "")))|' debian/cuttlefish/opt/extras.ubuntu.com/cuttlefish/bin/cuttlefish
80- if [ -d debian/cuttlefish/opt/extras.ubuntu.com/cuttlefish/share/glib-2.0/schemas ]; then glib-compile-schemas debian/cuttlefish/opt/extras.ubuntu.com/cuttlefish/share/glib-2.0/schemas; fi
81\ No newline at end of file
82+ if [ -d debian/cuttlefish/opt/extras.ubuntu.com/cuttlefish/share/glib-2.0/schemas ]; then glib-compile-schemas debian/cuttlefish/opt/extras.ubuntu.com/cuttlefish/share/glib-2.0/schemas; fi

Subscribers

People subscribed via source and target branches