Merge lp:~noskcaj/nautilus-sendto/merge into lp:~ubuntu-desktop/nautilus-sendto/ubuntu

Proposed by Jackson Doak
Status: Merged
Merged at revision: 42
Proposed branch: lp:~noskcaj/nautilus-sendto/merge
Merge into: lp:~ubuntu-desktop/nautilus-sendto/ubuntu
Diff against target: 49 lines (+18/-2)
3 files modified
debian/changelog (+16/-0)
debian/control (+1/-1)
debian/control.in (+1/-1)
To merge this branch: bzr merge lp:~noskcaj/nautilus-sendto/merge
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+239773@code.launchpad.net

Description of the change

Merge from debian

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks for your work

review: Approve

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 2014-07-06 23:53:40 +0000
3+++ debian/changelog 2014-10-27 20:54:23 +0000
4@@ -1,3 +1,19 @@
5+nautilus-sendto (3.8.2-1ubuntu1) vivid; urgency=medium
6+
7+ * Rebase on Debian, remaining Ubuntu changes:
8+ * debian/control.in:
9+ - Don't rename thunderbird in icedove in Ubuntu
10+ - set the epoch number for nautilus in Ubuntu
11+ - Use ubuntu-desktop vcs
12+
13+ -- Jackson Doak <noskcaj@ubuntu.com> Tue, 28 Oct 2014 07:48:51 +1100
14+
15+nautilus-sendto (3.8.2-1) unstable; urgency=medium
16+
17+ * New upstream release.
18+
19+ -- Andreas Henriksson <andreas@fatal.se> Tue, 23 Sep 2014 20:56:15 +0200
20+
21 nautilus-sendto (3.8.1-1ubuntu1) utopic; urgency=medium
22
23 * Rebase on Debian, remaining Ubuntu changes:
24
25=== modified file 'debian/control'
26--- debian/control 2014-07-06 23:53:40 +0000
27+++ debian/control 2014-10-27 20:54:23 +0000
28@@ -5,7 +5,7 @@
29 Source: nautilus-sendto
30 Section: gnome
31 Priority: optional
32-Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
33+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
34 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
35 Build-Depends: debhelper (>= 8.1.3~),
36 cdbs (>= 0.4.94~),
37
38=== modified file 'debian/control.in'
39--- debian/control.in 2014-07-06 23:53:40 +0000
40+++ debian/control.in 2014-10-27 20:54:23 +0000
41@@ -1,7 +1,7 @@
42 Source: nautilus-sendto
43 Section: gnome
44 Priority: optional
45-Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
46+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
47 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
48 Build-Depends: debhelper (>= 8.1.3~),
49 cdbs (>= 0.4.94~),

Subscribers

People subscribed via source and target branches

to all changes: