summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-11-24 17:53:09 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-11-24 17:53:09 +0100
commit791f3edb68b6cb9f92513ad917ea453794296859 (patch)
treea5539bdcf3fbabb41873c081b080187719fa95c2
parentf193e512bd172132da35284845754ed02855e8e0 (diff)
remove sensible-browser.diff, was already downstreamed to debian-experimental-3.5
-rw-r--r--patches/dev300/apply3
-rw-r--r--patches/dev300/debian-opt.diff37
2 files changed, 0 insertions, 40 deletions
diff --git a/patches/dev300/apply b/patches/dev300/apply
index ac7b20588..ceb067868 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -350,9 +350,6 @@ oosplash-etc-libreoffice-sofficerc.diff
# to download it from elsewhere
reportdesign-mention-package.diff, rengelha
-# build using -O2 on x86 and sparc according to Debian policy.
-debian-opt.diff
-
# add JDK paths for MySQL, PostgreSQL, JTDS
jdbc-driver-classpaths-debian.diff
diff --git a/patches/dev300/debian-opt.diff b/patches/dev300/debian-opt.diff
deleted file mode 100644
index 4075123be..000000000
--- a/patches/dev300/debian-opt.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: unxlngs.mk
-===================================================================
---- solenv/inc/unxlngs.mk (Revision 276754)
-+++ solenv/inc/unxlngs.mk (Arbeitskopie)
-@@ -33,7 +33,7 @@
-
- ASM=$(CC)
- AFLAGS=-Wa,-K,PIC -c $(CDEFS)
--CDEFAULTOPT=-Os
-+CDEFAULTOPT=-O2
- PICSWITCH:=-fPIC
- .INCLUDE : unxlng.mk
- CDEFS+=-DSPARC
-Index: unxlngi.mk
-===================================================================
---- solenv/inc/unxlngi.mk (Revision 276754)
-+++ solenv/inc/unxlngi.mk (Arbeitskopie)
-@@ -30,7 +30,7 @@
- #*************************************************************************
-
- # mk file for Unix Linux Intel (X86) using GCC, please make generic modifications to unxlng.mk
--CDEFAULTOPT=-Os
-+CDEFAULTOPT=-O2
- ARCH_FLAGS*=-mtune=pentiumpro
- .INCLUDE : unxlng.mk
- CDEFS+=-DX86
---- solenv/inc/unxlngppc.mk (Revision 277719)
-+++ solenv/inc/unxlngppc.mk (Arbeitskopie)
-@@ -31,7 +31,7 @@
-
- # mk file for Unix Linux PowerPC using GCC, please make generic modifications to unxlng.mk
-
--DEFAULTOPT=-Os
-+DEFAULTOPT=-O2
- PICSWITCH:=-fPIC
- .INCLUDE : unxlng.mk
- CDEFS+=-DPOWERPC -DPPC