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

[Bjoern Michaelsen]

 patches/dev300/apply                            |    3 ---
 patches/dev300/open-url-support-iceanimals.diff |   22 ----------------------
 patches/dev300/seamonkey-is-iceape.diff         |   22 ----------------------
 3 files changed, 47 deletions(-)

New commits:
commit e0335749ad65bdb78f4da2315197b6066bb24563
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Nov 24 18:37:45 2011 +0100

    upstream patches/dev300/seamonkey-is-iceape.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f4af29b..73b9c4e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -481,8 +481,6 @@ novell-win32-agfa-monotype-fonts.diff, tml
 
 
 [ DebianOnly ]
-seamonkey-is-iceape.diff
-
 # build against xulrunner 1.9.1+
 xulrunner-1.9.1.diff, ccheney
 
diff --git a/patches/dev300/seamonkey-is-iceape.diff b/patches/dev300/seamonkey-is-iceape.diff
deleted file mode 100644
index 10fccb6..0000000
--- a/patches/dev300/seamonkey-is-iceape.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.in-old	2008-05-03 23:27:00.000000000 +0200
-+++ configure.in	2008-05-03 23:27:37.000000000 +0200
-@@ -795,7 +795,7 @@
-                           components cannot be built against a contemporary
-                           mozilla. The flavour used can be specified by
-                           --with-system-mozilla=<flavour>. Supported are:
--                          libxul (default), xulrunner, firefox, seamonkey,
-+                          libxul (default), xulrunner, firefox, iceape,
-                           mozilla
- ], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
-
-@@ -4134,8 +4134,8 @@
-       MOZ_FLAVOUR=libxul
-     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
-       MOZ_FLAVOUR=xulrunner
--    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "seamonkey"; then
--      MOZ_FLAVOUR=seamonkey
-+    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "iceape"; then
-+      MOZ_FLAVOUR=iceape
-     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "firefox"; then
-       MOZ_FLAVOUR=firefox
-     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then
commit 4264a8542d6b6da19b548c192662f5d7565c31ca
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Nov 24 18:36:26 2011 +0100

    upstream open-url-support-iceanimals.dif

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ceb0678..f4af29b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -481,7 +481,6 @@ novell-win32-agfa-monotype-fonts.diff, tml
 
 
 [ DebianOnly ]
-open-url-support-iceanimals.diff
 seamonkey-is-iceape.diff
 
 # build against xulrunner 1.9.1+
diff --git a/patches/dev300/open-url-support-iceanimals.diff b/patches/dev300/open-url-support-iceanimals.diff
deleted file mode 100644
index 3928954..0000000
--- a/patches/dev300/open-url-support-iceanimals.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: open-url.sh
-===================================================================
---- shell/source/unix/misc/open-url.sh	(Revision 277618)
-+++ shell/source/unix/misc/open-url.sh	(Arbeitskopie)
-@@ -58,7 +58,7 @@
-     exit 0
-   fi
-   # mozilla derivates may need -remote semantics
--  for i in thunderbird mozilla netscape; do
-+  for i in icedove thunderbird iceape mozilla netscape; do
-     mailer=`which $i`
-     if [ ! -z "$mailer" ]; then
-       run_mozilla "$mailer" "$1"
-@@ -84,7 +84,7 @@
-     exit 0
-   fi
-   # mozilla derivates may need -remote semantics
--  for i in firefox mozilla netscape; do
-+  for i in iceweasel firefox iceape mozilla netscape; do
-     browser=`which $i`
-     if [ ! -z "$browser" ]; then
-       run_mozilla "$browser" "$1"