Ubuntu
ghostscript package

Merge lp:~ubuntu-branches/ubuntu/maverick/ghostscript/maverick-201005141232 into lp:ubuntu/maverick/ghostscript

  1. Maverick (10.10)
  2. maverick-201005141232
  3. Merge into maverick
Proposed by James Westby
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/maverick/ghostscript/maverick-201005141232
Merge into: lp:ubuntu/maverick/ghostscript
Diff against target: 18 lines (+4/-0) (has conflicts)
1 file modified
debian/changelog (+4/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/maverick/ghostscript/maverick-201005141232

Description of the change

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/maverick/ghostscript now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/ghostscript/maverick-201005141232. A merge should be performed if necessary.

To post a comment you must log in.

Unmerged revisions

69. By James Westby

Switch to target lucid.

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 2010-04-29 09:43:23 +0000
3+++ debian/changelog 2010-05-14 12:35:57 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 ghostscript (8.71.dfsg.1-0ubuntu5.1) lucid-proposed; urgency=low
7
8 * debian/patches/pdf-interpreter-segfault-fixes.dpatch,
9@@ -14,6 +15,9 @@
10 -- Till Kamppeter <till.kamppeter@gmail.com> Thu, 29 Apr 2010 09:43:23 +0200
11
12 ghostscript (8.71.dfsg.1-0ubuntu5) lucid; urgency=low
13+=======
14+ghostscript (8.71.dfsg.1-0ubuntu5) lucid; urgency=low
15+>>>>>>> MERGE-SOURCE
16
17 * debian/patches/pdf2dsc-fix-for-pdflatex-preview.dpatch:
18 Fix pdflatex preview mode using the patch from http://svn.ghostscript.com/viewvc?view=rev&revision=10778

Subscribers

People subscribed via source and target branches

to all changes: