./packages/openofficeorg/3.2/unstable r1966: libc0.1 2.10.2-7 is also not working, revert (build-)dep changes until ready, stop closing #578023
------------------------------------------------------------
revno: 1966
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Mon 2010-04-26 15:01:19 +0200
message:
libc0.1 2.10.2-7 is also not working, revert (build-)dep changes until ready, stop closing #578023
removed:
shlibs.override.libc
modified:
changelog
control.in
rules
=== modified file 'changelog'
--- a/changelog 2010-04-26 09:44:11 +0000
+++ b/changelog 2010-04-26 13:01:19 +0000
@@ -1,12 +1,10 @@
openoffice.org (1:3.2.0-9) UNRELEASED; urgency=low
* debian/patches/cws-kfreebsdport01v2.diff: add kFreeBSD port patches,
- thanks Petr Salinger (closes: #578023)
+ thanks Petr Salinger
* patches/fix-localized-filenames.diff: backport fix from upstream to
fix the "localized" names of the extras when the en-US version is used
- * debian/control*.in:
- - Build-Depends: libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64]
* debian/rules:
- fix langpacks target to actually remove extra LICENSE* and README*
files again
@@ -14,7 +12,6 @@
- fix es translation for SC_OPCODE_SUBSTITUTE, thanks Margarita Manterola
(closes: #578767)
* debian/scripts/vars.kfreebsd-*: add PLATFORMID
- * debian/shlibs.override.libc: force libc0.1 dependency to (>= 2.10.2-7)
* debian/control.in, debian/rules: use textcat data from
libtextcat-data-utf8 if the same with "ours"
* merge from Ubuntu:
=== modified file 'control.in'
--- a/control.in 2010-04-26 09:44:11 +0000
+++ b/control.in 2010-04-26 13:01:19 +0000
@@ -17,7 +17,6 @@
libfontconfig1-dev,
binutils (>= 2.14.90.0.6-3) [sparc],
libc6 (>= 2.3.2) [powerpc],
- libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
zlib1g-dev,
libfreetype6-dev,
libx11-dev,
=== modified file 'rules'
--- a/rules 2010-04-26 09:44:11 +0000
+++ b/rules 2010-04-26 13:01:19 +0000
@@ -3529,9 +3529,6 @@
mv $$TMP debian/uno-libs3/DEBIAN/symbols && \
chmod 644 debian/uno-libs3/DEBIAN/symbols
dh_installdeb -s
-ifeq "$(BUILD_KFREEBSD)" "y"
- cat debian/shlibs.override.libc >> debian/shlibs.local
-endif
ifeq "$(USE_SYSTEM_ICU)" "n"
cat debian/shlibs.override.icu >> debian/shlibs.local
endif
=== removed file 'shlibs.override.libc'
--- a/shlibs.override.libc 2010-04-18 12:30:09 +0000
+++ b/shlibs.override.libc 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-libc 0.1 libc0.1 (>= 2.10.2-7)
Reply to: