[Libreoffice-commits] .: 2 commits - patches/dev300

[Bjoern Michaelsen]

 patches/dev300/apply                 |    5 ---
 patches/dev300/debian-opt.diff       |   37 -----------------------
 patches/dev300/sensible-browser.diff |   56 -----------------------------------
 3 files changed, 98 deletions(-)

New commits:
commit 791f3edb68b6cb9f92513ad917ea453794296859
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Nov 24 17:53:09 2011 +0100

    remove sensible-browser.diff, was already downstreamed to debian-experimental-3.5

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ac7b205..ceb0678 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 4075123..0000000
--- 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
commit f193e512bd172132da35284845754ed02855e8e0
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Nov 24 17:52:24 2011 +0100

    remove sensible-browser.diff, downstreamed to debian-experimental-3.5

diff --git a/patches/dev300/apply b/patches/dev300/apply
index fc3f05f..ac7b205 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -353,8 +353,6 @@ reportdesign-mention-package.diff, rengelha
 # build using -O2 on x86 and sparc according to Debian policy.
 debian-opt.diff
 
-sensible-browser.diff
-
 # add JDK paths for MySQL, PostgreSQL, JTDS
 jdbc-driver-classpaths-debian.diff
 
diff --git a/patches/dev300/sensible-browser.diff b/patches/dev300/sensible-browser.diff
deleted file mode 100644
index aeb901f..0000000
--- a/patches/dev300/sensible-browser.diff
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: shell/source/unix/misc/gnome-open-url.sh
-===================================================================
-RCS file: /cvs/gsl/shell/shell/source/unix/misc/gnome-open-url.sh,v
-retrieving revision 1.3
-diff -u -u -r1.3 gnome-open-url.sh
---- shell/source/unix/misc/gnome-open-url.sh	13 May 2005 07:31:07 -0000	1.3
-+++ shell/source/unix/misc/gnome-open-url.sh	6 Jun 2005 09:43:06 -0000
-@@ -1,6 +1,6 @@
- #!/bin/sh
- 
- # use xdg-open or gnome-open if available
--xdg-open "$1" 2>/dev/null || gnome-open "$1" 2>/dev/null || "$0.bin" $1
-+xdg-open "$1" 2>/dev/null || gnome-open "$1" 2>/dev/null || sensible-browser "$1" || "$0.bin" $1
- 
- exit 0
-Index: shell/source/unix/misc/kde-open-url.sh
-===================================================================
-RCS file: /cvs/gsl/shell/shell/source/unix/misc/kde-open-url.sh,v
-retrieving revision 1.2
-diff -u -u -r1.2 kde-open-url.sh
---- shell/source/unix/misc/kde-open-url.sh	10 May 2004 13:08:06 -0000	1.2
-+++ shell/source/unix/misc/kde-open-url.sh	6 Jun 2005 09:43:06 -0000
-@@ -51,9 +51,13 @@
- 
- # special handling for mailto: uris
- if echo $1 | grep '^mailto:' > /dev/null; then
--  kmailservice "$1" &
-+  if which kde-open; then
-+    kde-open "$1" &
-+  else
-+    mailservice "$1" &
-+  fi
- else
--  kfmclient openURL "$1" &
-+  sensible-browser "$1" &
- fi
- 
- exit 0
-Index: shell/source/unix/misc/open-url.sh
-===================================================================
-RCS file: /cvs/gsl/shell/shell/source/unix/misc/open-url.sh,v
-retrieving revision 1.2
-diff -u -u -r1.2 open-url.sh
---- shell/source/unix/misc/open-url.sh	10 May 2004 13:08:30 -0000	1.2
-+++ shell/source/unix/misc/open-url.sh	6 Jun 2005 09:43:06 -0000
-@ -79,6 +79,10 @@
-     $BROWSER "$1" &
-     exit 0
-   fi
-+  if [ -x /usr/bin/sensible-browser ]; then
-+    sensible-browser "$1"
-+    exit 0
-+  fi
-   # mozilla derivates may need -remote semantics
-   for i in firefox mozilla netscape; do
-     browser=`which $i`