example-content

Merge lp:~jorge/example-content/remove-xcf into lp:~ubuntu-core-dev/example-content/ubuntu

  1. remove-xcf
  2. Merge into ubuntu
Proposed by Jorge Castro
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jorge/example-content/remove-xcf
Merge into: lp:~ubuntu-core-dev/example-content/ubuntu
Diff against target: 24 lines (+12/-0)
1 file modified
debian/changelog (+12/-0)
To merge this branch: bzr merge lp:~jorge/example-content/remove-xcf
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+18544@code.launchpad.net

This proposal supersedes a proposal from 2010-02-02.

To post a comment you must log in.
Revision history for this message
Jorge Castro (jorge) wrote : Posted in a previous version of this proposal

Removing .xcf file since we don't ship gimp on the CD.

Revision history for this message
Daniel Holbach (dholbach) wrote : Posted in a previous version of this proposal

This should be removed from main/About_these_files.odt too.

review: Needs Fixing
Revision history for this message
Daniel Holbach (dholbach) wrote :

Good work, I just collapsed the two changelog entries into one... 39 was never uploaded to Ubuntu.

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 2009-10-02 14:43:14 +0000
3+++ debian/changelog 2010-02-03 18:07:14 +0000
4@@ -1,3 +1,15 @@
5+example-content (40) lucid; urgency=low
6+
7+ * Remove references of the GIMP from the example .odt file
8+
9+ -- Jorge O. Castro <jorge@ubuntu.com> Wed, 03 Feb 2010 10:03:58 -0800
10+
11+example-content (39) lucid; urgency=low
12+
13+ * Remove gimp example file.
14+
15+ -- Jorge O. Castro <jorge@ubuntu.com> Tue, 02 Feb 2010 10:21:29 -0800
16+
17 example-content (38) karmic; urgency=low
18
19 * logos/xubuntu.svg: remove the need to have ttf-ubuntu-title installed,
20
21=== modified file 'main/About_these_files.odt'
22Binary files main/About_these_files.odt 2009-10-01 08:53:11 +0000 and main/About_these_files.odt 2010-02-03 18:07:14 +0000 differ
23=== removed file 'main/GIMP_Ubuntu_splash_screen.xcf'
24Binary files main/GIMP_Ubuntu_splash_screen.xcf 2009-03-17 13:33:39 +0000 and main/GIMP_Ubuntu_splash_screen.xcf 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: