diff -u libtrash-2.4/debian/changelog libtrash-2.4/debian/changelog --- libtrash-2.4/debian/changelog +++ libtrash-2.4/debian/changelog @@ -1,3 +1,14 @@ +libtrash (2.4-2ubuntu1) intrepid; urgency=low + + * debian/: + - {example.bash_profile,README.Debian}: Use the correct filename + to avoid confusion (LP: #110374). We don't use a symlink (that + approach is incorrect and reserved, generally, for -dev + packages); + - control: Adhere to DebianMaintainerField. + + -- Daniel T Chen Tue, 07 Oct 2008 16:54:30 -0400 + libtrash (2.4-2) unstable; urgency=medium * Applied patch from Mike Hommey to fix consistent SEGV diff -u libtrash-2.4/debian/control libtrash-2.4/debian/control --- libtrash-2.4/debian/control +++ libtrash-2.4/debian/control @@ -1,7 +1,8 @@ Source: libtrash Section: admin Priority: optional -Maintainer: Jose Luis Tallon +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Jose Luis Tallon Build-Depends: debhelper (>= 4.2.0) Standards-Version: 3.8.0 Homepage: http://pages.stern.nyu.edu/~marriaga/software/libtrash diff -u libtrash-2.4/debian/README.Debian libtrash-2.4/debian/README.Debian --- libtrash-2.4/debian/README.Debian +++ libtrash-2.4/debian/README.Debian @@ -5,7 +5,7 @@ application is run. This can be done by setting the LD_PRELOAD environment variable: -$ LD_PRELOAD=/usr/lib/libtrash/libtrash.so +$ LD_PRELOAD=/usr/lib/libtrash/libtrash.so.2.4 $ export LD_PRELOAD This will mean that all applications that are started from the shell after @@ -13,12 +13,12 @@ the shell you originally set the LD_PRELOAD variable from will not be using libtrash, ie: -$ export LD_PRELOAD=/usr/lib/libtrash/libtrash.so +$ export LD_PRELOAD=/usr/lib/libtrash/libtrash.so.2.4 $ rm my_file will be OK, but: -$ export LD_PRELOAD=/usr/lib/libtrash/libtrash.so +$ export LD_PRELOAD=/usr/lib/libtrash/libtrash.so.2.4 $ echo "asdf" > my_file will overwrite "my_file" with "asdf", as the shell (which isn't using libtrash) @@ -27,7 +27,7 @@ re-starting the shell in your ~/.bash_profile with something like the following (this could be dangerous, however): -LIBTRASH=/usr/lib/libtrash/libtrash.so +LIBTRASH=/usr/lib/libtrash/libtrash.so.2.4 LIBTRASH_dest=$LIBTRASH if test -L $LIBTRASH ; then LIBTRASH_dest="$(dirname $LIBTRASH)/$(ls -l "$LIBTRASH" | \ diff -u libtrash-2.4/debian/example.bash_profile libtrash-2.4/debian/example.bash_profile --- libtrash-2.4/debian/example.bash_profile +++ libtrash-2.4/debian/example.bash_profile @@ -1,6 +1,6 @@ # Include this in your ~/.bash_profile to enable libtrash every time you # log in (or otherwise start a login shell) -LIBTRASH=/usr/lib/libtrash/libtrash.so +LIBTRASH=/usr/lib/libtrash/libtrash.so.2.4 LIBTRASH_dest=$LIBTRASH if test -L $LIBTRASH ; then