[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_rc1-1-21-gaadfc22
The following commit has been merged in the debian-experimental-3.5 branch:
commit aadfc2227cbdfa384a7e42e33dd384ad5e5a890a
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jan 25 10:51:46 2012 +0100
fix nsplugin build and install
diff --git a/patches/fix-nsplugin-build-and-install.diff b/patches/fix-nsplugin-build-and-install.diff
new file mode 100644
index 0000000..737b8d5
--- /dev/null
+++ b/patches/fix-nsplugin-build-and-install.diff
@@ -0,0 +1,50 @@
+--- a/extensions/source/nsplugin/source/makefile.mk-old 2012-01-25 09:00:55.000000000 +0000
++++ b/extensions/source/nsplugin/source/makefile.mk 2012-01-25 09:01:04.000000000 +0000
+@@ -36,8 +36,6 @@
+
+ .INCLUDE : settings.mk
+
+-.IF "$(WITH_MOZILLA)" != "NO"
+-
+ .IF "$(SYSTEM_MOZILLA_HEADERS)" == "YES"
+ INCPRE+=$(MOZILLA_HEADERS_CFLAGS)
+ .ELSE
+@@ -160,8 +158,6 @@
+ DEF2EXPORTFILE=exports_wnt.dxp
+ .ENDIF
+
+-.ENDIF # $(WITH_MOZILLA) != "NO"
+-
+ # --- Targets ----------------------------------
+
+ .INCLUDE : target.mk
+--- a/scp2/source/ooo/common_brand.scp-old 2012-01-25 09:14:08.000000000 +0000
++++ b/scp2/source/ooo/common_brand.scp 2012-01-25 09:14:19.000000000 +0000
+@@ -642,7 +642,7 @@
+ End
+ #endif
+
+-#if !defined WITHOUT_MOZILLA && defined ENABLE_NSPLUGIN
++#if defined ENABLE_NSPLUGIN
+ File gid_Brand_File_Lib_Npsoplugin
+ BIN_FILE_BODY;
+ Name = SPECIAL_NAME(npsoplugin);
+--- a/scp2/source/ooo/file_ooo.scp-old 2012-01-25 09:12:06.000000000 +0000
++++ b/scp2/source/ooo/file_ooo.scp 2012-01-25 09:12:58.000000000 +0000
+@@ -108,8 +108,6 @@
+ Name = "basicsrvtutorials.zip";
+ End
+
+-#ifndef WITHOUT_MOZILLA
+-
+ #ifdef ENABLE_NSPLUGIN
+ File gid_File_Exe_Nsplugin
+ BIN_FILE_BODY;
+@@ -122,7 +120,6 @@
+ #endif
+ End
+ #endif
+-#endif
+
+ File gid_File_Bin_Gengal
+ BIN_FILE_BODY;
diff --git a/patches/series b/patches/series
index c50a0b0..9c885a6 100644
--- a/patches/series
+++ b/patches/series
@@ -26,3 +26,4 @@ add-debian-multiarch-support.diff
revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff
propagate-gb_FULLDEPS.diff
disable-sc-unoapi-subsequentcheck-for-now.diff
+fix-nsplugin-build-and-install.diff
diff --git a/rules b/rules
index 5ce90e8..6c235d5 100755
--- a/rules
+++ b/rules
@@ -2050,10 +2050,6 @@ ifeq "$(ENABLE_EVO2)" "y"
endif
ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
- # FIXME: Why isn't this installed?
- mkdir -p -m755 debian/mozilla-libreoffice$(VER)/$(OODIR)/program
- install -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/lib/libnpsoplugin.so debian/mozilla-libreoffice$(VER)/$(OODIR)/program
- install -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/bin/nsplugin debian/mozilla-libreoffice$(VER)/$(OODIR)/program
cd debian/mozilla-libreoffice$(VER) && \
mkdir -p usr/lib/mozilla/plugins && \
ln -sf /$(OODIR)/program/libnpsoplugin.so \
--
LibreOffice packaging repository
Reply to: