[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_3.6.4_rc3-1-283-ge775875
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit e7758756f75ff2e0933b8b9badbed383c457aed1
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Dec 7 15:48:43 2012 +0100
reduce diff to debian, should fix lp#1022382
diff --git a/changelog b/changelog
index 378fcd8..a49eb51 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
libreoffice (1:4.0.0~beta1-0ubuntu1~ppa1) raring; urgency=low
* beta -- first port to raring
+ * sync unopkg wrapper from debian (LP: #1022382)
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 05 Dec 2012 23:38:30 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 07 Dec 2012 15:46:18 +0100
libreoffice (1:4.0.0~beta1~git20121204-1) UNRELEASED; urgency=low
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index 9007e28..ebfb157 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -118,7 +118,7 @@ create_package_directory gid_Module_Pdfimport pkg/libreoffice-pdfimport
create_package_directory gid_Module_Optional_Extensions_PRESENTER_SCREEN pkg/libreoffice-presenter-console
create_package_directory gid_Module_Optional_Extensions_REPORTDESIGN pkg/libreoffice-report-builder
create_package_directory gid_Module_Optional_PostgresqlSdbc pkg/libreoffice-sdbc-postgresql
-move_wrappers pkg/libreoffice-common soffice
+move_wrappers pkg/libreoffice-common soffice unopkg
move_wrappers pkg/libreoffice-common libreoffice loffice lofromtemplate
move_wrappers pkg/libreoffice-base lobase
move_wrappers pkg/libreoffice-writer lowriter loweb
diff --git a/scripts/update-unitymenus b/scripts/update-unitymenus
deleted file mode 100755
index 8656afc..0000000
--- a/scripts/update-unitymenus
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-CURDIR=`readlink -f .`
-TMPDIR=`mktemp -d`
-BRANCH=feature/unitymenus-quantal
-git clone $1 $TMPDIR/core
-cd $TMPDIR/core
-git checkout $BRANCH
-git rebase $2
-git log -1 $BRANCH > $CURDIR/patches/unitymenus.diff
-git diff --stat $2 $BRANCH >> $CURDIR/patches/unitymenus.diff
-git diff $2 $BRANCH >> $CURDIR/patches/unitymenus.diff
-cd $CURDIR
-rm -rf $TMPDIR
diff --git a/shell-lib-extensions.sh b/shell-lib-extensions.sh
index 56a4828..347a0f2 100644
--- a/shell-lib-extensions.sh
+++ b/shell-lib-extensions.sh
@@ -4,3 +4,4 @@ validate_extensions() {
HOME=$INSTDIR /usr/lib/libreoffice/program/unopkg validate -v --bundled
fi
}
+
--
LibreOffice packaging repository
Reply to: