--- checkinstall-1.6.1.orig/README +++ checkinstall-1.6.1/README @@ -343,7 +343,7 @@ The variable declaration section in the checkinstall script has been removed, you should now edit the checkinstallrc file, normally installed under - /usr/local/lib/checkinstall. + /usr/local/lib/checkinstall (/etc in this Debian package). In the checkinstallrc file you will find some variables wich modify --- checkinstall-1.6.1.orig/installwatch-0.7.0beta5/Makefile +++ checkinstall-1.6.1/installwatch-0.7.0beta5/Makefile @@ -30,7 +30,7 @@ if [ -r $(LIBDIR)/installwatch.so ]; then \ rm -f $(LIBDIR)/installwatch.so; \ fi - install -s installwatch.so $(LIBDIR) + install installwatch.so $(LIBDIR) sed -e "s|#PREFIX#|$(PREFIX)|" < installwatch > $(BINDIR)/installwatch chmod 755 $(BINDIR)/installwatch --- checkinstall-1.6.1.orig/installwatch-0.7.0beta5/installwatch.c +++ checkinstall-1.6.1/installwatch-0.7.0beta5/installwatch.c @@ -44,6 +44,13 @@ #include #include +/* There's no d_off on GNU/kFreeBSD */ +#if defined(__FreeBSD_kernel__) +#define D_OFF(X) (-1) +#else +#define D_OFF(X) (X) +#endif + #include "localdecls.h" #define DEBUG 1 @@ -77,7 +84,7 @@ static int (*true_open)(const char *, int, ...); static DIR *(*true_opendir)(const char *); static struct dirent *(*true_readdir)(DIR *dir); -static int (*true_readlink)(const char*,char *,size_t); +static ssize_t (*true_readlink)(const char*,char *,size_t); static char *(*true_realpath)(const char *,char *); static int (*true_rename)(const char *, const char *); static int (*true_rmdir)(const char *); @@ -539,7 +546,7 @@ struct utimbuf timbuf; size_t truesz; char linkpath[PATH_MAX+1]; - size_t linksz; + ssize_t linksz; #if DEBUG debug(2,"copy_path(%s,%s)\n",truepath,translroot); @@ -738,7 +745,7 @@ char nwork[PATH_MAX+1]; char nsuffix[PATH_MAX+1]; char lnkpath[PATH_MAX+1]; - size_t lnksz=0; + ssize_t lnksz=0; string_t *pthis=NULL; string_t *list1=NULL; string_t *list2=NULL; @@ -848,7 +855,7 @@ "\td_name : \"%.*s\"\n", entry, entry->d_ino, - entry->d_off, + D_OFF(entry->d_off), entry->d_reclen, (int)entry->d_type, (int)entry->d_reclen,(char*)(entry->d_name) @@ -872,7 +879,7 @@ "\td_name : \"%.*s\"\n", entry, entry->d_ino, - entry->d_off, + D_OFF(entry->d_off), entry->d_reclen, (int)entry->d_type, (int)entry->d_reclen,(char*)(entry->d_name) @@ -1575,7 +1582,7 @@ struct stat reslvinfo; instw_t iw; char wpath[PATH_MAX+1]; - size_t wsz=0; + ssize_t wsz=0; char linkpath[PATH_MAX+1]; @@ -1671,7 +1678,7 @@ struct stat sinfo; struct stat dinfo; int wfd; - size_t wsz; + ssize_t wsz; instw_t iw_entry; int status=0; @@ -2691,8 +2698,8 @@ return result; } -int readlink(const char *path,char *buf,size_t bufsiz) { - int result; +ssize_t readlink(const char *path,char *buf,size_t bufsiz) { + ssize_t result; instw_t instw; int status; --- checkinstall-1.6.1.orig/NLS_SUPPORT +++ checkinstall-1.6.1/NLS_SUPPORT @@ -39,11 +39,11 @@ 3) Now create the locale directory for your language. Remember to use the same ISO codes you use in your LC_ALL environment variable: -mkdir -p /usr/local/lib/checkinstall/locale/es_MX/LC_MESSAGES +mkdir -p /usr/share/locale/es_MX/LC_MESSAGES 4) Next, you should generate the .mo binary message file. Run msgfmt: -msgfmt -o /usr/local/lib/checkinstall/locale/es_MX/LC_MESSAGES/checkinstall.mo \ +msgfmt -o /usr/share/locale/es_MX/LC_MESSAGES/checkinstall.mo \ checkinstall-es.po (The above goes all in one line) --- checkinstall-1.6.1.orig/locale/checkinstall-de.po +++ checkinstall-1.6.1/locale/checkinstall-de.po @@ -16,7 +16,7 @@ "Last-Translator: Andreas Muck \n" "Language-Team: DE \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=iso-8859-15\n" "Content-Transfer-Encoding: 8bit\n" msgid " This software is released under the GNU GPL." --- checkinstall-1.6.1.orig/locale/checkinstall-es.po +++ checkinstall-1.6.1/locale/checkinstall-es.po @@ -11,7 +11,7 @@ "Last-Translator: Felipe Eduardo Sanchez Diaz Duran \n" "Language-Team: ES \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" msgid " This software is released under the GNU GPL." --- checkinstall-1.6.1.orig/checkinstall +++ checkinstall-1.6.1/checkinstall @@ -45,12 +45,12 @@ # gettext variables -export TEXTDOMAINDIR=/usr/local/lib/checkinstall/locale +export TEXTDOMAINDIR=/usr/share/locale export TEXTDOMAIN=checkinstall # .spec file path DIRECTORIO_FUENTE=`pwd` -PKG_BASENAME="`basename \"$DIRECTORIO_FUENTE\"`" +PKG_BASENAME=`basename "$DIRECTORIO_FUENTE"` SPEC_PATH=${PKG_BASENAME}.spec ############################################################################# @@ -71,9 +71,9 @@ ## gettext echo with newline at the end function echog() { - local format="$1\n" + local format="$1" shift - printf -- "$(ck_gettext "$format")" "$@" >&2 + printf -- "$(ck_gettext "$format")\n" "$@" >&2 } ## gettext echo with NO newline at the end @@ -185,7 +185,7 @@ echog "--copyright Show Copyright information" echog "--version Show version information" echo - ) | $PAGER + ) exit 1 } @@ -271,7 +271,8 @@ if [ $? -eq 0 ]; then echogn "Restoring overwritten files from backup..." cd ${TMP_DIR}/BACKUP - $TAR -cpf - . | $TAR -f - -xvpC / &> /dev/null + files=$(ls -A) + $TAR -cpf - $files | $TAR -f - -xvpC / &> /dev/null okfail echo fi @@ -290,9 +291,11 @@ restore_backup echogn "Cleaning up..." cd "$DIRECTORIO_FUENTE" - rm -rf ${TMP_DIR} - rm -f "$BUILDROOT" - rm -f "${RPMSOURCEDIR}/SOURCES/${PKG_BASENAME}.tgz" + [ ! -z "${TMP_DIR}" ] && [ -d ${TMP_DIR} ] && rm -rf ${TMP_DIR} + [ ! -z "${BUILDROOT}" ] && [ -f ${BUILDROOT} ] && rm -f "$BUILDROOT" + [ ! -z ""${RPMSOURCEDIR}/SOURCES/${PKG_BASENAME}.tgz"" ] && + [ -f "${RPMSOURCEDIR}/SOURCES/${PKG_BASENAME}.tgz" ] && + rm -f "${RPMSOURCEDIR}/SOURCES/${PKG_BASENAME}.tgz" rm -f checkinstall-debug* # If we had a pre-existing postinstall-pak, we keep it as it was. @@ -376,6 +379,18 @@ } +# This function is used to properly escape shell commands, so +# we don't interpret the install command twice. This is useful +# for making commands like 'make CC="gcc -some -options" install' +# work as expected. + +function shell_escape() { + for str in "$@" ; do + echo -n "\"$str\" " + done; + echo +} + ################################# @@ -386,13 +401,13 @@ ckversion echo -if ! [ -f /usr/local/lib/checkinstall/checkinstallrc ]; then - echog "The checkinstallrc file was not found at:\n/usr/local/lib/checkinstall/checkinstallrc" +if ! [ -f /etc/checkinstallrc ]; then + echog "The checkinstallrc file was not found at:\n/etc/checkinstallrc" echo echog "Assuming default values." else # Get our default settings from the rc file -source /usr/local/lib/checkinstall/checkinstallrc +source /etc/checkinstallrc fi @@ -502,7 +517,7 @@ INSTYPE=D;; *) echo - echo $1 is not a valid packaging system. Please use \'rpm\', \'slackware\' or \'debian\' + echo "$1 is not a valid packaging system. Please use \'rpm\', \'slackware\' or \'debian\'" echo echo exit 1 @@ -742,10 +757,10 @@ shift done -# See if we have and install command +# See if we have an install command shift -[ "$1" = "" ] && set -- "make install" +[ "$1" = "" ] && set -- make install # End of argument parsing @@ -885,15 +900,15 @@ -INSTALLCMD="$@" -: ${INSTALLCMD:='make install'} +INSTALLCMD=("$@") +[ -z "$INSTALLCMD" ] && INSTALLCMD=(make install) # The editor we use to review the file list and .spec or control file if ! [ -x "$VISUAL" ]; then if [ -x "$EDITOR" ]; then VISUAL=$EDITOR else - VISUAL=`which vi` + VISUAL=`/usr/bin/which vi` fi fi @@ -905,7 +920,7 @@ if [ "$TAR" ]; then ! [ -x "$TAR" ] && BADTAR=1 else - TAR=`which tar-1.13 2> /dev/null` + TAR=`/usr/bin/which tar-1.13 2> /dev/null` fi if ! [ -x "$TAR" ]; then @@ -1179,12 +1194,18 @@ fi - echo $NAME | grep -e "_" &> /dev/null + echo $NAME | grep -e '^[^0-9a-z]' &> /dev/null + if [ $? -eq 0 ]; then + echo + echog "*** Warning: the package name \"%s\" does not start with\n*** Warning: an alphanumeric character. dpkg might not like that so I \n*** Warning: changed it to a number 0." $NAME + NAME=`echo $NAME | sed -e 's/^./0/'` + fi + echo $NAME | grep -e '[^0-9a-z+.-]' &> /dev/null if [ $? -eq 0 ]; then - echo - echog "*** Warning: The package name \"%s\" contains underscores.\n*** Warning: dpkg might not like that so I changed\n*** Warning: them to dashes." "$NAME" - NAME=`echo $NAME | sed -e 's/_/-/g'` - fi + echo + echog "*** Warning: The package name \"%s\" contains illegal.\n*** Warning: characters. dpkg might not like that so I changed\n*** Warning: them to dashes." "$NAME" + NAME=`echo $NAME | sed -e 's/[^0-9a-z+.-]/-/g'` + fi fi @@ -1196,7 +1217,7 @@ # If we did not then try getting it from the config.log file if [ -f "$DIRECTORIO_FUENTE/config.log" ]; then - VERSION=`grep '#define VERSION' config.log| awk -F \" '{print $ 2}'` + VERSION=`grep '#define VERSION' config.log| awk -F '"' '{print $ 2}'` else @@ -1208,11 +1229,18 @@ if [ "$CK_DEBIAN" ]; then # Check for a valid version for dpkg - echo $VERSION | grep -e "[0-9]" &> /dev/null - if [ $? -gt 0 ]; then + NEWVERS=$(echo $VERSION | egrep '^([[:alnum:]]+:)?[[:alnum:]]+([-:.+~][[:alnum:]]+)*(-[.[:alnum:]]+)?$' 2> /dev/null) + while [ "$NEWVERS" != "$VERSION" ]; do echo - echog "*** Warning: The package version \"%s\" does not\n*** Warning: contain any digits. dpkg might not like that." "$VERSION" - fi + echog "*** Warning: The package version \"%s\" is not a\n*** Warning: debian policy compliant one. Please specify an alternate one" "$VERSION" + if [ $ACCEPT_DEFAULT -eq 0 ] ; then + read VERSION + NEWVERS=$(echo $VERSION | egrep '^([[:alnum:]]+:)?[[:alnum:]]+([-:.+~][[:alnum:]]+)*(-[.[:alnum:]]+)?$' 2> /dev/null) + else + VERSION=0 + NEWVERS=0 + fi + done fi @@ -1379,8 +1407,11 @@ #!/bin/sh cd "$DIRECTORIO_FUENTE" -$INSTALLCMD +EOF + +shell_escape "${INSTALLCMD[@]}" >> $TMP_SCRIPT +cat << EOF >> $TMP_SCRIPT # Report success or failure if [ \$? -eq 0 ]; then exit 0 @@ -1395,7 +1426,7 @@ echo -echogn "Installing with %s..." "$INSTALLCMD" +echogn "Installing with %s..." "${INSTALLCMD[*]}" # @@ -1494,10 +1525,10 @@ # Find regular files first [ $DEBUG -gt 0 ] && echo "debug: BASE_TMP_DIR: $BASE_TMP_DIR" - cat /${TMP_DIR}/newfiles.tmp | egrep -v '^[-0-9][0-9]*[ ]*unlink' | cut -f 3 | egrep -v "^(/dev|$BASE_TMP_DIR|/tmp)" | sort -u > /${TMP_DIR}/newfiles + cat /${TMP_DIR}/newfiles.tmp | egrep -v '^[-0-9][0-9]*[[:space:]]*(unlink|access)' | cut -f 3 | egrep -v "^(/dev|$BASE_TMP_DIR|/tmp)" | sort -u > /${TMP_DIR}/newfiles # symlinks are next - cat /${TMP_DIR}/newfiles.tmp | egrep -v '^[-0-9][0-9]*[ ]*unlink' | cut -f 4 | egrep -v "^(/dev|$BASE_TMP_DIR|/tmp)" | grep -v "#success" | sort -u >> /${TMP_DIR}/newfiles + cat /${TMP_DIR}/newfiles.tmp | egrep -v '^[-0-9][0-9]*[[:space:]]*(unlink|access)' | cut -f 4 | egrep -v "^(/dev|$BASE_TMP_DIR|/tmp)" | grep -v "#success" | sort -u >> /${TMP_DIR}/newfiles # OK, now we clean it up a bit mv /${TMP_DIR}/newfiles.tmp /${TMP_DIR}/newfiles.installwatch @@ -1527,6 +1558,21 @@ cp /${TMP_DIR}/newfiles.tmp /${TMP_DIR}/newfiles done + # Find files created under /home + grep '^/home' ${TMP_DIR}/newfile > /${TMP_DIR}/unwanted + if [ $? -eq 0 ]; then + echo + echog "Some of the files created by the installation are inside the home directory: /home" + echo + echogn "You probably don't want them to be included in the package.\nDo you want me to list them? " + if yorn "n"; then + $PAGER ${TMP_DIR}/unwanted + fi + echogn "Should I exclude them from the package? (Saying yes is a good idea) " + if yorn "n"; then + sed -i -e '/^\/home/d' ${TMP_DIR}/newfiles + fi + fi ## Find any files created in `pwd`. We probably don't want them here @@ -1800,6 +1846,44 @@ # End of Identify shared libraries # ############################################################################## +############################################################################## + # Identify kernel modules # + ########################### + +# Find out if we installed a kernel module, and if so run depmod in the postinst +# and delete the files depmod touches (they conflict with other packages) +# These files are modules.* inside the kernel modules directory. + +DEPFILES=$(cat ${TMP_DIR}/newfiles | grep -E 'modules\.(dep|pcimap|usbmap|ccwmap|ieee1394map|isapnpmap|inputmap|ofmap|seriomap|alias|symbols)' ) +if [ ! -z "$DEPFILES" ] ; then + echo + echog "Kernel modules found. Calling depmod in the postinstall script" + # Delete references to the depmod generated files + sed -r -i -e '\,modules\.(dep|pcimap|usbmap|ccwmap|ieee1394map|isapnpmap|inputmap|ofmap|seriomap|alias|symbols),d' ${TMP_DIR}/newfiles + # And the files themselves + for file in $DEPFILES ; do + rm ${BUILD_DIR}/$file + done + # Find out the kernel version. + # Ugly hack, but works in Debian and should on many other systems. + # The file must be /any/dir//modules.* + KVER=$(echo $DEPFILES | awk '{print $1}' | sed -e 's|/modules\..*||' | xargs basename ) + # Add depmod to the postinst + + # This will be redundant if we already have a postinstall script. + # Nevertheless, it is harmless. + echo "#!/bin/sh" >> ${DIRECTORIO_FUENTE}/postinstall-pak + echo "#" >> ${DIRECTORIO_FUENTE}/postinstall-pak + echo "# postinstall script, created by checkinstall-${CHECKINSTALL_VERSION}" >> ${DIRECTORIO_FUENTE}/postinstall-pak + echo "#" >> ${DIRECTORIO_FUENTE}/postinstall-pak + + echo "depmod $KVER" >> ${DIRECTORIO_FUENTE}/postinstall-pak +fi + + ################################## + # End of Identify kernel modules # +############################################################################## + cd $DIRECTORIO_FUENTE @@ -1826,7 +1910,7 @@ if [ $INSTALL -gt 0 ]; then # Verify that we have the "installpkg" command in our path - INSTALLPKG_PATH=`which installpkg 2> /dev/null` + INSTALLPKG_PATH=`/usr/bin/which installpkg 2> /dev/null` if ! [ -x "$INSTALLPKG_PATH" ]; then echo @@ -2033,7 +2117,7 @@ # Verify that we have the rpm command in our path -RPM_PATH=`which rpm 2> /dev/null` +RPM_PATH=`/usr/bin/which rpm 2> /dev/null` if ! [ -x "$RPM_PATH" ]; then echo @@ -2083,7 +2167,7 @@ RPMBUILD="rpm" fi -if [ "$RPMBUILD" = "rpmbuild" -a ! -x "`which rpmbuild 2> /dev/null`" ]; then +if [ "$RPMBUILD" = "rpmbuild" -a ! -x "`/usr/bin/which rpmbuild 2> /dev/null`" ]; then echo echo "*** The \"rpmbuild\" program is not in your PATH!" echo @@ -2278,7 +2362,7 @@ if ! [ $FAILED -gt 0 ]; then PKG_LOCATION="$RPMPKG" - INSTALLSTRING="rpm -i `basename \"$RPMPKG\"`" + INSTALLSTRING="rpm -i `basename "$RPMPKG"`" REMOVESTRING="rpm -e ${PKG_BASENAME}-${RELEASE}" fi @@ -2311,7 +2395,7 @@ # Verify that we have the dpkg command in our path -DPKG_PATH=`which dpkg 2> /dev/null` +DPKG_PATH=`/usr/bin/which dpkg 2> /dev/null` if ! [ -x "$DPKG_PATH" ]; then echo @@ -2442,7 +2526,7 @@ if ! [ $FAILED -gt 0 ]; then PKG_LOCATION="$DEBPKG" - INSTALLSTRING="dpkg -i `basename \"$DEBPKG\"`" + INSTALLSTRING="dpkg -i `basename "$DEBPKG"`" REMOVESTRING="dpkg -r ${PKG_BASENAME}" fi @@ -2492,7 +2576,7 @@ echo else # Update the package location - PKG_LOCATION="${PAK_DIR}/`basename \"$PKG_LOCATION\"`" + PKG_LOCATION="${PAK_DIR}/`basename "$PKG_LOCATION"`" fi else echo --- checkinstall-1.6.1.orig/checkinstallrc-dist +++ checkinstall-1.6.1/checkinstallrc-dist @@ -16,7 +16,7 @@ DEBUG=0 # Location of the "installwatch" program -INSTALLWATCH_PREFIX="/usr/local" +INSTALLWATCH_PREFIX="/usr" INSTALLWATCH=${INSTALLWATCH_PREFIX}/bin/installwatch # Location of the makepkg program. "makepak" is the default, and is @@ -39,7 +39,7 @@ BASE_TMP_DIR=/var/tmp ## Don't set this to /tmp or / !! # Where to place the installed document files -DOC_DIR="" +DOC_DIR="/usr/share/doc" # Default architecture type (Leave it empty to allow auto-guessing) ARCHITECTURE="" @@ -49,7 +49,7 @@ # R : RPM # D : Debian -INSTYPE="" +INSTYPE="D" # Storage directory for newly created packages # By default they will be stored at the default @@ -72,16 +72,16 @@ # Show Slackware package installation script while it runs? Again, useful if # it's an interactive script -SHOW_SLACK_INSTALL=0 +SHOW_SLACK_INSTALL=1 # Automatic deletion of "doc-pak" upon termination? -DEL_DOCPAK=1 +DEL_DOCPAK=0 # Automatic deletion of the spec file? -DEL_SPEC=1 +DEL_SPEC=0 # Automatic deletion of "description-pak"? -DEL_DESC=1 +DEL_DESC=0 # Automatically strip all ELF binaries? STRIP_ELF=1 @@ -136,4 +136,4 @@ REVIEW_CONTROL=0 # Install the package or just create it? -INSTALL=0 +INSTALL=1 --- checkinstall-1.6.1.orig/debian/changelog +++ checkinstall-1.6.1/debian/changelog @@ -0,0 +1,280 @@ +checkinstall (1.6.1-4ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Use /usr/bin/which instead of which. (LP: #4423) + - add make to Depends, checkinstall doesn't work without it. (LP: #3142) + - Modify Maintainer value to match Debian-Maintainer-Field Spec + * Debian version fixes LP: #115107 + + -- Albin Tonnerre Wed, 22 Aug 2007 11:59:23 +0200 + +checkinstall (1.6.1-4) unstable; urgency=low + + * Fix access() filtering in checkinstall. + (Closes: #404542) + * Fix backup cleaning that may delete stuff we don't want to. + * Remove spurious quotes which may behave badly under some conditions. + * Find files created under /home and ask for exclusion. + * Don't strip installwatch.so in upstream's Makefile + (Closes: #436621) + + -- Felipe Sateler Fri, 10 Aug 2007 20:56:47 -0400 + +checkinstall (1.6.1-3ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Use /usr/bin/which instead of which. (LP: #4423) + - add make to Depends, checkinstall doesn't work without it. (LP: #3142) + - Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Albin Tonnerre Mon, 7 May 2007 22:56:46 +0200 + +checkinstall (1.6.1-3) unstable; urgency=low + + * Fix FTBFS in some archs, by fixing the build dependencies. + (Closes: #422213) + + -- Felipe Sateler Fri, 04 May 2007 13:17:01 -0400 + +checkinstall (1.6.1-2ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Use /usr/bin/which instead of which. (Malone: #4423) + - add make to Depends, checkinstall doesn't work without it. + (Malone: #3142) + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Albin Tonnerre Wed, 2 May 2007 10:45:03 +0200 + +checkinstall (1.6.1-2) unstable; urgency=low + + * Avoid shell command reinterpretation. + (Closes: #306075) + * Ease kernel module package creation by detecting depmod calls + and acting accordingly. + (Closes: #373103) + * Fix FTBFS on GNU/kFreeBSD, patch from Cyril Brulebois. + (Closes: #414310) + * Comment =yes and =no arguments to options in the man page. + (Closes: #409340) + * Check for correct version numbers. + (Closes: #175240) + * Check for correct package names in Debian. + (Closes: #356524) + * Fix typos in checkinstall and installwatch man pages. + * Do not pase usage information through a pager. + * Fix charset in spanish and german translations + (Closes: #418494) + * Add XS-Vcs-Svn and XS-Vcs-Browser fields to debian/control + * Pass messages to gettext without \n, add it later. + * Correct the readlink definition to match the newer 2.5 glibc: now return + a ssize_t instead of an int. + + -- Felipe Sateler Sat, 21 Apr 2007 16:12:41 -0400 + +checkinstall (1.6.1-1ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - Use /usr/bin/which instead of which. (Malone: #4423) + - add make to Depends, checkinstall doesn't work without it. + (Malone: #3142) + + -- Timo Aaltonen Wed, 20 Dec 2006 17:39:31 +0200 + +checkinstall (1.6.1-1) unstable; urgency=low + + * New upstream release. + * Tag files in /etc as conffiles + (Closes: #284786) + * Fix backup restoration changing permissions of the root directory. + (Closes: #342578, #281823) + * Fix erronous manpage sgml files. + + -- Felipe Sateler Wed, 6 Dec 2006 00:02:32 -0300 + +checkinstall (1.6.0-2ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + + -- Steve Kowalik Sat, 26 Aug 2006 21:04:39 +1000 + +checkinstall (1.6.0-2) unstable; urgency=low + + * Fix temporary script deletion (Thanks to David Jarvie for the patch) + (Closes: Bug#367935) + * --requires works for all packages, not just rpm + * Default documentation installation to /usr/share/doc instead of /usr/doc + * Remove duplicate version information when usage information is displayed + * Fix getcwd when in filesystem translation mode. Patch from David Brown. + (Closes: Bug#374648) + * Rewrite both man pages (we now build-dep in docbook-to-man) + (Closes: Bug#238202, Bug#351969) + * Fix upper case detection under some locales + * Check for underscores in debian package names. + (Closes: Bug#364813) + * Fix typo: maintaner != maintainer. + (Closes: Bug#377609) + * Fix documentation installation directory (Thanks to Martintxo). + (Closes: Bug#383541) + + -- Felipe Sateler Mon, 21 Aug 2006 20:18:19 -0400 + +checkinstall (1.6.0-1ubuntu1) edgy; urgency=low + + * Merge from Debian unstable. + + -- Steve Kowalik Thu, 6 Jul 2006 16:20:50 +1000 + +checkinstall (1.6.0-1) unstable; urgency=low + + * Taken over checkinstall and installwatch. + - Merged with installwatch + - Recreated the packaging, and fixed installation locations. + * New upstream release + (Closes: Bug#347469, Bug#295229, Bug#322555) + * Suggests gettext + * Fixed typos in the checkinstall manpage. Thanks to Helge Kreutzmann. + (Closes: Bug#247999) + * Scripts now run bash instead of sh, due to possible bashisms + * Fixed amd64 installations, thanks to Martin Samuelsson and Alexandra N. + Kossovsky + (Closes: Bug#298152) + * Depends in findutils >= 4.2 + (Closes: Bug#357496) + * Upgrade policy version to 3.7.2 + + -- Felipe Sateler Tue, 10 Jan 2006 21:19:26 -0300 + +checkinstall (1.5.3-3ubuntu2) dapper; urgency=low + + * Use /usr/bin/which instead of which. (Malone: #4423) + * Correct path for installwatch.so. (Malone: #29536) + + -- Steve Kowalik Sat, 22 Apr 2006 17:28:22 +1000 + +checkinstall (1.5.3-3ubuntu1) dapper; urgency=low + + * debian/control: + -added make to Depends, checkinstall doesn't work without it. + (Closes: Malone #3142) + -added Homepage to description + -bumped Standards-Version to 3.6.2 + + -- Loic Pefferkorn Fri, 28 Oct 2005 14:57:08 +0200 + +checkinstall (1.5.3-3) unstable; urgency=medium + + * Applied patch from "Martin H" to fix doc installation + (Closes: #174108) + * Now using /usr/bin/sensible-pager for a pager, instead of "less". + (Closes: Bug#225630) + * Regenerated and "fixed" manpage - Thanks Colin Watson for the fix. + (Closes: Bug#175141) + + -- Matt Hope Mon, 12 Apr 2004 22:56:58 +1000 + +checkinstall (1.5.3-2) unstable; urgency=low + + * Fixed directory path in checkinstall script + (Closes: Bug#164849) + * Added a "Depend" on "file". + (Closes: Bug#192611) + * Updated `Standards-Version' + + * Applied patches/fixes from Morten Hustveit + (Much respect for fixing these) + - Replaced `eval echo $1` with "$1" when setting maintainer. + (Closes: Bug#165483) + - Replaced description in man-page with a more suitable one. + (Closes: Bug#174538, Bug#212559) + - Default to creating Debian packages. + (Closes: Bug#181832) + + -- Matt Hope Sat, 11 Oct 2003 18:40:27 +1000 + +checkinstall (1.5.3-1) unstable; urgency=low + + * New upstream release + - PPC Arch "fixup" rewritten + (Closes: Bug#171040) + + * Documentation directory name (/usr/share/doc/$PACKAGENAME) now + correctly calculated from the package name, rather than the source + directory name. + (Closes: Bug#165481) + + * Documentation directory changed from defaulting to /usr/doc/ to + /usr/share/doc/ + (Closes: Bug#165480) + + -- Matt Hope Sun, 8 Dec 2002 15:18:57 +1100 + +checkinstall (1.5.2-2) unstable; urgency=low + + * debian/rules; Changed #!/bin/sh to #!/bin/sh as script contains + bash-isms. + (Closes: Bug#157348) + * Added in a check for if (arch="ppc") { arch="powerpc" } + (Closes: Bug#155218) + + -- Matt Hope Wed, 21 Aug 2002 21:35:23 +1000 + +checkinstall (1.5.2-1) unstable; urgency=low + + * Initial package + (Closes: Bug#122914) + + -- Matt Hope Sat, 29 Jun 2002 15:38:08 +1000 + +checkinstall (1.5.3-2) unstable; urgency=low + + * Default installation type is now debian in /etc/checkinstall + (Closes: Bug#181832) + + * Fixed dot at start of line in manpage + (Closes: Bug#175141) + + * Changed defaults to not delete doc-pak, spec or description-pak + (Closes: Bug#165482) + + * Fixed incorrect NAME secrion in manpage + (Closes: #174538) + + * Fixed changelog entry (1.5.2-2) - changed to #!/bin/bash + + -- Matt Hope Sun, 23 Mar 2003 20:09:39 +1100 + +checkinstall (1.5.3-1) unstable; urgency=low + + * New upstream release + - PPC Arch "fixup" rewritten + (Closes: Bug#171040) + + * Documentation directory name (/usr/share/doc/$PACKAGENAME) now + correctly calculated from the package name, rather than the source + directory name. + (Closes: Bug#165481) + + * Documentation directory changed from defaulting to /usr/doc/ to + /usr/share/doc/ + (Closes: Bug#165480) + + -- Matt Hope Sun, 8 Dec 2002 15:18:57 +1100 + +checkinstall (1.5.2-2) unstable; urgency=low + + * debian/rules; Changed #!/bin/sh to #!/bin/bash as script contains + bash-isms. + (Closes: Bug#157348) + * Added in a check for if (arch="ppc") { arch="powerpc" } + (Closes: Bug#155218) + + -- Matt Hope Wed, 21 Aug 2002 21:35:23 +1000 + +checkinstall (1.5.2-1) unstable; urgency=low + + * Initial package + (Closes: Bug#122914) + + -- Matt Hope Sat, 29 Jun 2002 15:38:08 +1000 + --- checkinstall-1.6.1.orig/debian/dirs +++ checkinstall-1.6.1/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/sbin --- checkinstall-1.6.1.orig/debian/control +++ checkinstall-1.6.1/debian/control @@ -0,0 +1,25 @@ +Source: checkinstall +Section: admin +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Felipe Sateler +Build-Depends: debhelper (>= 4.0.0), gettext, docbook-to-man, libc6-dev (>= 2.5) [!alpha !ia64 !kfreebsd-i386 !hurd-i386], libc6.1-dev (>= 2.5) [alpha ia64] +Standards-Version: 3.7.2 +XS-Vcs-Svn: svn://svn.debian.org/collab-maint/ext-maint/checkinstall +XS-Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/ext-maint/checkinstall/?rev=0&sc=0 + +Package: checkinstall +Architecture: any +Depends: ${shlibs:Depends}, file, findutils (>= 4.2), make +Suggests: gettext +Replaces: installwatch +Conflicts: installwatch +Description: installation tracker + CheckInstall keeps track of all the files created or + modified by your installation script ("make install" + "make install_modules", "setup", etc), builds a + standard binary package and installs it in your + system giving you the ability to uninstall it with your + distribution's standard package management utilities. + . + Homepage: http://asic-linux.com.mx/~izto/checkinstall/ --- checkinstall-1.6.1.orig/debian/watch +++ checkinstall-1.6.1/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://asic-linux.com.mx/~izto/checkinstall/files/source/checkinstall-([\d\.]*)\.tgz --- checkinstall-1.6.1.orig/debian/installwatch.sgml +++ checkinstall-1.6.1/debian/installwatch.sgml @@ -0,0 +1,209 @@ + + Felipe"> + Sateler"> + + June 21, 2006"> + + 1"> + fsateler@gmail.com"> + + installwatch"> + + + Debian"> + GNU"> + GPL"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2006 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + Track installation of software + + + + &dhpackage; + + options + + command + + + + DESCRIPTION + + + &dhpackage; is a program that is used in order + to track the changes made while installing local software (i.e. + "make install"). It monitors the requested command, and produces + a log which indicates all created and modified files. By default + it outputs to syslog(3) using a priority + of "LOG_USER | LOG_INFO". This may be overridden by the use of the + flag. The log format is as follows: + + + <return-value> <syscall-name> <argument> #<comment> + + + Each field is delimited by a "⁁I" character if logging to + syslog(3), or by a tab when logging to a file. + + + + ENVIRONMENT + + + + INSTALLWATCH_BACKUP_PATH + + Set this variable to the location that you want + installwatch to copy the original version of files which + get modified. The directory will be created if it does + not exist, assuming that the parent is writable. + + + + + + OPTIONS + + These program follow the usual &gnu; command line syntax, + with long options starting with two dashes (`-'). A summary of + options is included below. + + + + + + + + + Directs that output from the logged command be written to + the filename specified. If the specified file already exists, + it will be truncated. + + + + + + + + + Sets the directory under which meta-info and translated + files will be stored. + + + + + + + + + Toggle translation capabilities. + + + + + + + + + Sets a comma separated neutral directory list, that won't + be concerned by translation or backups. + + + + + + + + + Specify a debug file. + + + + + + + Sets the debug level to be used. + + + + + + + Show help information. + + + + + + BUGS + + + &dhpackage; does not work with programs which are statically linked with + libc. Due to LD_PRELOAD limitations, it does not work with suid programs + (this would probably introduce security problems, anyway). + + + mknod(2) is not monitored. + + + + AUTHOR + + This manual page was written by &dhusername; <&dhemail;> for + the &debian; system (but may be used by others). Original text + by Greg Norris <adric@debian.org>. Permission is + granted to copy, distribute and/or modify this document under + the terms of the &gnu; General Public License, Version 2. + + + On Debian systems, the complete text of the GNU General Public + License can be found in /usr/share/common-licenses/GPL. + + + + + + + + --- checkinstall-1.6.1.orig/debian/compat +++ checkinstall-1.6.1/debian/compat @@ -0,0 +1 @@ +4 --- checkinstall-1.6.1.orig/debian/changelog.installwatch.old +++ checkinstall-1.6.1/debian/changelog.installwatch.old @@ -0,0 +1,67 @@ +installwatch (0.6.3-2) unstable; urgency=low + + * Set maintainer to Debian QA Group (package + is being orphaned). + * Bump standards version to 3.6.2. + * Drop the /usr/doc/installwatch -> /usr/share/doc/installwatch symlink. + (closes: #342745) + + -- Greg Norris Tue, 10 Jan 2006 14:45:45 -0600 + +installwatch (0.6.3-1) unstable; urgency=low + + * New upstream release. + + -- Greg Norris Wed, 26 Jun 2002 16:42:52 -0500 + +installwatch (0.5.5-4) unstable; urgency=low + + * Applied patch from Adam Olsen, to allow compiling on systems without + MAXPATHLEN... Hurd, in this case. Closes: #109951 + * Updated to standards version 3.5.6. + + -- Gregory T. Norris Fri, 7 Sep 2001 17:08:29 -0500 + +installwatch (0.5.5-3) unstable; urgency=low + + * Command line arguments which contained embedded whitespace could be + inadvertently split when passed to the installation command. Fixed. + * Added `-D_GNU_SOURCE' to the compile command in the makefile, in order to + allow building under glibc2.2. + * Updated to standards version 3.2.1. + + -- Gregory T. Norris Sat, 17 Feb 2001 17:20:14 -0600 + +installwatch (0.5.5-2) unstable; urgency=low + + * Cleaned up lintian errors/warnings + + -- Gregory T. Norris Sat, 30 Oct 1999 09:54:05 -0500 + +installwatch (0.5.5-1) unstable; urgency=low + + * New upstream release. + + -- Gregory T. Norris Sat, 15 May 1999 09:52:46 -0500 + +installwatch (0.5.4-1) unstable; urgency=low + + * New upstream release. + + -- Gregory T. Norris Thu, 1 Apr 1999 20:28:04 +0000 + +installwatch (0.5.3-1) unstable; urgency=low + + * New upstream release. + + -- Gregory T. Norris Mon, 29 Mar 1999 04:34:33 -0600 + +installwatch (0.5.1-1) unstable; urgency=low + + * Initial Release. + + -- Gregory T. Norris Sun, 20 Dec 1998 11:10:58 -0600 + +Local variables: +mode: debian-changelog +End: --- checkinstall-1.6.1.orig/debian/rules +++ checkinstall-1.6.1/debian/rules @@ -0,0 +1,94 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +manpages: debian/checkinstall.1 debian/installwatch.1 +debian/checkinstall.1: debian/checkinstall.sgml + docbook-to-man debian/checkinstall.sgml > debian/checkinstall.1 +debian/installwatch.1: debian/installwatch.sgml + docbook-to-man debian/installwatch.sgml > debian/installwatch.1 + +build: build-stamp manpages +build-stamp: + dh_testdir + + $(MAKE) + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + $(MAKE) clean + rm -f debian/checkinstall.1 + rm -f debian/installwatch.1 + + dh_clean -Xinstallwatch.c.rej + +TMPDIR=$(CURDIR)/debian/tmp +install: build + dh_testdir + dh_testroot + dh_clean -Xinstallwatch.c.rej + dh_installdirs + + # We override all paths: we want the binary in bin instead of + # sbin, the configuration file in etc, the locales in the + # standard directory, and the installwatch library in a subdir + # of usr/lib + $(MAKE) install PREFIX=$(TMPDIR)/usr LCDIR=$(TMPDIR)/usr/share/locale \ + CONFDIR=$(TMPDIR)/etc BINDIR=$(TMPDIR)/usr/bin \ + LIBDIR=$(TMPDIR)/usr/lib/checkinstall + # Delete the checkinstallrc-dist file from etc + rm -f $(TMPDIR)/etc/checkinstallrc-dist + + # installwatch's documentation + mkdir -p $(TMPDIR)/usr/share/doc/checkinstall + gzip -9c installwatch-0.7.0beta5/CHANGELOG \ + > $(TMPDIR)/usr/share/doc/checkinstall/installwatch.changelog.gz + gzip -9c debian/changelog.installwatch.old \ + > $(TMPDIR)/usr/share/doc/checkinstall/installwatch.changelog.Debian.gz + cp installwatch-0.7.0beta5/BUGS \ + $(TMPDIR)/usr/share/doc/checkinstall/BUGS.installwatch + cp installwatch-0.7.0beta5/README \ + $(TMPDIR)/usr/share/doc/checkinstall/README.installwatch + cp installwatch-0.7.0beta5/TODO \ + $(TMPDIR)/usr/share/doc/checkinstall/TODO.installwatch + + # Modifications to the programs/config are applied here + + # Enable installwatch to find the shared library + sed -i -e 's|$(TMPDIR)||' $(TMPDIR)/usr/bin/installwatch + sed -i -e 's|PREFIX/lib|PREFIX/lib/checkinstall|' \ + $(TMPDIR)/usr/bin/installwatch + + dh_install --sourcedir=$(TMPDIR) + +binary: install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installman debian/installwatch.1 debian/checkinstall.1 + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# We don't have an architecture independent package +binary-indep: + +# Build the architecture dependant package using the common target. +binary-arch: install + $(MAKE) -f debian/rules binary + + +.PHONY: build clean binary-indep binary-arch binary-common binary install --- checkinstall-1.6.1.orig/debian/checkinstall.install +++ checkinstall-1.6.1/debian/checkinstall.install @@ -0,0 +1,6 @@ +usr/bin/checkinstall +etc/checkinstallrc +usr/share/doc/* +usr/share/locale/*/LC_MESSAGES/checkinstall.mo +usr/bin/installwatch +usr/lib/checkinstall/installwatch.so --- checkinstall-1.6.1.orig/debian/copyright +++ checkinstall-1.6.1/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Felipe Sateler on +Tue, 10 Jan 2006 21:19:26 -0300. + +It was downloaded from http://asic-linux.com.mx/~izto/checkinstall/ + +Copyright (c) 2002-2006 Felipe Eduardo Sánchez Díaz Durán + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- checkinstall-1.6.1.orig/debian/checkinstall.docs +++ checkinstall-1.6.1/debian/checkinstall.docs @@ -0,0 +1,5 @@ +FAQ +README +TODO +CREDITS +RELNOTES --- checkinstall-1.6.1.orig/debian/checkinstall.sgml +++ checkinstall-1.6.1/debian/checkinstall.sgml @@ -0,0 +1,504 @@ + + Felipe"> + Sateler"> + + June 21, 2006"> + + 1"> + fsateler@gmail.com"> + + CheckInstall"> + + + Debian"> + GNU"> + GPL"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2006 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + Track installation of local software, and produce a binary manageable + with your package management software. + + + + + &dhpackage; + + options + + install command + + + + DESCRIPTION + + + &dhpackage; is a program that monitors an installation + procedure (such as make install, install.sh + ), and creates a standard package for your distribution + (currently deb, rpm and tgz packages are supported) that you can install + through your distribution's package management system (dpkg, rpm or + installpkg). + + + + + OPTIONS + + These programs follow the usual &gnu; command line syntax, + with long options starting with two dashes ('-'). A summary of + options is included below. + All the options that toggle a switch default to activate the option. + To force activation or deactivation, call them with '=yes' or '=no'. As + an example, to disable stripping use --strip=no. + + + + + + + + Show summary of options. + + + + + + + + Show version information. + + + + + + + Show Copyright information + + + + + + + + Choose packaging system. Can be one of 'slackware', 'debian' + or 'rpm'. + + + + + + Create a Debian package. + + + + + + + Create a RPM package. + + + + + + + Create a Slackware Package. + + + + + + + Toggle installation of the created package. + + + + + + + + Enable/disable filesystem translation. Filesystem translation + enabled causes the install to proceed in a temporary directory, thus + not actually touching your system. + + + + + + + + Accept default answers to all questions. + + + + + + + Set the package name. + + + + + + + Set package version. + + + + + + + + + Set package architecture. + + + + + + + Set the package release. + + + + + + + Set package license. + + + + + + + Set the package group. + + + + + + + Set source location + + + + + + + Set alternate source location + + + + + + + Where to save the new package. + + + + + + + + Set the package maintainer. Be careful to correctly + quote/escape the name, to prevent shell expansion + + + + + + + Features provided by this package (currently only on RPM). + + + + + + + Dependencies required by this package. + + + + + + + Pass this flags to the rpm installer. + + + + + + + Use the -i flag when installing a rpm. + + + + + + + Use the -U flag when installing a rpm. + + + + + + + Pass this flags to the dpkg installer + + + + + + + Where the .spec file is located + + + + + + + Do not include documentation files. + + + + + + + Set debug level. Must be one of 0, 1 and 2. + + + + + + + Run an interactive install command + + + + + + + Toggle interactive install command. + + + + + + + Run an interactive Slackware installation script. + + + + + + + Toggle interactive Slackware installation script. + + + + + + + Toggle creation of a doinst.sh script. + + + + + + + Toggle stripping any ELF binaries found inside the package. + + + + + + + Toggle stripping any ELF libraries (.so) found inside the package. + + + + + + + Search for any shared libs and add them to /etc/ld.so.conf + + + + + + + Reset perms for all files/dirs to 755 and the owner/group for all dirs to root.root + + + + + + + Compress any man pages found inside the package. + + + + + + + Where to put documentation files. + + + + + + + Set the umask value. + + + + + + + Exclude these files/directories from the package. + + + + + + + Force the inclusion in the package of the files/dirs listed in the argument (a file). + + + + + + + Inspect the package's file list + + + + + + + Review the spec file before creating a .rpm. + + + + + + + Review the control file before creating a .deb. + + + + + + + Use the new (8.1+) Slackware description format ("--newslack" implies "-S") + + + + + + Manually set the path to the tar binary. + + + + + + + Toggle deletion of doc-pak upon termination. + + + + + + + Toggle deletion of description-pak upon termination. + + + + + + + Toggle deletion of spec file upon termination. + + + + + + + Backup any overwritten files + + + + + + + Toggle backup + + + + + + + FILES + This program reads its configuration from /etc/checkinstallrc, which can be used to override defaults. + Command line arguments override settings in the configuration file. + + + + AUTHOR + + This manual page was written by &dhusername; <&dhemail> for + the &debian; system (but may be used by others). Permission is + granted to copy, distribute and/or modify this document under + the terms of the &gnu; General Public License, Version 2. + + + On Debian systems, the complete text of the GNU General Public + License can be found in /usr/share/common-licenses/GPL. + + + + + + + +