------------------------------------------------------------
revno: 1784
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Wed 2010-01-27 02:51:25 +0100
message:
remove grep hack; use (include-blacklist) instead
modified:
changelog
rules
uno-libs3.symbols
=== modified file 'changelog'
--- a/changelog 2010-01-26 23:36:49 +0000
+++ b/changelog 2010-01-27 01:51:25 +0000
@@ -21,9 +21,11 @@
* debian/openoffice.org-common.tenplates,in, debian/rules, debian/po*: Move
debconf template to shared/openofficeorg-running (see #566644); Unfuzzy.
* debian/control.presenter.in: depend on (our) OOo 3.2
- * debian/control.in: Breaks: openoffice.org-presenter-console (<< 1.0.3~)
+ * debian/control.in: Breaks: openoffice.org-presenter-console (<< 1.0.3~)
+ * debian/uno-libs3.symbols: (ignore-blacklist) *...@private_1_0 and
+ *...@private_1_1
- -- Rene Engelhard <r...@debian.org> Wed, 27 Jan 2010 00:20:52 +0100
+ -- Rene Engelhard <r...@debian.org> Wed, 27 Jan 2010 02:40:27 +0100
openoffice.org (1:3.2.0~rc3-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2010-01-27 01:13:37 +0000
+++ b/rules 2010-01-27 01:51:25 +0000
@@ -3321,10 +3321,6 @@
dh_compress -s -X.py -X.mk -X.sxd
dh_makeshlibs -puno-libs3 -V"ure (>= $(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))" --
-c0
dh_makeshlibs -n -pure -V"ure (>= $(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))"
- # ugly hack, but why does that happen? It's not in .symbols...
- TMP=`mktemp -q`; \
- grep -v PRIVATE debian/uno-libs3/DEBIAN/symbols > $$TMP && \
- mv $$TMP debian/uno-libs3/DEBIAN/symbols
dh_installdeb -s
cp debian/shlibs.local.in debian/shlibs.local
ifeq "$(USE_SYSTEM_ICU)" "n"
=== modified file 'uno-libs3.symbols'
--- a/uno-libs3.symbols 2009-11-09 08:38:56 +0000
+++ b/uno-libs3.symbols 2010-01-27 01:51:25 +0000
@@ -11,6 +11,8 @@
*...@udk_3.4 1.4.0
*...@udk_3.5 1.4.0
libuno_sal.so.3 ure #MINVER#
+ (include-blacklist)*...@private_1_0
+ (include-blacklist)*...@private_1_1
*...@udk_3_0_0 1.4.0
*...@udk_3.1 1.4.0
*...@udk_3.2 1.4.0
