[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.3-3-9-g6ccea29
The following commit has been merged in the debian-experimental-3.5 branch:
commit 6ccea29136f6365253475cd2a959ca1e99df6768
Merge: 5ba64aaacbb74eab88be6015b663e5c4e4517c4b 680f50a33b3a0db52c6ce494734f53fee0a76724
Author: Rene Engelhard <rene@debian.org>
Date: Sun May 20 22:49:55 2012 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-3.5
diff --combined changelog
index ee46be0,2e50f43..9f0d146
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,10 +1,16 @@@
-libreoffice (1:3.5.3-4) UNRELEASED; urgency=low
++libreoffice (1:3.5.4~rc1-1) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - really disable -gcj package completely (not just empty package)
+
+ -- Rene Engelhard <rene@debian.org> Sun, 20 May 2012 14:20:49 +0200
+
+libreoffice (1:3.5.4~rc1-1) experimental; urgency=low
+
+ * new upstream release candidate
+
+ -- Rene Engelhard <rene@debian.org> Thu, 17 May 2012 23:24:57 +0200
+
libreoffice (1:3.5.3-3) unstable; urgency=low
[ Rene Engelhard ]
diff --combined rules
index 0a9a5e4,3ebb072..6dab6b4
--- a/rules
+++ b/rules
@@@ -69,9 -69,9 +69,9 @@@ USE_SOURCE_TARBALLS=
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=3.5.3.2
+lo_sources_ver=3.5.4.1
# NOT in proper libreoffice-3-5 branch
-# use ./g checkout -b tag-libreoffice-3.5.3.2 libreoffice-3.5.3.2
+# use ./g checkout -b tag-libreoffice-3.5.4.1 libreoffice-3.5.4.1
GIT_TAG=libreoffice-$(lo_sources_ver)
GIT_BRANCH=tag-libreoffice-$(lo_sources_ver)
endif
@@@ -1383,8 -1383,12 +1383,12 @@@ endi
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.ure.in
ifeq "$(ENABLE_JAVA)" "y"
+ ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
+ ifeq "$(BUILD_JARS_NATIVE)" "y"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.gcj.in
+ endif
+ endif
endif
ifneq "$(OOO_NSPLUGIN_ARCHS)" ""
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
--
LibreOffice packaging repository
Reply to: