[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.4_rc1-1-12-gee414d6
The following commit has been merged in the debian-experimental-3.6 branch:
commit ee414d69da2a038fd2eae8d250a5d97fecfa4405
Author: Rene Engelhard <rene@debian.org>
Date: Mon Nov 26 20:13:32 2012 +0100
fix changelog
diff --git a/changelog b/changelog
index 7b09788..4562527 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,8 @@ libreoffice (1:3.6.4~rc1-2) UNRELEASED; urgency=low
* debian/control.in:
- remove obsolete Pre-Depends on ure (>= 1.5.1+OOo3.1.1-15)
(by the way closes: #693626)
+ * debian/control.mozilla.in, debian/rules: rename
+ mozilla-libreoffice -> browser-plugin-libreoffice
-- Rene Engelhard <rene@debian.org> Mon, 19 Nov 2012 00:36:51 +0100
@@ -28,28 +30,14 @@ libreoffice (1:3.6.4~rc1-1) experimental; urgency=low
* debian/control.in:
- recommend fonts-liberation instead of ttf-liberation
(closes: #691949)
- * debian/control.mozilla.in, debian/rules: rename
- mozilla-libreoffice -> browser-plugin-libreoffice
* debian/libreoffice-core.bug-control:
- report-with: fonts-opensymbol instead of transitional ttf-opensymbol
* debian/libreoffice-{core,gtk3}.bug-script.in:
- find out whether we have Experimental features enabled
-<<<<<<< HEAD
-- Rene Engelhard <rene@debian.org> Fri, 16 Nov 2012 22:20:37 +0100
libreoffice (1:3.6.3~rc2-1) experimental; urgency=low
-=======
- -- Rene Engelhard <rene@debian.org> Sat, 24 Nov 2012 18:31:33 +0100
-
-libreoffice (1:3.5.4+dfsg-4) unstable; urgency=medium
-
- * debian/control.in:
- - remove obsolete Pre-Depends on ure (>= 1.5.1+OOo3.1.1-15)
- (by the way closes: #693626)
- * debian/libreoffice-core.bug-control:
- - report-with: fonts-opensymbol instead of transitional ttf-opensymbol
->>>>>>> origin/debian-experimental-3.5
* new upstream release candidate
--
LibreOffice packaging repository
Reply to: