------------------------------------------------------------
revno: 1999
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Fri 2010-05-28 00:44:58 +0200
message:
remove extensions-mozilla-plugin-pc-if-libxul.diff again in favour of the
correct fix-bashisms-in-configure.diff
removed:
patches/extensions-mozilla-plugin-pc-if-libxul.diff
added:
patches/fix-bashisms-in-configure.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2010-05-27 22:22:34 +0000
+++ b/changelog 2010-05-27 22:44:58 +0000
@@ -1,5 +1,10 @@
openoffice.org (1:3.2.0-11) UNRELEASED; urgency=low
+ * debian/patches/extensions-mozilla-plugin-pc-if-libxul.diff: remove
+ again ..
+ * debian/patches/fix-bashisms-in-configure.diff: in favour of the
+ correct fix (== vs. = breaking with dash)
+
* debian/rules:
- fix variable to not add kfreebsd-i386 to OOO_MONO_ARCHS twice but
to actually add it to OOO_MOZILLA_ARCHS
=== removed file 'patches/extensions-mozilla-plugin-pc-if-libxul.diff'
--- a/patches/extensions-mozilla-plugin-pc-if-libxul.diff 2010-05-20
17:34:30 +0000
+++ b/patches/extensions-mozilla-plugin-pc-if-libxul.diff 1970-01-01
00:00:00 +0000
@@ -1,36 +0,0 @@
-diff --git a/patches/dev300/apply b/patches/dev300/apply
-index 916afff..1d3731c 100644
---- openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/apply
-+++ openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/apply
-@@ -427,6 +427,10 @@
- # .. and fix 64bit archs
- plugin.long.diff, i#110747, cmc
-
-+[ DebianBaseOnly and TemporaryHacks ]
-+extensions-mozilla-plugin-pc-if-libxul.diff
-+
-+[ Fixes ]
- # sd printing fixes
- printing-bugfix-254573.diff, n#254573, rodo
-
---- /dev/null 2010-05-02 17:01:50.016998199 +0200
-+++
openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/extensions-mozilla-plugin-pc-if-libxul.diff
2010-05-13 19:02:36.000000000 +0200
-@@ -0,0 +1,18 @@
-+diff --git a/extensions/source/plugin/util/makefile.pmk
b/extensions/source/plugin/util/makefile.pmk
-+--- extensions/source/plugin/util/makefile.pmk
-++++ extensions/source/plugin/util/makefile.pmk
-+@@ -30,8 +30,14 @@
-+
-+ .IF "$(SYSTEM_MOZILLA)" == "YES"
-+ CFLAGS+=-DSYSTEM_MOZILLA
-++# for libxul (newer xulrunners) the .pc file is mozilla-plugin, libxul-plugin
-++# doesn't exist
-++.IF "$(MOZ_FLAVOUR)" == "libxul"
-++PKGCONFIG_MODULES+=mozilla-plugin
-++.ELSE
-+ PKGCONFIG_MODULES+=$(MOZ_FLAVOUR)-plugin
-+ .ENDIF
-++.ENDIF
-+
-+ .IF "$(GUIBASE)" == "unx" && "$(ENABLE_GTK)" == "TRUE"
-+ CDEFS+=-DENABLE_GTK
=== added file 'patches/fix-bashisms-in-configure.diff'
--- a/patches/fix-bashisms-in-configure.diff 1970-01-01 00:00:00 +0000
+++ b/patches/fix-bashisms-in-configure.diff 2010-05-27 22:44:58 +0000
@@ -0,0 +1,112 @@
+--- openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/apply
2010-05-28 00:37:41.000000000 +0200
++++ openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/apply
2010-05-28 00:37:54.000000000 +0200
+@@ -3393,6 +3393,8 @@
+ # fixes crasher in xml parser
+ unoxml-fix-empty-xmlns.diff, rodo
+ configure-fix-lpsolve-depends.diff, janneke
++# fix bashisms in configure.in (== vs. =)
++configure-test-operator.diff, i#107645, rengelha
+ build-fix-xulrunner-npapi-inc.diff, janneke
+ toolkit-proper-erase-fix.diff, i#106575, thorsten
+
+--- /dev/null 2010-05-24 16:58:35.275686347 +0200
++++
openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/configure-test-operator.diff
2010-05-28 00:27:55.000000000 +0200
+@@ -0,0 +1,98 @@
++diff --git a/configure.in b/configure.in
++--- configure.in
+++++ configure.in
++@@ -3049,7 +3049,7 @@
++
++ if test "$SOLAR_JAVA" != ""; then
++ dnl first check if we have been asked to autodetect JAVA_HOME with a
recent gij
++- if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
+++ if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then
++ if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "50000"; then
++ cat > findhome.java <<_ACEOF
++ [import java.io.File;
++@@ -3137,7 +3137,7 @@
++ echo "JAVA_HOME was not explicitly informed with --with-jdk-home.
the configure script" >> warn
++ echo "attempted to find JAVA_HOME automatically, but apparently it
failed" >> warn
++ echo "in case JAVA_HOME is incorrectly set, some projects with not
be built correctly" >> warn
++-# if test "$JDK" == "gcj"; then
+++# if test "$JDK" = "gcj"; then
++ # echo "e.g. install java-1.4.2-gcj-compat-devel and use
--with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj" >> warn
++ # fi
++ fi
++@@ -3731,7 +3731,7 @@
++ if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \
++ test "$with_system_libxslt" != "no"; then
++ if test -z "$with_system_libxml" -a -z "$with_system_libs" || \
++- test "$with_system_libxml" == "no"; then
+++ test "$with_system_libxml" = "no"; then
++ # somehow AC_MSG_WARN won't work...
++ echo "to prevent incompatibilities between internal libxml2 and
libxslt, the office will be build with system-libxml"
++ echo "to prevent incompatibilities between internal libxml2 and
libxslt, the office will be build with system-libxml" >> warn
++@@ -3741,7 +3741,7 @@
++ if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
++ test "$with_system_libxml" != "no"; then
++ if test -z "$with_system_libxslt" -a -z "$with_system_libs" || \
++- test "$with_system_libxslt" == "no"; then
+++ test "$with_system_libxslt" = "no"; then
++ # somehow AC_MSG_WARN won't work...
++ echo "to prevent incompatibilities between internal libxslt and
libxml2, the office will be build with system-libxslt"
++ echo "to prevent incompatibilities between internal libxslt and
libxml2, the office will be build with system-libxslt" >> warn
++@@ -4443,7 +4443,7 @@
++
++ #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
++ #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
++- if test "$MOZ_FLAVOUR" == "libxul"; then
+++ if test "$MOZ_FLAVOUR" = "libxul"; then
++ MOZ_FLAVOUR="mozilla"
++ fi
++
++@@ -4696,7 +4696,7 @@
++ dnl ===================================================================
++
++ AC_MSG_CHECKING([whether to enable graphite support])
++-if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" ==
"z" -o "$enable_graphite" != "no" ; then
+++if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" =
"z" -o "$enable_graphite" != "no" ; then
++ AC_MSG_RESULT([yes])
++ ENABLE_GRAPHITE="TRUE"
++ AC_MSG_CHECKING([which graphite to use])
++@@ -5851,7 +5851,7 @@
++ fi
++ AC_SUBST(ENABLE_MEDIAWIKI)
++
++-if test "$ENABLE_MEDIAWIKI" == "YES"; then
+++if test "$ENABLE_MEDIAWIKI" = "YES"; then
++ AC_MSG_CHECKING([which Servlet API Jar to use])
++ if test -n "$with_system_servlet_api"; then
++ AC_MSG_RESULT([external])
++@@ -5881,7 +5881,7 @@
++ AC_MSG_ERROR([not existing. get it (did you get the -extensions
tarball?)])
++ fi
++ AC_MSG_CHECKING([which jfreereport libs to use])
++- if test "$with_system_jfreereport" == "yes"; then
+++ if test "$with_system_jfreereport" = "yes"; then
++ SYSTEM_JFREEREPORT=YES
++ AC_MSG_RESULT([external])
++ if test -z $SAC_JAR; then
++@@ -6251,7 +6251,7 @@
++ kde_incdirs="/usr/include $x_includes"
++ kde_libdirs="/usr/lib $x_libraries"
++
++- if test "$build_cpu" == "x86_64" ; then
+++ if test "$build_cpu" = "x86_64" ; then
++ qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
++ kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
++ fi
++@@ -6809,11 +6809,11 @@
++ # ===================================================================
++ AC_MSG_CHECKING([build verbosity])
++ if test -n "$enable_verbose"; then
++- if test "$enable_verbose" == "yes"; then
+++ if test "$enable_verbose" = "yes"; then
++ VERBOSE="TRUE"
++ AC_MSG_RESULT([high])
++ fi
++- if test "$enable_verbose" == "no"; then
+++ if test "$enable_verbose" = "no"; then
++ VERBOSE="FALSE"
++ AC_MSG_RESULT([low])
++ fi
=== modified file 'patches/series'
--- a/patches/series 2010-05-25 17:00:51 +0000
+++ b/patches/series 2010-05-27 22:44:58 +0000
@@ -12,6 +12,6 @@
do-not-delete-dbumiscres.src-resources.diff
sw-64bit-Size-mismatch.diff
file-locking-conditional-cifs.diff
-extensions-mozilla-plugin-pc-if-libxul.diff
fix-system-mythes-for-mythes-1.2.diff
kde4-redraw-status-bar.diff
+fix-bashisms-in-configure.diff
