------------------------------------------------------------ revno: 2342 committer: Rene Engelhard <r...@debian.org> branch nick: experimental timestamp: Mon 2011-01-24 01:42:05 +0100 message: error-out on control target if /usr/include/ldap_features.h is not existing modified: changelog control rules
=== modified file 'changelog' --- a/changelog 2011-01-24 00:10:57 +0000 +++ b/changelog 2011-01-24 00:42:05 +0000 @@ -9,11 +9,13 @@ various -style-* packages, thanks Matthias Klose for the pointer - really substitute ${PRODUCTNAME_BR} ${PRODUCTVERSION} in Name[pt_BR] (closes: #610345) + - error-out on control target if /usr/include/ldap_features.h is not + existing * debian/control.in - readd versioned ttf-opensymbol depends bogusly removed by - "Remove obsolete OOo versions in dependencies." (closes: #610917) + "Remove obsolete OOo versions in dependencies." (closes: #610917) - -- Rene Engelhard <r...@debian.org> Mon, 24 Jan 2011 01:06:01 +0100 + -- Rene Engelhard <r...@debian.org> Mon, 24 Jan 2011 00:34:34 +0000 libreoffice (1:3.3.0~rc4-1) experimental; urgency=low
=== modified file 'control' --- a/control 2011-01-24 00:10:57 +0000 +++ b/control 2011-01-24 00:42:05 +0000 @@ -59,7 +59,7 @@ * pstoedit / imagemagick: helper tools for EPS thumbnails * gstreamer0.10-plugins-*: GStreamer plugins for use with OOos media backend * libpaper-utils: papersize detection support via paperconf - * libldap--: LDAP client library; needed for OOo getting its profiles + * libldap-2.4-2: LDAP client library; needed for OOo getting its profiles from LDAP Package: libreoffice-l10n-za === modified file 'rules' --- a/rules 2011-01-21 01:10:13 +0000 +++ b/rules 2011-01-24 00:42:05 +0000 @@ -1352,6 +1352,16 @@ -e "s#@BUGS@#$(BUGS)#g" \ < debian/control.in > debian/control +ifeq "$(ENABLE_LDAP)" "y" + # build-depends might not be satified when running debian/rules control. prevent bad subsitition with + # nothing (libldap--) + if [ ! -f /usr/include/ldap_features.h ]; then \ + echo "/usr/include/ldap_features.h not found. Is libldap2-dev installed?"; \ + echo 'Needed for properly setting $$(LDAP_LIB). Stopping,'; \ + exit 1; \ + fi +endif + for LNUM in $(filter-out en-US,$(LANGPACKISOS)) ; do \ [ "$$LNUM" = en-US -a "$(PKGSOURCE)" = "libreoffice$(VER)-l10n" ] && continue; \ LNAME=`$(OOO_BUILD_TREE)/bin/openoffice-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \