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
=== modified file 'cuttlefish/indicator.py'
--- cuttlefish/indicator.py 2012-07-09 15:13:15 +0000
+++ cuttlefish/indicator.py 2012-07-10 15:33:19 +0000
@@ -1,4 +1,4 @@
1#!/usr/bin/python1!/usr/bin/python
2# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-2# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
3### BEGIN LICENSE3### BEGIN LICENSE
4# Copyright (C) 2012 Alexander von Bremen-Kuehne <noneed4anick@gmail.com>4# Copyright (C) 2012 Alexander von Bremen-Kuehne <noneed4anick@gmail.com>
55
=== modified file 'debian/control'
--- debian/control 2012-07-09 15:13:15 +0000
+++ debian/control 2012-07-10 15:33:19 +0000
@@ -1,13 +1,12 @@
1Source: cuttlefish1Source: cuttlefish
2Section: python2Section: python
3Priority: extra3Priority: extra
4Build-Depends: cdbs (>= 0.4.43),4Build-Depends: debhelper (>= 8),
5 debhelper (>= 6),
6 libglib2.0-bin,5 libglib2.0-bin,
7 python (>= 2.6.6-3~),6 python (>= 2.6.6-3~),
8 python-distutils-extra (>= 2.10)7 python-distutils-extra (>= 2.10)
9Maintainer: Alexander von Bremen-Kühne <noneed4anick@gmail.com>8Maintainer: Alexander von Bremen-Kühne <noneed4anick@gmail.com>
10Standards-Version: 3.8.39Standards-Version: 3.9.3
11XS-Python-Version: current10XS-Python-Version: current
1211
13Package: cuttlefish12Package: cuttlefish
@@ -28,6 +27,11 @@
28 gir1.2-gmenu-3.0,27 gir1.2-gmenu-3.0,
29 gir1.2-appindicator3-0.1,28 gir1.2-appindicator3-0.1,
30 yelp29 yelp
31Description: A simple reactive tool30Description: Realises reflexes on your computer
32 Cuttlefish is an event driven tool that will adapt the appearance and31 Cuttlefish is a simple tool, which realises reflexes on your computer
33 settings of your system according to the environment32 by executing actions when specific events are triggered.
33 You can configure the tool in such way that cuttlefish can
34 for example change your default printer according
35 to the currently connected wireless network,
36 or lock/unlock your computer, when a specific
37 USB device is connected/disconnected.
3438
=== modified file 'debian/copyright'
--- debian/copyright 2012-07-09 15:13:15 +0000
+++ debian/copyright 2012-07-10 15:33:19 +0000
@@ -1,11 +1,9 @@
1Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=1351Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2Name: cuttlefish2Upstream-Name: cuttlefish
3Maintainer: Alexander von Bremen-Kühne <noneed4anick@gmail.com>3Upstream-Contact: Alexander von Bremen-Kühne <noneed4anick@gmail.com>
4Source: https://launchpad.net/cuttlefish4Source: https://launchpad.net/cuttlefish
55
6Files: *6Files: *
7Copyright: (C) 2012 Alexander von Bremen-Kuehne &lt;noneed4anick@gmail.com&gt;
8Copyright: (C) 2012 Alexander von Bremen-Kuehne &lt;noneed4anick@gmail.com&gt;</property>
9Copyright: (C) 2012 Alexander von Bremen-Kuehne <noneed4anick@gmail.com>7Copyright: (C) 2012 Alexander von Bremen-Kuehne <noneed4anick@gmail.com>
10License: GPL-38License: GPL-3
11 The full text of the GPL is distributed in9 The full text of the GPL is distributed in
1210
=== modified file 'debian/rules'
--- debian/rules 2012-07-09 15:13:15 +0000
+++ debian/rules 2012-07-10 15:33:19 +0000
@@ -12,7 +12,6 @@
12override_dh_python2:12override_dh_python2:
13 dh_python2 /opt/extras.ubuntu.com/cuttlefish13 dh_python2 /opt/extras.ubuntu.com/cuttlefish
1414
15
16override_dh_install:15override_dh_install:
17 dh_install16 dh_install
18 mkdir -p debian/cuttlefish/opt/extras.ubuntu.com/cuttlefish/bin17 mkdir -p debian/cuttlefish/opt/extras.ubuntu.com/cuttlefish/bin
@@ -29,4 +28,4 @@
29 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|" 28 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|"
30 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.py29 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
31 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/cuttlefish30 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
32 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
33\ No newline at end of file31\ No newline at end of file
32 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