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

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the debian-experimental-4.0 branch:
commit 39a9fc6ad6e83486bfca9a8cb99c181c717d006b
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Nov 30 10:00:39 2012 +0100

    readd xpdfimport move in gid2pkgdirs and adapt rules
    
    This reverts commit d92d7e59e508d8534fe2b445b496966e7faf8616.

diff --git a/rules b/rules
index 86d378b..0d1e675 100755
--- a/rules
+++ b/rules
@@ -1867,8 +1867,10 @@ endif
 		mv $(PKGDIR)-common/$(OODIR)/$$i \
 			$(PKGDIR)-pdfimport/$(OODIR)/$$i; \
 	done
-	mv $(PKGDIR)-core/$(OODIR)/program/pdfimport.uno.so \
-		$(PKGDIR)-pdfimport/$(OODIR)/program
+	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
 
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index c8e1679..ebfb157 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -151,7 +151,7 @@ mkdir -p $OODESTDIR/pkg/libreoffice-core/$OOINSTBASE/program; \
 fi &&
 ( cd pkg/libreoffice-common/$OOINSTBASE/program
   find -maxdepth 1 \
-     -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|oosplash\|uri-encode\)' \
+     -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|oosplash\|uri-encode\|xpdfimport\)' \
      -exec mv {} $OODESTDIR/pkg/libreoffice-core/$OOINSTBASE/program \;
 );
 

-- 
LibreOffice packaging repository