diff -Nru d-shlibs-0.47/debian/changelog d-shlibs-0.47ma1/debian/changelog --- d-shlibs-0.47/debian/changelog 2011-07-15 11:25:54.000000000 +0000 +++ d-shlibs-0.47ma1/debian/changelog 2012-01-24 16:35:55.000000000 +0000 @@ -1,3 +1,9 @@ +d-shlibs (0.47ma1) oneiric; urgency=low + + * Add environment variabl to specify libdir. + + -- Michal Suchanek Tue, 24 Jan 2012 17:35:28 +0100 + d-shlibs (0.47) unstable; urgency=low * Fix typo in armel-specific ld-linux3-dev suppression. diff -Nru d-shlibs-0.47/d-shlibmove d-shlibs-0.47ma1/d-shlibmove --- d-shlibs-0.47/d-shlibmove 2011-07-02 13:44:26.000000000 +0000 +++ d-shlibs-0.47ma1/d-shlibmove 2012-01-24 16:58:13.000000000 +0000 @@ -24,6 +24,11 @@ set -e set -o pipefail +if [ -z "$libdir" ] ; then + libdir=usr/lib +fi +libdir_q="$(echo "$libdir" | sed -e s,/,\\\\/,)" + function getname () { local SONAMELIBNAME local SONAMEVERSION @@ -118,11 +123,11 @@ --extralib) readlibnameinfo "$2" DEVLIB_TO_CHECK="${DEVLIB_TO_CHECK} $2" - echo "$(dirname $2)/${PK}.a usr/lib" >> "${INSTALLFILE_DEVPKG}" - echo "$(dirname $2)/${PK}.la usr/lib || true" >> "${INSTALLFILE_DEVPKG}" - echo "$(dirname $2)/${PK}.so usr/lib" >> "${INSTALLFILE_DEVPKG}" - echo "$(dirname ${REALSO})/${SONAME} usr/lib" >> "${INSTALLFILE_SHLPKG}" - echo "${REALSO} usr/lib" >> "${INSTALLFILE_SHLPKG}" + echo "$(dirname $2)/${PK}.a '$libdir'" >> "${INSTALLFILE_DEVPKG}" + echo "$(dirname $2)/${PK}.la '$libdir' || true" >> "${INSTALLFILE_DEVPKG}" + echo "$(dirname $2)/${PK}.so '$libdir'" >> "${INSTALLFILE_DEVPKG}" + echo "$(dirname ${REALSO})/${SONAME} '$libdir'" >> "${INSTALLFILE_SHLPKG}" + echo "${REALSO} '$libdir'" >> "${INSTALLFILE_SHLPKG}" shift; shift; ;; @@ -186,15 +191,15 @@ PKGSHL="${SONAMEPKGNAME}${SUFFIX}${TRANSITIONSUFFIX}" INSTALLDIR="install -d -m 755 " -echo "${INSTALLDIR} debian/${PKGDEV}/usr/lib" >> "$execscript" -echo "${INSTALLDIR} debian/${PKGSHL}/usr/lib" >> "$execscript" -echo "mv $(dirname $1)/${PK}.a debian/${PKGDEV}/usr/lib" >> "$execscript" +echo "${INSTALLDIR} debian/${PKGDEV}/'$libdir'" >> "$execscript" +echo "${INSTALLDIR} debian/${PKGSHL}/'$libdir'" >> "$execscript" +echo "mv $(dirname $1)/${PK}.a debian/${PKGDEV}/'$libdir'" >> "$execscript" if [ "${INCLUDELA}" = "yes" ]; then - echo "mv $(dirname $1)/${PK}.la debian/${PKGDEV}/usr/lib || true" >> "$execscript" + echo "mv $(dirname $1)/${PK}.la debian/${PKGDEV}/'$libdir'" >> "$execscript" fi -echo "mv $(dirname $1)/${PK}.so debian/${PKGDEV}/usr/lib" >> "$execscript" -echo "mv $(dirname ${REALSO})/${SONAME} debian/${PKGSHL}/usr/lib" >> "$execscript" -echo "mv ${REALSO} debian/${PKGSHL}/usr/lib" >> "$execscript" +echo "mv $(dirname $1)/${PK}.so debian/${PKGDEV}/'$libdir'" >> "$execscript" +echo "mv $(dirname ${REALSO})/${SONAME} debian/${PKGSHL}/'$libdir'" >> "$execscript" +echo "mv ${REALSO} debian/${PKGSHL}/'$libdir'" >> "$execscript" if [ -n "${SHLIBSLOCALVER}" ]; then echo "echo \"${SONAMELIBNAME} ${SONAMEVERSION} ${PKGSHL} (>= ${SHLIBSLOCALVER})\" >> debian/shlibs.local" >> "$execscript" @@ -212,7 +217,7 @@ echo "mv ${A} debian/${PKGSHL}/${B}" >> "${execscript}" done if [ "${INCLUDELA}" = "no" ]; then - sed -i -e "/^.*\.la usr\/lib || true$/d" "${INSTALLFILE_DEVPKG}" + sed -i -e "/^.*\.la $libdir_q || true$/d" "${INSTALLFILE_DEVPKG}" fi cat "${INSTALLFILE_DEVPKG}" | while read A B; do echo "${INSTALLDIR} debian/${PKGDEV}/${B}" >> "${execscript}" diff -Nru d-shlibs-0.47/d-shlibmove.1 d-shlibs-0.47ma1/d-shlibmove.1 --- d-shlibs-0.47/d-shlibmove.1 2011-06-10 01:03:45.000000000 +0000 +++ d-shlibs-0.47ma1/d-shlibmove.1 2012-01-24 16:46:13.000000000 +0000 @@ -138,12 +138,18 @@ Return 0 on success. +.SH "ENVIRONMENT" + +libdir -- the directory containing libraries. Used without the leading slash. Default: usr/lib + +Added in version 0.47ma1 + .SH "EXAMPLES" The following is a sample command-line of a hypothetical package installation. -.B "d-shlibmove --commit --movedev ""debian/tmp/usr/include/*"" usr/include --extralib debian/tmp/usr/lib/libhomeman-pthread.so debian/tmp/usr/lib/libhomeman.so" +.B "libdir=usr/lib/x86_64-linux-gnu d-shlibmove --commit --movedev ""debian/tmp/usr/include/*"" usr/include --extralib debian/tmp/usr/lib/libhomeman-pthread.so debian/tmp/usr/lib/libhomeman.so" .SH "AUTHOR" Junichi Uekawa