Ubuntu
gcc-4.5 package

Merge lp:~ubuntu-branches/ubuntu/maverick/gcc-4.5/maverick-201009111216 into lp:ubuntu/maverick/gcc-4.5

  1. Maverick (10.10)
  2. maverick-201009111216
  3. Merge into maverick
Proposed by James Westby
Status: Work in progress
Proposed branch: lp:~ubuntu-branches/ubuntu/maverick/gcc-4.5/maverick-201009111216
Merge into: lp:ubuntu/maverick/gcc-4.5
Diff against target: 23 lines (+9/-0) (has conflicts)
1 file modified
debian/changelog (+9/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/maverick/gcc-4.5/maverick-201009111216

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/gcc-4.5 now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/gcc-4.5/maverick-201009111216. A merge should be performed if necessary.

To post a comment you must log in.

Unmerged revisions

27. By Kees Cook

debian/patches/gcc-default-ssp.patch: lower ssp-buffer-size to 4.

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-09-11 13:17:13 +0000
3+++ debian/changelog 2010-09-11 12:24:52 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 gcc-4.5 (4.5.1-6ubuntu1) maverick; urgency=low
7
8 * Merge with Debian; remaining changes:
9@@ -33,6 +34,14 @@
10
11 -- Matthias Klose <doko@debian.org> Fri, 10 Sep 2010 21:25:37 +0200
12
13+=======
14+gcc-4.5 (4.5.1-5ubuntu2) UNRELEASED; urgency=low
15+
16+ * debian/patches/gcc-default-ssp.patch: lower ssp-buffer-size to 4.
17+
18+ -- Kees Cook <kees@ubuntu.com> Thu, 09 Sep 2010 11:04:10 -0700
19+
20+>>>>>>> MERGE-SOURCE
21 gcc-4.5 (4.5.1-5ubuntu1) maverick; urgency=low
22
23 * Merge with Debian; remaining changes:

Subscribers

People subscribed via source and target branches

to all changes: