[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4-1-167-ga0a31cd
The following commit has been merged in the debian-experimental-4.0 branch:
commit a0a31cde1d4a2cc0143f18a7549b7b1b5776cb3a
Author: Rene Engelhard <rene@debian.org>
Date: Fri Dec 7 15:34:56 2012 +0100
pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff is also upstream...
diff --git a/patches/pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff b/patches/pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
deleted file mode 100644
index d291625..0000000
--- a/patches/pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From 6b1d19a3242353d84afeec1f0a798a95c851459d Mon Sep 17 00:00:00 2001
-From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
-Date: Tue, 21 Feb 2012 13:43:04 +0100
-Subject: [PATCH] pythonloader.uno.so, libpyuno and pyuno are duplicates for
- linkoo too
-
----
- solenv/bin/linkoo | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
-index 06a103d..450da5a 100755
---- a/solenv/bin/linkoo
-+++ b/solenv/bin/linkoo
-@@ -137,7 +137,7 @@
-
- my @search_dirs = ( 'lib', 'bin', 'class' );
-
--my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm', 'libsqlite3', 'libnssutil3', 'pythonloader.uno', 'pyuno', 'libpyuno' );
-+my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm', 'libsqlite3', 'libnssutil3', 'pythonloader.uno', 'pyuno', 'libpyuno', 'pythonloader.uno', 'pyuno', 'libpyuno' );
-
- sub sniff_target($)
- {
diff --git a/patches/series b/patches/series
index 321d4cb..874b44c 100644
--- a/patches/series
+++ b/patches/series
@@ -19,7 +19,6 @@ make-pyuno-work-with-system-wide-module-install.diff
#search-usr-share-for-images.diff
make-package-modules-not-suck.diff
mediwiki-oor-replace.diff
-pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
debian-hardened-buildflags.diff
gtk3-hack-explicit-gmodule.diff
py2uno-module.diff
--
LibreOffice packaging repository
Reply to: