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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. 828228e9a6c1462c2838184f826c327936e3cfaf



The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 828228e9a6c1462c2838184f826c327936e3cfaf
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Jun 15 00:46:32 2011 +0200

    remove NetBook -> Netbook fix, upstream

diff --git a/changelog b/changelog
index ff1e836..d0ade89 100644
--- a/changelog
+++ b/changelog
@@ -5,7 +5,7 @@ libreoffice (1:3.4.0-1) UNRELEASED; urgency=low
       (closes: #617596)
     - should fix embedding of (some) fonts in PDFs (closes: #616117)
     - (still) use libreoffice-build for now; not tagged,
-      use 2b9bd812b1f3a335194f2f1679e5a4d92725dd73
+      use fa53eff3b6bee370e65a5e42767f83b35e1bc5af
       - disables optional-outplace-ole.diff; fixes toolbars in Base when
         creating/editing forms (closes: #617319)
 
@@ -43,7 +43,7 @@ libreoffice (1:3.4.0-1) UNRELEASED; urgency=low
   * debian/patches/jurt-soffice-location.diff: add the fallback
     /usr/lib/libreoffice/program/soffice to jurts NativeLibraryLoader;
 
- -- Rene Engelhard <rene@debian.org>  Tue, 14 Jun 2011 01:24:58 +0200
+ -- Rene Engelhard <rene@debian.org>  Wed, 15 Jun 2011 00:45:49 +0200
 
 libreoffice (1:3.3.2-4) unstable; urgency=low
 
diff --git a/patches/buildfix-patches.diff b/patches/buildfix-patches.diff
index 1773c1a..6e33472 100644
--- a/patches/buildfix-patches.diff
+++ b/patches/buildfix-patches.diff
@@ -2,15 +2,6 @@ diff --git a/patches/dev300/apply b/patches/dev300/apply
 index dd51188..bc5cf54 100644
 --- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply
 +++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply
-@@ -28,7 +28,7 @@
- Experimental: VBAUntested, ArkOnlyExperimental, \
- 	      UnUsedButNotYetRemovedFromGit, WebDAV, \
- 	      PostgreSQL, RadioButtons, WWInProgress, \
--	      KDE4Experimental, MinGW, NetBook, \
-+	      KDE4Experimental, MinGW, Netbook, \
- 	      CrossWin32Patches, AutoLayout, \
- 	      Speed, GSoC2010, Toolbars, Win32Packaging
- DebianLooseSections: DebianBaseNoHelpContent
 @@ -148,7 +148,7 @@
  # don't lstat() that much while creating absolute URLs - breaks unopkg
  # run as e.g. used during Mac dmg generation, as parts of the

-- 
LibreOffice packaging repository


Reply to: