[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.2_rc1-1-2-g6a3e815
The following commit has been merged in the debian-experimental-4.0 branch:
commit 6a3e8158f2c167e92dc0a9aaa78b95b3ac5033dd
Author: Rene Engelhard <rene@debian.org>
Date: Mon Mar 18 18:36:55 2013 +0100
remove FIXME: install gid_Module_Pdfimport properly again
diff --git a/patches/install-fixes.diff b/patches/install-fixes.diff
index 140c222..342953f 100644
--- a/patches/install-fixes.diff
+++ b/patches/install-fixes.diff
@@ -166,3 +166,47 @@ index eaabf9c..c1b1ec6 100755
fi
# mark the config files
+From b0213e0bb4d4d81078e43dbabdefb6618a0cd8fd Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@debian.org>
+Date: Mon, 18 Mar 2013 17:14:08 +0000
+Subject: readd packinfo_office.txt stuff for Pdfimport
+
+... as otherwise it ends up in gid_Module_Root_Brand, NOT
+in it's own module (which is intended)
+
+Change-Id: Ic3951ccd7471793419b04f4f2fcfe90060c6d71f
+---
+--- a/scp2/source/ooo/module_pdfimport.scp-old 2013-03-18 18:34:36.121925117 +0100
++++ b/scp2/source/ooo/module_pdfimport.scp 2013-03-18 18:34:54.785924562 +0100
+@@ -26,6 +26,7 @@
+ #include "macros.inc"
+
+ Module gid_Module_Pdfimport
++ PackageInfo = "packinfo_office.txt";
+ ParentID = gid_Module_Root_Brand;
+ Styles = (HIDDEN_ROOT);
+ Dirs = (gid_Dir_Share_Xpdfimport);
+diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
+index 4a8a773..0f3bda1 100644
+--- a/setup_native/source/packinfo/packinfo_office.txt
++++ b/setup_native/source/packinfo/packinfo_office.txt
+@@ -1183,3 +1183,17 @@ description = "PostgreSQL Connector driver for %PRODUCTNAME %PRODUCTVERSION"
+ destpath = "/opt"
+ packageversion = "%PACKAGEVERSION"
+ End
++
++Start
++module = "gid_Module_Pdfimport"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-pdf-import"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
++packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-pdf-import"
++requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
++linuxpatchrequires = ""
++copyright = "2012 The Document Foundation"
++solariscopyright = "solariscopyrightfile"
++vendor = "The Document Foundation"
++description = "PDF import extension for %PRODUCTNAME %PRODUCTVERSION"
++destpath = "/opt"
++packageversion = "%PACKAGEVERSION"
++End
++
diff --git a/rules b/rules
index 733c227..cd54f84 100755
--- a/rules
+++ b/rules
@@ -1891,22 +1891,6 @@ ifeq "$(ENABLE_EVO2)" "y"
$(PKGDIR)-evolution/$(OODIR)/presets/database
endif
- # FIXME: Should have been done in gid2pkgdirs.sh but somehow the installer
- # doesn't create the gid_Module_Pdfimport file and so that doesn't work.
- # Do it manually here.
- rm -rf $(PKGDIR)-pdfimport
- mkdir -p $(PKGDIR)-pdfimport/$(OODIR)/program
- mkdir -p $(PKGDIR)-pdfimport/$(OODIR)/share/registry
- mkdir -p $(PKGDIR)-pdfimport/$(OODIR)/share/xpdfimport
- for i in program/xpdfimport share/xpdfimport share/registry/pdfimport.xcd; do \
- mv $(PKGDIR)-common/$(OODIR)/$$i \
- $(PKGDIR)-pdfimport/$(OODIR)/$$i; \
- done
- for i in program/xpdfimport program/pdfimport.uno.so; do \
- mv $(PKGDIR)-core/$(OODIR)/$$i \
- $(PKGDIR)-pdfimport/$(OODIR)/$$i; \
- done
-
find debian/tmp ! -perm -200 | xargs -r chmod u+w
touch $@
--
LibreOffice packaging repository
Reply to: