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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-4-54-g6fba73a



The following commit has been merged in the debian-experimental-3.5 branch:
commit d56da5c1be326bf6f287e032708e99d36f8cf26a
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Oct 24 22:30:18 2011 +0200

    move libreoffice-builds tmp/pkg creation over as scripts/gid2pkgdirs.sh

diff --git a/rules b/rules
index ab4f9d4..febe5f7 100755
--- a/rules
+++ b/rules
@@ -1699,7 +1699,12 @@ $(STAMP_DIR)/install: $(STAMP_DIR)/build
 		 LD_PRELOAD=/usr/lib/libfakeroot/libfakeroot-$(shell update-alternatives --query fakeroot | grep Value: | cut -d"-" -f2).so \
 		 DESTDIR=$(CURDIR)/debian/tmp \
 		 $(MAKE) distro-pack-install
-
+	export DESTDIR=$(CURDIR)/debian/tmp ;\
+	export VERSION=$(BASIS_VERSION); \
+	export OOINSTBASE=$(OOBRANDDIR); \
+	export OOO_LANGS_LIST=$(ISOS); \
+	$(CURDIR)/debian/scripts/gid2pkgdirs.sh
+	
 	# prepare install/dir files for dh
 	for i in `cd $(CURDIR)/debian/tmp/pkg; ls -1 | xargs`; do \
 		echo "$${i}/usr/* usr" > debian/$$i.install; \
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
new file mode 100755
index 0000000..1be717a
--- /dev/null
+++ b/scripts/gid2pkgdirs.sh
@@ -0,0 +1,141 @@
+#!/bin/sh
+
+## create split package dirs out of LibreOffices gid_* files
+## copied from former ooo-build/libreoffice-build package-ooo
+## (c) 2005 Chris Halls <halls@debian.org>
+## (c) 2005-2011 Rene Engelhard <rene@debian.org>
+
+cd $DESTDIR
+
+echo "Copying gid files...."
+rm gid_*
+cp $DESTDIR/../../file-lists/orig/gid_* .
+
+echo "Creating package directories..."
+
+test -d pkg && rm -r pkg || :
+
+# Create package tree (needed by Debian's dpkg)
+# create_package_directory <list_file> <directory_name>
+create_package_directory()
+{
+listfile=$1
+directory="$2"
+perl -nl \
+        -e " if(/^%dir (.*)/)
+                        {system('mkdir', '-p', '-m', '755', \"$directory\".\$1);}
+                else
+                        {rename('./'.\$_, \"$directory\".\$_);}
+                " \
+        $listfile
+}
+
+# move_wrappers <directory_name> <name> [...]
+move_wrappers()
+{
+directory=$1
+shift
+mkdir -m755 -p "$directory"/usr/bin
+while test -n "$1"; do
+        mv usr/*bin/"$1$BINSUFFIX" "$directory"/usr/bin
+        shift
+done
+}
+
+create_package_directory gid_Module_Root_Ure_Hidden             pkg/ure
+create_package_directory gid_Module_Root                        pkg/libreoffice-common
+create_package_directory gid_Module_Root_Brand                  pkg/libreoffice-common
+create_package_directory gid_Module_Root_Files_Images           pkg/libreoffice-common
+create_package_directory gid_Module_Oo_Linguistic               pkg/libreoffice-common
+create_package_directory gid_Module_Optional_Xsltfiltersamples  pkg/libreoffice-common
+create_package_directory gid_Module_Optional_Javafilter         pkg/libreoffice-common
+create_package_directory gid_Module_Optional_Binfilter          pkg/libreoffice-filter-binfilter
+create_package_directory gid_Module_Optional_Grfflt             pkg/libreoffice-draw
+create_package_directory gid_Module_Prg_Calc_Bin                pkg/libreoffice-calc
+create_package_directory gid_Module_Prg_Math_Bin                pkg/libreoffice-math
+create_package_directory gid_Module_Prg_Draw_Bin                pkg/libreoffice-draw
+create_package_directory gid_Module_Prg_Wrt_Bin                 pkg/libreoffice-writer
+create_package_directory gid_Module_Prg_Impress_Bin             pkg/libreoffice-impress
+create_package_directory gid_Module_Prg_Base_Bin                pkg/libreoffice-base
+create_package_directory gid_Module_Brand_Prg_Calc              pkg/libreoffice-calc
+create_package_directory gid_Module_Brand_Prg_Math              pkg/libreoffice-math
+create_package_directory gid_Module_Brand_Prg_Draw              pkg/libreoffice-draw
+create_package_directory gid_Module_Brand_Prg_Wrt               pkg/libreoffice-writer
+create_package_directory gid_Module_Brand_Prg_Impress           pkg/libreoffice-impress
+create_package_directory gid_Module_Brand_Prg_Base              pkg/libreoffice-base
+create_package_directory gid_Module_Optional_Pyuno              pkg/python-uno
+create_package_directory gid_Module_Optional_Gnome              pkg/libreoffice-gnome
+create_package_directory gid_Module_Optional_Kde                pkg/libreoffice-kde
+create_package_directory gid_Module_Root_Files_2                pkg/libreoffice-common
+create_package_directory gid_Module_Root_Files_3                pkg/libreoffice-common
+create_package_directory gid_Module_Root_Files_4                pkg/libreoffice-common
+create_package_directory gid_Module_Root_Files_5                pkg/libreoffice-common
+create_package_directory gid_Module_Root_Files_6                pkg/libreoffice-common
+create_package_directory gid_Module_Root_Files_7                pkg/libreoffice-common
+create_package_directory gid_Module_Optional_Testtool           pkg/libreoffice-qa-tools
+create_package_directory gid_Module_Root_SDK                    pkg/libreoffice-dev
+move_wrappers pkg/libreoffice-common soffice unopkg
+move_wrappers pkg/libreoffice-common libreoffice lofromtemplate
+move_wrappers pkg/libreoffice-base lobase
+move_wrappers pkg/libreoffice-writer lowriter loweb
+move_wrappers pkg/libreoffice-calc localc
+move_wrappers pkg/libreoffice-impress loimpress
+move_wrappers pkg/libreoffice-math lomath
+move_wrappers pkg/libreoffice-draw lodraw
+
+for l in `echo $OOO_LANGS_LIST`; do
+        for p in Impress Draw Math Calc Base Writer; do
+                create_package_directory  gid_Module_Langpack_${p}_`echo $l | sed -e s/-/_/g`   pkg/libreoffice-l10n-$l
+        done
+        create_package_directory gid_Module_Langpack_Basis_`echo $l | sed -e s/-/_/g`   pkg/libreoffice-l10n-$l
+        create_package_directory gid_Module_Langpack_Brand_`echo $l | sed -e s/-/_/g`   pkg/libreoffice-l10n-$l
+        create_package_directory gid_Module_Langpack_Resource_`echo $l | sed -e s/-/_/g`        pkg/libreoffice-l10n-$l
+        create_package_directory gid_Module_Helppack_Help_`echo $l | sed -e s/-/_/g`    pkg/libreoffice-help-$l
+        if [ -f gid_Module_Optional_Binfilter ]; then
+                if [ "$l" = "en-US" ]; then
+                        create_package_directory gid_Module_Langpack_Binfilter_en_US    pkg/libreoffice-filter-binfilter
+                else
+                        create_package_directory gid_Module_Langpack_Binfilter_`echo $l | sed -e s/-/_/g`    pkg/libreoffice-l10n-$l
+                fi
+        fi
+        # some help files are in _Langpack_{Writer,Impress,...}_<lang>
+        # move them from -l10n to -help
+        if [ "$l" = "en-US" ]; then d=en; else d=$l; fi
+        mv pkg/libreoffice-l10n-$l/$OOINSTBASE/basis$VERSION/help/$d/* \
+                pkg/libreoffice-help-$l/$OOINSTBASE/basis$VERSION/help/$d && \
+        rmdir pkg/libreoffice-l10n-$l/$OOINSTBASE/basis$VERSION/help/$d
+done
+	
+# Move all libraries, binaries, *.rdb from -common to -core
+for d in $OOINSTBASE/basis$VERSION/program $OOINSTBASE/program; do \
+  if [ ! -d $OODESTDIR/pkg/libreoffice-core/$d ]; then \
+  mkdir -p $OODESTDIR/pkg/libreoffice-core/$d; \
+  fi &&
+  ( cd pkg/libreoffice-common/$d
+    find -maxdepth 1 \
+       -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)' \
+   -exec mv {} $OODESTDIR/pkg/libreoffice-core/$d \;
+  ); \
+done
+
+mkdir -p pkg/libreoffice-common/usr/share/man/man1
+mv usr/share/man/man1/libreoffice$BINSUFFIX.1.gz \
+	pkg/libreoffice-common/usr/share/man/man1
+
+mkdir -p pkg/libreoffice-common/etc/bash_completion.d
+mv etc/bash_completion.d/libreoffice$BINSUFFIX.sh \
+	pkg/libreoffice-common/etc/bash_completion.d
+
+mv .$OOINSTBASE/basis$VERSION/program/java-set-classpath \
+	pkg/libreoffice-common/$OOINSTBASE/program
+if echo $OOO_LANGS_LIST | grep -q en-US; then
+        for i in forms/resume.ott officorr/project-proposal.ott; do \
+                mkdir -p pkg/libreoffice-common/$OOINSTBASE/basis$VERSION/share/template/en-US/`dirname $i`; \
+                mv .$OOINSTBASE/basis$VERSION/share/template/en-US/$i \
+                        pkg/libreoffice-common/$OOINSTBASE/basis$VERSION/share/template/en-US/$i; \
+        done; \
+fi
+
+# Warn for any remaining files
+find . -path './pkg' -prune -o -not -name 'gid_Module_*' -not -type d -exec echo "File not packaged: {}" \;
+

-- 
LibreOffice packaging repository


Reply to: