[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4_rc1-1-149-g7769f6b



The following commit has been merged in the debian-experimental-4.0 branch:
commit f471a6ce99e6e71a1d924adaad23e28382141e36
Author: Rene Engelhard <rene@debian.org>
Date:   Sun Nov 25 16:41:38 2012 +0100

    fix xpdfimport install

diff --git a/rules b/rules
index 0a1caba..ed795b4 100755
--- a/rules
+++ b/rules
@@ -1854,6 +1854,18 @@ ifeq "$(ENABLE_EVO2)" "y"
 		$(PKGDIR)-evolution/$(OODIR)/presets/database
 endif
 
+ifeq "$(ENABLE_PDFIMPORT)" "y"
+	rm -rf $(PKGDIR)-pdfimport
+	mkdir -p $(PKGDIR)-pdfimport/$(OODIR)/program
+	mkdir -p $(PKGDIR)-pdfimport/$(OODIR)/share/
+	mv $(PKGDIR)-core/$(OODIR)/program/pdfimport.uno.so \
+			$(PKGDIR)-pdfimport/$(OODIR)/program
+	mv $(PKGDIR)-common/$(OODIR)/program/xpdfimport \
+			$(PKGDIR)-pdfimport/$(OODIR)/program
+	mv $(PKGDIR)-common/$(OODDIR)/share/xpdfimport \
+		$(PKGDIR)-pdfimport/$(OODIR)/share
+endif
+
 	find debian/tmp ! -perm -200 | xargs -r chmod u+w
 
 	touch $@
@@ -2348,15 +2360,6 @@ endif
 #		$(PKGDIR)-dev/$(OODIR)/program/gengal.bin
 #endif
 
-ifeq "$(ENABLE_PDFIMPORT)" "y"
-	rm -rf $(PKGDIR)-pdfimport
-	mkdir -p $(PKGDIR)-pdfimport/$(OODIR)/program
-	for i in xpdfimport xpdfimport_err.pdf pdfimport.uno.so; do \
-		mv $(PKGDIR)-core/$(OODIR)/program/$$i \
-			$(PKGDIR)-pdfimport/$(OODIR)/program; \
-	done
-endif
-
 	for i in $(ARCH_DEP_PACKAGES); do \
 		if [ -e debian/$$i.bug-script.in ]; then \
 			cat debian/$$i.bug-script.in \

-- 
LibreOffice packaging repository


Reply to: