The following commit has been merged in the debian-experimental-3.5 branch:
commit 4027a5a00f6f6110aa4b39e8904edfbdb2e79b68
Merge: 18565db7cb7452c596960b40fff62768439d8cb5
426304aaf79667e7befa9559d5f428e028e5d513
Author: Rene Engelhard <r...@debian.org>
Date: Fri Apr 20 01:04:53 2012 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-3.5
diff --combined changelog
index 068c7ef,fc7aa4d..ae54cd8
--- a/changelog
+++ b/changelog
@@@ -1,20 -1,16 +1,22 @@@
+libreoffice (1:3.5.3~rc1-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
+
+ -- Rene Engelhard <r...@debian.org> Mon, 16 Apr 2012 09:59:51 +0200
+
libreoffice (1:3.5.2-5) UNRELEASED; urgency=low
[ Rene Engelhard ]
- * debian/patches/db5.3.diff: add 5.3 to checked db versions
* debian/rules:
- build-depend on new g++-mingw-w64-i686 instead of the whole thing
+ * debian/libreoffice-common.links: move ...
+ * debian/libreoffice-common.links.in: ... here again as we need to
+ subsitute @OODIR@ (closes: #669138)
[ Björn Michaelsen ]
* add visio mimetype to libreoffice draw desktop file
- -- Rene Engelhard <r...@debian.org> Mon, 16 Apr 2012 09:02:21 +0200
+ -- Rene Engelhard <r...@debian.org> Fri, 20 Apr 2012 00:57:45 +0200
libreoffice (1:3.5.2-4) unstable; urgency=medium
diff --combined rules
index 11c17dd,03a6bcc..eb3bd2e
--- a/rules
+++ b/rules
@@@ -63,9 -63,9 +63,9 @@@ export QUILT_OPTIONS="-p1 -F0
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
# NOT in proper libreoffice-3-5 branch
-# use ./g checkout -b tag-libreoffice-3.5.2.2 libreoffice-3.5.2.2
-GIT_TAG=libreoffice-3.5.2.2
-GIT_BRANCH=tag-libreoffice-3.5.2.2
+# use ./g checkout -b tag-libreoffice-3.5.3.1 libreoffice-3.5.3.1
+GIT_TAG=libreoffice-3.5.3.1
+GIT_BRANCH=tag-libreoffice-3.5.3.1
SOURCE_TREE=.
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/src
@@@ -1223,7 -1223,7 +1223,7 @@@ endi
# Files created in debian directory
$(MAKE) -f debian/rules clean-debdir
- find debian -name "*.links" ! -name "libreoffice-common*.links" -exec
rm {} \;
+ find debian -name "*.links" -exec rm {} \;
if [ -d "$(STAMP_DIR)" ]; then rm -rf "$(STAMP_DIR)"; fi
rm -f debian/shlibs.override.stdlibs
rm -f debian/*.bug-script
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sl0pl-0003oq...@vasks.debian.org
