Mozilla Firefox

Merge lp://qastaging/~kees/firefox/firefox-3.5.head+lp507744 into lp://qastaging/firefox/3.5

  1. firefox-3.5.head+lp507744
  2. Merge into firefox-3.5.head
Proposed by Micah Gersten
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~kees/firefox/firefox-3.5.head+lp507744
Merge into: lp://qastaging/firefox/3.5
Diff against target: 49 lines (+13/-0)
3 files modified
debian/changelog (+10/-0)
debian/control (+1/-0)
debian/rules (+2/-0)
To merge this branch: bzr merge lp://qastaging/~kees/firefox/firefox-3.5.head+lp507744
Reviewer Review Type Date Requested Status
Micah Gersten (community) Approve
Review via email: mp+17867@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Micah Gersten (micahg) wrote :

Sorry for the merge spam...still learning :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2010-01-20 02:17:11 +0000
+++ debian/changelog 2010-01-22 04:52:13 +0000
@@ -1,3 +1,4 @@
1<<<<<<< TREE
1firefox-3.5 (3.5.7+nobinonly-0ubuntu2) UNRELEASED; urgency=low2firefox-3.5 (3.5.7+nobinonly-0ubuntu2) UNRELEASED; urgency=low
23
3 * implement MIN_SYS_DEPS approach that does not use system xulrunner4 * implement MIN_SYS_DEPS approach that does not use system xulrunner
@@ -27,6 +28,15 @@
2728
28 -- Alexander Sack <asac@ubuntu.com> Wed, 20 Jan 2010 03:16:55 +010029 -- Alexander Sack <asac@ubuntu.com> Wed, 20 Jan 2010 03:16:55 +0100
2930
31=======
32firefox-3.5 (3.5.7+nobinonly-0ubuntu2) UNRELEASED; urgency=low
33
34 * debian/{rules,control}: enable PIE build for stronger security
35 (LP: #507744).
36
37 -- Kees Cook <kees@ubuntu.com> Wed, 13 Jan 2010 23:50:37 -0800
38
39>>>>>>> MERGE-SOURCE
30firefox-3.5 (3.5.7+nobinonly-0ubuntu1) lucid; urgency=low40firefox-3.5 (3.5.7+nobinonly-0ubuntu1) lucid; urgency=low
3141
32 * New upstream release v3.5.7 (FIREFOX_3_5_7_RELEASE)42 * New upstream release v3.5.7 (FIREFOX_3_5_7_RELEASE)
3343
=== modified file 'debian/control'
--- debian/control 2010-01-20 02:17:11 +0000
+++ debian/control 2010-01-22 04:52:13 +0000
@@ -22,6 +22,7 @@
22 libdbus-glib-1-dev (>= 0.60),22 libdbus-glib-1-dev (>= 0.60),
23 libnspr4-dev, libnss3-dev,23 libnspr4-dev, libnss3-dev,
24 mozilla-devscripts (>= 0.10~),24 mozilla-devscripts (>= 0.10~),
25 hardening-wrapper,
25 lsb-release26 lsb-release
26Standards-Version: 3.8.127Standards-Version: 3.8.1
2728
2829
=== modified file 'debian/rules'
--- debian/rules 2010-01-18 23:45:44 +0000
+++ debian/rules 2010-01-22 04:52:14 +0000
@@ -73,6 +73,8 @@
73LDFLAGS=$(shell echo $$LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//')73LDFLAGS=$(shell echo $$LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//')
74export LDFLAGS74export LDFLAGS
7575
76export DEB_BUILD_HARDENING=1
77
76ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))78ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
77 EXTRA_SYSTEM_CONFIGURE_FLAGS += --disable-optimize79 EXTRA_SYSTEM_CONFIGURE_FLAGS += --disable-optimize
78endif80endif

Subscribers

People subscribed via source and target branches