[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.2-2-191-g4da21b1
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit e3d01642f243e81fbe6a66bbd6d779577dbea95d
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Aug 31 11:54:11 2011 +0200
lp#783247: backport humanity updates from master
diff --git a/changelog b/changelog
index cba74b5..ee073bd 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
-libreoffice (1:3.4.2-2ubuntu3) UNRELEASED; urgency=low
+libreoffice (1:3.4.2-2ubuntu3) oneiric; urgency=low
* also patch libgcc_s magic on powerpc
* further tweaking for stdlibs on ppc and armel (LP: #832121)
* use default jdk
+ * backport humanity updates from master (LP: #783247)
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 26 Aug 2011 18:18:52 +0200
diff --git a/patches/apply-ext-human-updates.diff b/patches/apply-ext-human-updates.diff
new file mode 100644
index 0000000..f865133
--- /dev/null
+++ b/patches/apply-ext-human-updates.diff
@@ -0,0 +1,24 @@
+Index: libreoffice-3.4.2/libreoffice-build/Makefile.am
+===================================================================
+--- libreoffice-3.4.2.orig/libreoffice-build/Makefile.am 2011-07-18 22:17:06.000000000 +0200
++++ libreoffice-3.4.2/libreoffice-build/Makefile.am 2011-08-31 14:11:45.000000000 +0200
+@@ -110,6 +110,7 @@
+ mkdir -p $(BUILDDIR)/man
+ mkdir -p $(BUILDDIR)/man/man1
+ mkdir -p $(OOBUILDDIR)
++ cp --archive "$(BUILDDIR)/../ext-human-updates/ooo_custom_images/" "$(OOBUILDDIR)/"
+ touch $@
+
+ build.tools : $(STAMP_DIR)/build.tools
+Index: libreoffice-3.4.2/libreoffice-build/Makefile.in
+===================================================================
+--- libreoffice-3.4.2.orig/libreoffice-build/Makefile.in 2011-08-31 14:20:30.013684993 +0200
++++ libreoffice-3.4.2/libreoffice-build/Makefile.in 2011-08-31 14:25:32.843688252 +0200
+@@ -907,6 +907,7 @@
+ mkdir -p $(BUILDDIR)/man
+ mkdir -p $(BUILDDIR)/man/man1
+ mkdir -p $(OOBUILDDIR)
++ cp --archive "$(BUILDDIR)/../../ext-human-updates/ooo_custom_images/" "$(OOBUILDDIR)/"
+ touch $@
+
+ build.tools : $(STAMP_DIR)/build.tools
diff --git a/patches/series b/patches/series
index fdc08b5..c7dfe3c 100644
--- a/patches/series
+++ b/patches/series
@@ -24,3 +24,4 @@ fdo35784.diff
ubuntufixes-core.diff
ubuntufixes-binfilter.diff
fix-libreoffice-build-configure-in.diff
+apply-ext-human-updates.diff
diff --git a/rules b/rules
index ee4186d..1bc3d9b 100755
--- a/rules
+++ b/rules
@@ -1831,7 +1831,6 @@ endif
build: $(STAMP_DIR)/build
$(STAMP_DIR)/build: $(OOO_BUILD_TREE)/config.status
dh_testdir
-
ifeq "$(BUILD_KDE)" "n"
# hack to tell we want crystal icons nevertheless and they should be
# extracted...
diff --git a/scripts/backport-human-fixes.sh b/scripts/backport-human-fixes.sh
new file mode 100755
index 0000000..4651bca
--- /dev/null
+++ b/scripts/backport-human-fixes.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# A short script to create an tarball with the updated ooo_custom_images/human icons for the 3.4 branch
+COREREPO=`readlink -f $1`
+OUTFILE=`readlink -f $2`
+`cd ${COREREPO} && git checkout e05ccb1672505c16825833ea628e2e82c6b544c0`
+TOUCHEDFILES=`cd ${COREREPO} && git diff --name-only libreoffice-3.4.2.3..e05ccb1672505c16825833ea628e2e82c6b544c0 -- ooo_custom_images/human`
+PACKDIR=`mktemp -d`
+for file in ${TOUCHEDFILES}
+do
+ mkdir -p `dirname ${PACKDIR}/ext-human-updates/${file}`
+ cp -p ${COREREPO}/${file} ${PACKDIR}/ext-human-updates/${file}
+done
+tar --create --gzip --verbose --file ${OUTFILE} --directory ${PACKDIR} .
+rm -rf ${PACKDIR}
--
LibreOffice packaging repository
Reply to: