The following commit has been merged in the master branch:
commit 87def2f2a7f870953f6eddb971d3ca941340599c
Author: Rene Engelhard <r...@debian.org>
Date: Tue Jun 12 16:40:05 2012 +0200
spelling-error-in-changelog reenable re-enable
diff --git a/changelog b/changelog
index 117013b..6f6380a 100644
--- a/changelog
+++ b/changelog
@@ -9,7 +9,7 @@ libreoffice (1:3.5.4-4) unstable; urgency=high
fixes for gbuild modules - and m68k ;)
* debian/rules:
- - reenable Base on armel/armhf; apparently also fixed by
+ - re-enable Base on armel/armhf; apparently also fixed by
yyinput-fix-for-unsigned-char.diff
- remove i386/amd64 special-casing, run junit checks on all archs
- remove obsolete rm -rf preventing -report-builders contents getting
@@ -27,7 +27,7 @@ libreoffice (1:3.5.4-3) unstable; urgency=medium
to fix smoketest
* debian/rules:
- - reenable extensions on s390(x)
+ - re-enable extensions on s390(x)
- actually enable evolution on s390x - and don't ship an empty package
if -evolution is disabled
@@ -64,7 +64,7 @@ libreoffice (1:3.5.4-1) unstable; urgency=medium
- exclude s390(x) from OOO_REPORTDESIGN_ARCH to not make "libreoffice"
depend on -report-builder-bin there as extensions (and also
-report-builder-bin) are disabled there.
- - reenable Base on powerpc et al. (closes: #667047)
+ - re-enable Base on powerpc et al. (closes: #667047)
* merge from Ubuntu:
- add control tags as per 'firefox distro add-on support'-spec
@@ -476,7 +476,7 @@ libreoffice (1:3.5.0~rc1-1) experimental; urgency=low
- switch to .xz tarballs, upstream will only provide those...
* merge from ubuntu-precise-3.5:
- - reenable junit tests
+ - re-enable junit tests
-- Rene Engelhard <r...@debian.org> Fri, 20 Jan 2012 10:19:36 +0000
@@ -2011,7 +2011,7 @@ openoffice.org (1:3.2.0-3) unstable; urgency=low
* debian/control.in: update Vcs-Bzr:
* debian/rules:
- build-depend on ant1.7 on gij-using archs (see #571532)
- - conditionalize armel build; reenable on lenny-backport - that still
+ - conditionalize armel build; re-enable on lenny-backport - that still
should work
- change build version to omit openoffice.org-core but mention ooo-build
release instead
@@ -2928,7 +2928,7 @@ openoffice.org (1:3.1.0~rc1-2) experimental; urgency=low
unopkg calls (closes: #523044)
* debian/control.in, debian/control.ogltrans.in, debian/rules:
OOo is fixed to not crash when OGLTrans.uno.so is not there anymore,
- reenable splitout to -ogltrans
+ re-enable splitout to -ogltrans
-- Rene Engelhard <r...@debian.org> Fri, 10 Apr 2009 13:35:28 +0200
@@ -3043,7 +3043,7 @@ openoffice.org (1:3.1.0~ooo310m6-1) experimental;
urgency=low
- only specify --with-lang= when we don't only build en-US. en-US is
default anyway and not specifying --with-lang=en-US afais speeds up the
en-US only build even more
- - OGLTrans seems to work now in sid (even for amd64), so reenable
+ - OGLTrans seems to work now in sid (even for amd64), so re-enable
(closes: #517335)r
- update pentaho libs (build-)depends to the -OOo31 versions
- enable ca and fi help
@@ -3126,7 +3126,7 @@ openoffice.org (1:3.0.1-4) unstable; urgency=low
- update (r15428)
* debian/rules
- MONO2=y (closes: #517738)
- - reenable lsb_release -cs call and build-conflict against base-files = 5
+ - re-enable lsb_release -cs call and build-conflict against base-files = 5
for sid
* debian/control.in:
- make -core conflict against < OOo3 -java-common (closes: #517001)
@@ -3439,7 +3439,7 @@ openoffice.org (1:3.0.0~rc3-1) experimental; urgency=high
- src: update GSIs (et ga ku sk)
* debian/rules:
- remove extraneous LICENSE file again
- - reenable Mono packages
+ - re-enable Mono packages
- oops, remove $TMPD in get-orig-source
* debian/openoffice.org-report-builder-bin.overrides.lintian: fix
* debian/control.in:
@@ -3466,7 +3466,7 @@ openoffice.org (1:3.0.0~rc2-1) experimental; urgency=high
- src: update GSIs
* debian/rules:
- fix USE_SCSOLVER conditional
- - reenable hu
+ - re-enable hu
- HELP_L10N_VIRTUAL_VERSION:=3.0
- various conditional updates for new extension configure defaults
- --with-java-target-version=1.5 for builds with openjdk/cacao-oj6
@@ -3532,7 +3532,7 @@ openoffice.org (1:3.0.0~ooo300m3-1) experimental;
urgency=low
- Add SYSTEM_LUCENE conditional, disable it yet as liblucene2-java is
in contrib
- Add SYSTEM_REDLAND conditional
- - reenable the SDK
+ - re-enable the SDK
- enable mn (Mongolian); build all languages again (except hu which is
broken and just contains Swedish right now)
- build against kde4
@@ -3695,7 +3695,7 @@ openoffice.org (1:2.4.1-5) unstable; urgency=medium
* ooo-build:
- update (13085)
* debian/rules:
- - reenable Java for armel, gcj-4.3 OOM reportedly fixed. Add build-dep
+ - re-enable Java for armel, gcj-4.3 OOM reportedly fixed. Add build-dep
on gcj-4,3 (>= 4.3.1-2) for armel
* debian/rules, debian/control.mono.in, debian/*.installcligac: split
cli_*dll in various subpackages to make the packages CLI policy compliant.
@@ -3718,10 +3718,10 @@ openoffice.org (1:2.4.1-4) unstable; urgency=medium
+ update (r12994)
+ sw-field-patch-fix-competing-protection.diff: for the competing
protection problem from n#400884 (really closes: #477653)
- + distro-configs/Common.conf.in: randr reenabled per default
+ + distro-configs/Common.conf.in: randr re-enabled per default
* debian/rules:
- - reenable randr
- - reenable mono, mono seems to be fixed on amd64
+ - re-enable randr
+ - re-enable mono, mono seems to be fixed on amd64
* debian/control.in:
- make openoffice.org metapackage depend on ttf-liberation. Remove
msttcorefonts suggestion.
@@ -3740,7 +3740,7 @@ openoffice.org (1:2.4.1-3) unstable; urgency=medium
API
+ distro-configs/Common.conf.in: --disable-randr (closes: #485833)
* debian/rules:
- + reenable mozilla plugin for 64bit archs
+ + re-enable mozilla plugin for 64bit archs
+ add ENABLE_RANDR conditional, remove libxrandr2 Recommends:
-- Rene Engelhard <r...@debian.org> Fri, 13 Jun 2008 23:41:39 +0200
@@ -3800,7 +3800,7 @@ openoffice.org (1:2.4.1~rc1-1) experimental; urgency=low
Most probably also closes: #454996
* debian/rules:
- we also need to build-depend on libnss3-dev (closes: #481996)
- - reenable system-icu for etch backports
+ - re-enable system-icu for etch backports
- add get-orig-source target
- remove overseen $(OOO_ARCHS); make control/maintscripts depend on all
.ins for it (removes duplicate contro.gcj.in). Thanks Chris Cheney
@@ -3913,7 +3913,7 @@ openoffice.org (1:2.4.0-4) unstable; urgency=medium
python-central >= 0.6 (closes: #475987)
- bump libstlport4.6-dev builddep to ensure building against
libstlport4.6ldbl
- - reenable system-hunspell
+ - re-enable system-hunspell
- bump libhyphen0 dep to 2.3-1-3
- set MOZILLA= when arch not in OOO_MOZILLA_ARCHS
- fix OOO_OGLTRANS_ARCHS conditional
@@ -4318,7 +4318,7 @@ openoffice.org (1:2.3.1-1) unstable; urgency=low
* debian/rules:
- add $(OOO_ARCHS) to the mesa builddeps
- fix build with new dpkg-dev
- - reenable cy langpack
+ - re-enable cy langpack
- build against libhyphen-dev which contains a shared lib for ATLinuxhyph
now
* debian/rules, debian/aotcompile-256M-default.diff: work around
@@ -4390,12 +4390,12 @@ openoffice.org (1:2.3.0.dfsg-1) unstable; urgency=low
* debian/rules:
- since 2.3.0 final we need --enable-dbus explicitely
- remove obsolete glitz build-dep
- - reenable -gcj (closes: #449201) and bump build-dep on
+ - re-enable -gcj (closes: #449201) and bump build-dep on
java-gcj-compat-dev for this
- fix logic error preventing mozilla-openoffice.org having
real content, oops (closes: #449528)
- use system jfreereport libs
- - reenable ar langpack
+ - re-enable ar langpack
- add libfontconfig1-dbg to DBG_DBG_SUGGESTS
- Adapt for STLport5 patchset not applied anymore. Remove STLport5
support.
@@ -4711,7 +4711,7 @@ openoffice.org (2.3.0~src680m224-1) experimental;
urgency=high
* debian/rules:
- update for 2.3 [RE]
- add ppc64 test-wise [RE]
- - reenable mr-IN since now fixed [RE]
+ - re-enable mr-IN since now fixed [RE]
- build-depend on libneon26 again, got fixed and is the only supported
version since m219 anyway [RE]
- add conditional for system-libsvg, enable it for sid/experimental [RE]
@@ -4732,7 +4732,7 @@ openoffice.org (2.3.0~src680m224-1) experimental;
urgency=high
statement for the "Sun removal") [RE]
- migrate to graphicsmagick as convert from imagemagick (at least etchs)
does create a broken BMP out of the Sun logo removal step.. [RE]
- - reenable km again due to demand of the Khmer people... [RE]
+ - re-enable km again due to demand of the Khmer people... [RE]
- uuencode all ooo-build/desktop icons [CC]
- add USE_SYSTEM_VIGRA conditional, enable it [RE]
- install *updchk* again, as the extension manager UI now apparently
@@ -4782,7 +4782,7 @@ openoffice.org (2.2.1-7) unstable; urgency=low
- debian/rules:
+ fix some stuff for etch backports
+ suggest libc*-dbg
- + reenable km again due to demand of the Khmer people...
+ + re-enable km again due to demand of the Khmer people...
- debian/*.mime: move Star* into a -filter-binfilter.mime [RE]
* debian/control.in:
- add build-conflicts against
@@ -5419,7 +5419,7 @@ openoffice.org (2.1~m190-1) experimental; urgency=low
- stop depending on libxt-java at -java-common; unneeded and xt.jar is
removed from the installset
- update for SRC680/ooo-build changes (ooqstart, pch)
- - reenable -dbg; use -g1, though
+ - re-enable -dbg; use -g1, though
* merge from
d...@ubuntu.com--2006-pkg-openoffice/openofficeorg--unstable--2.0.4:
- patch-38/40: Split out the four style files into their own packages.
@@ -5524,7 +5524,7 @@ openoffice.org (2.0.4-6) unstable; urgency=medium
* ooo-build:
- update
+ new sk,cs translations
- + distro-configs/Debian*conf.in: reenable --with-system-odbc-headers to
+ + distro-configs/Debian*conf.in: re-enable --with-system-odbc-headers to
actually build with the headers from system... (somewhen/-how got lost)
* ooo-build/src:
- add uk GSI from upstream IZ
@@ -5532,7 +5532,7 @@ openoffice.org (2.0.4-6) unstable; urgency=medium
- add uk (ukrainian)
* debian/rules:
- enable uk langpack
- - reenable build with system-boost again, works now
+ - re-enable build with system-boost again, works now
* debian/*.mime:
- use e.g. "soffice -writer" instead of "oowriter" since ooowriter returns
immediately with ooqstart and this breaks e.g. mutt. (closes: #396276)
@@ -5540,7 +5540,7 @@ openoffice.org (2.0.4-6) unstable; urgency=medium
+ add metapackages (l10n-in and -l10n-za for all Indic/South African
languages)
+ add some missing VERs
- + reenable -dbg; use -g1, though
+ + re-enable -dbg; use -g1, though
+ sort ISOS/LANGPACKISOS again
-- Rene Engelhard <r...@debian.org> Fri, 3 Nov 2006 22:40:49 +0100
@@ -5796,7 +5796,7 @@ openoffice.org (2.0.4~ood680m2-2) experimental;
urgency=low
stuff using it use -lstlport instead of -lstlport_gcc
- move qstart.desktop into -gtk (as ooqstart is in -core, and libegg* in
-gtk..)
- - reenable Java on amd64, seems to work on current amd64/sid now
+ - re-enable Java on amd64, seems to work on current amd64/sid now
* debian/openoffice.org-core.manpages: remove, bogus
-- Rene Engelhard <r...@debian.org> Sun, 3 Sep 2006 22:57:05 +0200
@@ -6058,7 +6058,7 @@ openoffice.org (2.0.3-3) unstable; urgency=low
fix g++ 3.3 build
* debian/rules:
- fix ibm JDK build-dep
- - reenable system-neon
+ - re-enable system-neon
- build unowinreg.dll using i586-mingw32msvc-gcc and install it
(closes: #377531); build-depend on mingw32
- run dh_makeshlibs using -n to not get useless ldconfig calls, thanks
@@ -6202,7 +6202,7 @@ openoffice.org (2.0.2.99.2.0.3rc6-1) unstable;
urgency=medium
broken... [RE]
- create libjava_uno -> libjava_uno.so link, again something like that
*sigh*. Should find out the root cause... [RE]
- - reenable lo langpack [RE]
+ - re-enable lo langpack [RE]
- cleanup conditionals, split definitions and tests, distro- and
arch-specific stuff [CH, RE]
- fix typo in makebinariestar, thanks Joo Martin [RE]
@@ -6542,7 +6542,7 @@ openoffice.org (2.0.1-2) unstable; urgency=low
.diff.gz...
- move libeggtray* and libqstart_gtk* into the right package (-gnome
instead of -kde; they were in the wrong loop, oops)
- - reenable hunspell and the binfilters
+ - re-enable hunspell and the binfilters
- Suggest locales (>= 2.3.5-12) | belocs-locales-data for km and sr-cs
instead of only belocs-locales-data since 2.3.5-12 apparently added
km_KH and sr-CS support.
@@ -6602,7 +6602,7 @@ openoffice.org (2.0.0+2.0.1rc4-1) experimental;
urgency=low
- bump hunspell package version number to 1.2-x since we need to get
bigger and the 1.1 we have is functionally identical to 1.1. Temporary
disable -hunspell because we'd need a epoch when we upload a rc to
- experimental and then to unstable. Avoid that, and reenable -hunspell
+ experimental and then to unstable. Avoid that, and re-enable -hunspell
when we upload 2.0.1 final.
-- Rene Engelhard <r...@debian.org> Fri, 9 Dec 2005 15:36:06 +0100
@@ -6888,7 +6888,7 @@ openoffice.org2 (1.9.125-1) experimental; urgency=low
- some conditional cleanup for Ubuntu, add BUILD_AMD64 conditional
- fix typo in opens___.ttf installing
- uncomment LD_ASSUME_KERNEL call, was uncommented for testing and then
- not reenabled again....
+ not re-enabled again....
- the mono support is now enabled per default in ooo-build; disable it
(still needs the .dll's from the OOo windows installset)
- build hicontrast iconset
@@ -7177,7 +7177,7 @@ openoffice.org2 (1.9.108-1) experimental; urgency=low
- --enable-pasf --with-system-sndfile
- --enable-openldap, build LDAP backend with OpenLDAP, not Mozilla
- --enable-binfilter
- - reenable --with-system-altlinuxhyph
+ - re-enable --with-system-altlinuxhyph
- use --enable-symbols
- --with-system-boost
* build with java, use gij/gcj.
--
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/e1sezpk-0005sp...@vasks.debian.org
