desktopcouch

Merge lp://qastaging/~ken-vandine/desktopcouch/desktopcouch-sdist into lp://qastaging/desktopcouch

  1. desktopcouch-sdist
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Elliot Murphy
Approved revision: 22
Merged at revision: not available
Proposed branch: lp://qastaging/~ken-vandine/desktopcouch/desktopcouch-sdist
Merge into: lp://qastaging/desktopcouch
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~ken-vandine/desktopcouch/desktopcouch-sdist
Reviewer Review Type Date Requested Status
Elliot Murphy (community) Approve
Review via email: mp+9386@code.qastaging.launchpad.net

Commit message

* Include missing files in the tarball
* Fixed copyright for the .pot file

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Some changes needed to properly create the tarball.

Revision history for this message
Elliot Murphy (statik) wrote :

looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MANIFEST.in'
2--- MANIFEST.in 2009-07-24 20:15:37 +0000
3+++ MANIFEST.in 2009-07-28 12:25:18 +0000
4@@ -1,2 +1,7 @@
5 include COPYING COPYING.LESSER README
6 recursive-include data *.tmpl
7+include desktopcouch-pair.desktop.in
8+include po/desktopcouch.pot
9+include start-desktop-couchdb.sh
10+include stop-desktop-couchdb.sh
11+include desktopcouch/records/doc/records.txt
12
13=== modified file 'po/desktopcouch.pot'
14--- po/desktopcouch.pot 2009-07-27 19:18:55 +0000
15+++ po/desktopcouch.pot 2009-07-28 12:25:03 +0000
16@@ -1,7 +1,6 @@
17-# SOME DESCRIPTIVE TITLE.
18-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
19-# This file is distributed under the same license as the PACKAGE package.
20-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
21+# Copyright (C) 2009 Canonical Ltd.
22+# This file is distributed under the same license as the desktopcouch package.
23+# Ken VanDine <ken.vandine@canonical.com>, 2009.
24 #
25 #, fuzzy
26 msgid ""

Subscribers

People subscribed via source and target branches