Package: firefox
Version: 1.5.dfsg+1.5.0.1-1
Severity: wishlist
Tags: patch
Sorry for emailing you a not-broken-apart patch. If this is
inconvenient (for example, you only want some of these changes) then
please let me know and I'll split them up for you.
Changes included:
- Arranges for OPTFLAGS to always include -g and for the Mozilla
buildsystem not to strip anything. The stripping will be done
by dh_strip anyway, and doing -g and not stripping until then
makes build trees more useful and makes it easier to provide a -dbg
package.
- Calls `about.png.orig' `about.png.upstream' instead so that
it doesn't get removed by things that try to tidy up after
patching, which makes debian/rules clean work properly.
If you like I can provide you with the additional changes we have
applied in Ubuntu to make it build a -dbg package containing the
detached debugging symbols.
The diff is against 1.5.dfsg+1.5.0.1-1ubuntu9 so I can't guarantee
that it will apply cleanly, but I hope it will.
Regards,
Ian.
diff -u firefox-1.5.dfsg+1.5.0.1/debian/rules
firefox-1.5.dfsg+1.5.0.1/debian/rules
--- firefox-1.5.dfsg+1.5.0.1/debian/rules
+++ firefox-1.5.dfsg+1.5.0.1/debian/rules
@@ -26,9 +26,9 @@
SHARE_DIR := /usr/share/firefox
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- OPTFLAGS = -O0
+ OPTFLAGS = -O0 -g
else
- OPTFLAGS = -O2
+ OPTFLAGS = -O2 -g
# Commented out OPTFLAGS set for some architectures.
# We will see if gcc 4.0 is doing any better.
@@ -65,7 +65,8 @@
--disable-installer \
--disable-xprint \
--enable-crypto \
- --enable-strip-libs \
+ --disable-strip \
+ --disable-strip-libs \
--enable-canvas \
--enable-svg \
--enable-svg-renderer=cairo \
@@ -112,12 +113,12 @@
(cd debian && uudecode firefox.png.uu \
&& uudecode debsearch.gif.uu && uudecode about.png.uu)
cd debian && uudecode wikipedia.gif.uu
- if [ ! -f browser/base/branding/about.png.orig ]; then \
+ if [ ! -f browser/base/branding/about.png.upstream ]; then \
mv -f browser/base/branding/about.png \
- browser/base/branding/about.png.orig; fi
+ browser/base/branding/about.png.upstream; fi
cp -f debian/about.png browser/base/branding/about.png
- $(MAKE)
+ $(MAKE) STRIP=:
touch build-stamp
@@ -127,7 +128,7 @@
rm -f build-stamp install-stamp \
debian/firefox.png debian/debsearch.gif debian/about.png
rm -f debian/wikipedia.gif
- mv -f browser/base/branding/about.png.orig \
+ mv -f browser/base/branding/about.png.upstream \
browser/base/branding/about.png || true
rm -f debian/mozilla-*.pc
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
