Merge lp:~ari-tczew/unity-lens-files/ubuntu into lp:~ubuntu-desktop/unity-lens-files/ubuntu

Proposed by Artur Rona
Status: Merged
Merged at revision: 87
Proposed branch: lp:~ari-tczew/unity-lens-files/ubuntu
Merge into: lp:~ubuntu-desktop/unity-lens-files/ubuntu
Diff against target: 38 lines (+9/-3)
2 files modified
debian/changelog (+7/-0)
debian/control (+2/-3)
To merge this branch: bzr merge lp:~ari-tczew/unity-lens-files/ubuntu
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Pending
Review via email: mp+48566@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-02-01 12:23:14 +0000
3+++ debian/changelog 2011-02-04 00:52:36 +0000
4@@ -1,3 +1,10 @@
5+unity-place-files (0.5.36-0ubuntu3) UNRELEASED; urgency=low
6+
7+ [ Artur Rona ]
8+ * debian/control: Depends on zeitgeist-extension-fts. (LP: #688926)
9+
10+ -- Artur Rona <ari-tczew@ubuntu.com> Fri, 04 Feb 2011 01:47:08 +0100
11+
12 unity-place-files (0.5.36-0ubuntu2) natty; urgency=low
13
14 * Temporary switch to dpkg-source 3.0 (quilt) format to cherry-pick the
15
16=== modified file 'debian/control'
17--- debian/control 2011-01-21 13:36:24 +0000
18+++ debian/control 2011-02-04 00:52:36 +0000
19@@ -1,7 +1,7 @@
20 Source: unity-place-files
21 Section: gnome
22 Priority: optional
23-Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
24+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
25 Build-Depends: cdbs,
26 debhelper (>= 7),
27 pkg-config,
28@@ -21,9 +21,8 @@
29 Architecture: any
30 Depends: ${shlibs:Depends},
31 ${misc:Depends},
32- zeitgeist-fts-extension
33+ zeitgeist-extension-fts
34 Recommends: libzeitgeist-gio
35 Description: File place for unity
36 This package contains the "file" place which can be used
37 into Unity to browse your files.
38-

Subscribers

People subscribed via source and target branches

to all changes: