--- checkinstall-1.5.3.orig/checkinstall +++ checkinstall-1.5.3/checkinstall @@ -330,7 +330,7 @@ ;; --maintainer) shift - MAINTAINER=`eval echo $1` + MAINTAINER="$1" ;; --dpkgflags) shift @@ -593,7 +593,7 @@ ! [ "$ACCEPT_DEFAULT" ] && ACCEPT_DEFAULT=0 # Use the default doc directory of /usr/doc -! [ "$DOC_DIR" ] && DOC_DIR=/usr/doc +! [ "$DOC_DIR" ] && DOC_DIR=/usr/share/doc # Do not include common documentation ! [ "$NODOC" ] && NODOC=0 @@ -616,6 +616,7 @@ DIRECTORIO_FUENTE=`pwd` PKG_BASENAME="`basename $DIRECTORIO_FUENTE`" +! [ "$NAME" ] && NAME="$PKG_BASENAME" MAKEPKG=/usr/local/sbin/makepak INSTALLCMD="$@" @@ -756,11 +757,11 @@ if [ -d "$DIRECTORIO_FUENTE/doc-pak" ]; then # Are there any files? echo echo "Copying documentation directory..." - mkdir -p "${DOC_DIR}/`basename $DIRECTORIO_FUENTE`" - cd "$DIRECTORIO_FUENTE/doc-pak" - tar -cpf - . | tar -f - -xvpC "${DOC_DIR}/`basename $DIRECTORIO_FUENTE`" &> /dev/null + mkdir -p "${DOC_DIR}/$NAME" + cd "./doc-pak" + tar -cpf - . | tar -f - -xvpC "${DOC_DIR}/$NAME" &> /dev/null [ \$? -gt 0 ] && exit 1 - chown -R root.root "${DOC_DIR}/`basename $DIRECTORIO_FUENTE`" + chown -R root.root "${DOC_DIR}/$NAME" fi cd "$DIRECTORIO_FUENTE" @@ -838,7 +839,7 @@ echo " ${TMP_DIR}/install.log" echo ' ***************************************************************' echo - cat /${TMP_DIR}/install.log) | less + cat /${TMP_DIR}/install.log) | /usr/bin/sensible-pager fi fi @@ -884,7 +885,7 @@ ## Find any files created in `pwd`. We probably don't want them here -grep "`pwd`" ${TMP_DIR}/newfiles > /${TMP_DIR}/unwanted +grep "^`pwd`" ${TMP_DIR}/newfiles > /${TMP_DIR}/unwanted if [ $? = 0 ]; then echo echo "Some of the files created by the installation are inside the build" @@ -894,7 +895,7 @@ echo "especially if they are inside your home directory." echo -n "Do you want me to list them? " if yorn "n"; then - less ${TMP_DIR}/unwanted + /usr/bin/sensible-pager ${TMP_DIR}/unwanted fi echo -n "Should I exclude them from the package? (Saying yes is a good idea) " if yorn ; then @@ -1455,7 +1456,7 @@ if [ $SHOW_SLACK_INSTALL -eq 0 ]; then echo -n "Do you want to see the log file? " if yorn ; then - less ${TMP_DIR}/slackinstall.log + /usr/bin/sensible-pager ${TMP_DIR}/slackinstall.log cleanup exit 1 fi @@ -1629,7 +1630,7 @@ echo echo -n "Do you want to see the log file? " if yorn ; then - less ${TMP_DIR}/rpmbuild.log + /usr/bin/sensible-pager ${TMP_DIR}/rpmbuild.log fi FAILED=1 fi @@ -1655,7 +1656,7 @@ echo echo -n "Do you want to see the log file? " if yorn ; then - less ${TMP_DIR}/rpminstall.log + /usr/bin/sensible-pager ${TMP_DIR}/rpminstall.log fi FAILED=1 fi @@ -1759,7 +1760,7 @@ echo echo -n "Do you want to see the log file? " if yorn ; then - less ${TMP_DIR}/dpkgbuild.log + /usr/bin/sensible-pager ${TMP_DIR}/dpkgbuild.log fi FAILED=1 fi @@ -1776,7 +1777,7 @@ echo echo -n "Do you want to see the log file? " if yorn ; then - less ${TMP_DIR}/dpkginstall.log + /usr/bin/sensible-pager ${TMP_DIR}/dpkginstall.log fi FAILED=1 fi --- checkinstall-1.5.3.orig/checkinstallrc +++ checkinstall-1.5.3/checkinstallrc @@ -33,7 +33,7 @@ # R : RPM # D : Debian -INSTYPE="" +INSTYPE="D" # Storage directory for newly created packages # By default they will be stored at the default --- checkinstall-1.5.3.orig/debian/changelog +++ checkinstall-1.5.3/debian/changelog @@ -0,0 +1,124 @@ +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.5.3.orig/debian/copyright +++ checkinstall-1.5.3/debian/copyright @@ -0,0 +1,30 @@ + +Author: + Felipe Eduardo Sanchez Diaz Duran + + +Copyright: + GPL + On a Debian GNU/Linux system; /usr/share/common-licenses/GPL + +Downloaded: + http://asic-linux.com.mx/~izto/checkinstall/download.php + +Debian-ized: + dopey@debian.org; 20020217.120708 [+1100] + + +Author: + Felipe Eduardo Sanchez Diaz Duran + + +Copyright: + GPL + On a Debian GNU/Linux system; /usr/share/common-licenses/GPL + +Downloaded: + http://asic-linux.com.mx/~izto/checkinstall/download.php + +Debian-ized: + dopey@debian.org; 20020217.120708 [+1100] + --- checkinstall-1.5.3.orig/debian/watch +++ checkinstall-1.5.3/debian/watch @@ -0,0 +1,4 @@ +version=2 +http://checkinstall.izto.org/download.php files/source/checkinstall-(.*).tgz debian uupdate -u +version=2 +http://checkinstall.izto.org/download.php files/source/checkinstall-(.*).tgz debian uupdate -u --- checkinstall-1.5.3.orig/debian/dirs +++ checkinstall-1.5.3/debian/dirs @@ -0,0 +1,4 @@ +usr/bin +etc +usr/bin +etc --- checkinstall-1.5.3.orig/debian/manpage.sgml +++ checkinstall-1.5.3/debian/manpage.sgml @@ -0,0 +1,718 @@ + + Matt"> + Hope"> + + Apr 8 2002"> + + 1"> + dopey@debian.org"> + + CHECKINSTALL"> + + + Debian GNU/Linux"> + GNU"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2002 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + generate packages by tracking installation scripts + + + + &dhpackage; + + options + command + + + + + DESCRIPTION + + This manual page was written for the &debian; distribution + because the original program does not have a manual page. + + &dhpackage; is used to build packages from + the `make install' process, which then can be installed or + uninstalled. + + + + OPTIONS + + + + + + + + Build a Slackware package. + + + + + + + Build a RPM package. + + + + + + + Build a Debian package. + + + + + + + + + + Accept default answers to all questions + + + + + + + Set name + + + + + + + Set version + + + + + + + Set architecture + + + + + + + Set release + + + + + + + Set license + + + + + + + Set software group + + + + + + + Set source location + + + + + + + Set alternate source location + + + + + + + The new package will be saved here + + + + + + + The package maintainer (.deb) + + + + + + + Features provided by this package (.rpm) + + + + + + + Pass these flags to the rpm installer + + + + + + + Pass these flags to the dpkg (.deb) installer + + + + + + + .spec file location + + + + + + + Do not include documentacion files + + + + + + + + set debug level + + + + + + + Run an interactive install command + + + + + + + Toggle interactive install command + + + + + + + Run an interactive Slackware installation script + + + + + + + Toggle interactive Slackware installation script + + + + + + + Exclude files/directtories from the package + + + + + + + Toggle the creation of a doinst.sh script + + + + + + + Strip any ELF binaries found inside the package + + + + + + + Where to put documentation files + + + + + + + + Delete doc-pak upon termination + + + + + + + Delete description-pak upon termination + + + + + + + Delete spec file upon termination + + + + + + + Backup any overwritten files + + + + + + + Toggle backup + + + + + + + + + + Show help + + + + + + + Show copyright information + + + + + + + Show version information + + + + + + + WEBSITE + http://asic-linux.com.mx/~izto/checkinstall/index.php + + + AUTHOR + This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). + + + + + + Matt"> + Hope"> + + Apr 8 2002"> + + 1"> + dopey@debian.org"> + + CHECKINSTALL"> + + + Debian GNU/Linux"> + GNU"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2002 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + installation tracker + + + + &dhpackage; + + options + command + + + + + DESCRIPTION + + This manual page was written for the &debian; distribution + because the original program does not have a manual page. + + &dhpackage; is used to build packages from + the `make install' process, which then can be installed or + uninstalled. + + + + OPTIONS + + + + + + + + Build a Slackware package. + + + + + + + Build a RPM package. + + + + + + + Build a Debian package. + + + + + + + + + + Accept default answers to all questions + + + + + + + Set name + + + + + + + Set version + + + + + + + Set architecture + + + + + + + Set release + + + + + + + Set license + + + + + + + Set software group + + + + + + + Set source location + + + + + + + Set alternate source location + + + + + + + The new package will be saved here + + + + + + + The package maintainer (.deb) + + + + + + + Features provided by this package (.rpm) + + + + + + + Pass these flags to the rpm installer + + + + + + + Pass these flags to the dpkg (.deb) installer + + + + + + + location of the .spec file + + + + + + + Do not include documentacion files + + + + + + + + set debug level + + + + + + + Run an interactive install command + + + + + + + Toggle interactive install command + + + + + + + Run an interactive Slackware installation script + + + + + + + Toggle interactive Slackware installation script + + + + + + + Exclude files/directtories from the package + + + + + + + Toggle the creation of a doinst.sh script + + + + + + + Strip any ELF binaries found inside the package + + + + + + + Where to put documentation files + + + + + + + + Delete doc-pak upon termination + + + + + + + Delete description-pak upon termination + + + + + + + Delete spec file upon termination + + + + + + + Backup any overwritten files + + + + + + + Toggle backup + + + + + + + + + + Show help + + + + + + + Show copyright information + + + + + + + Show version information + + + + + + + WEBSITE + http://asic-linux.com.mx/~izto/checkinstall/index.php + + + AUTHOR + This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). + + + + --- checkinstall-1.5.3.orig/debian/checkinstall.1 +++ checkinstall-1.5.3/debian/checkinstall.1 @@ -0,0 +1,148 @@ +.\" $Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/cmd/docbook-to-man.sh,v 1.1.1.1 1998/11/13 21:31:59 db3l Exp $ +.\" +.\" transcript compatibility for postscript use. +.\" +.\" synopsis: .P! +.\" +.de P! +.fl +\!!1 setgray +.fl +\\&.\" +.fl +\!!0 setgray +.fl \" force out current output buffer +\!!save /psv exch def currentpoint translate 0 0 moveto +\!!/showpage{}def +.fl \" prolog +.sy sed -e 's/^/!/' \\$1\" bring in postscript file +\!!psv restore +. +.de pF +.ie \\*(f1 .ds f1 \\n(.f +.el .ie \\*(f2 .ds f2 \\n(.f +.el .ie \\*(f3 .ds f3 \\n(.f +.el .ie \\*(f4 .ds f4 \\n(.f +.el .tm ? font overflow +.ft \\$1 +.. +.de fP +.ie !\\*(f4 \{\ +. ft \\*(f4 +. ds f4\" +' br \} +.el .ie !\\*(f3 \{\ +. ft \\*(f3 +. ds f3\" +' br \} +.el .ie !\\*(f2 \{\ +. ft \\*(f2 +. ds f2\" +' br \} +.el .ie !\\*(f1 \{\ +. ft \\*(f1 +. ds f1\" +' br \} +.el .tm ? font underflow +.. +.ds f1\" +.ds f2\" +.ds f3\" +.ds f4\" +'\" t +.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n +.TH "CHECKINSTALL" "1" +.SH "NAME" +checkinstall \(em generate packages by tracking installation scripts +.SH "SYNOPSIS" +.PP +\fBcheckinstall\fR [options] [command] +.SH "DESCRIPTION" +.PP +This manual page was written for the \fBDebian GNU/Linux\fP distribution +because the original program does not have a manual page. +.PP +\fBcheckinstall\fR is used to build packages from +the `make install' process, which then can be installed or +uninstalled. +.SH "OPTIONS" +.IP "\fB-S\fP " 10 +Build a Slackware package. +.IP "\fB-R\fP " 10 +Build a RPM package. +.IP "\fB-D\fP " 10 +Build a Debian package. +.IP "\fB-y\fP \fB--default\fP " 10 +Accept default answers to all questions +.IP "\fB--pkgname=[name]\fP " 10 +Set name +.IP "\fB--pkgversion=[version]\fP " 10 +Set version +.IP "\fB-A\fP \fB--arch\fP \fB--pkg-arch=[arch]\fP " 10 +Set architecture +.IP "\fB--pkgrelease=[release]\fP " 10 +Set release +.IP "\fB--pkglicense=[license]\fP " 10 +Set license +.IP "\fB--pkggroup=[group]\fP " 10 +Set software group +.IP "\fB--pkgsource=[source]\fP " 10 +Set source location +.IP "\fB--pkgaltsource=[altsource]\fP " 10 +Set alternate source location +.IP "\fB--pakdir=[directory]\fP " 10 +The new package will be saved here +.IP "\fB--maintainer=[email addr]\fP " 10 +The package maintainer (.deb) +.IP "\fB--provides=[list]\fP " 10 +Features provided by this package (.rpm) +.IP "\fB--rpmflags=[flags]\fP " 10 +Pass these flags to the rpm installer +.IP "\fB--dpkgflags=[flags]\fP " 10 +Pass these flags to the dpkg (.deb) installer +.IP "\fB--spec=[path]\fP " 10 +\&.spec file location +.IP "\fB--nodoc\fP " 10 +Do not include documentacion files +.IP "\fB-d[0,1,2]\fP " 10 +set debug level +.IP "\fB-si\fP " 10 +Run an interactive install command +.IP "\fB--showinstall=[yes|no]\fP " 10 +Toggle interactive install command +.IP "\fB-ss\fP " 10 +Run an interactive Slackware installation script +.IP "\fB--showslack=[yes|no]\fP " 10 +Toggle interactive Slackware installation script +.IP "\fB--exclude=[file|dir,[...]]\fP " 10 +Exclude files/directtories from the package +.IP "\fB--autodoinst=[yes|no]\fP " 10 +Toggle the creation of a doinst.sh script +.IP "\fB--strip=[yes|no]\fP " 10 +Strip any ELF binaries found inside the package +.IP "\fB--docdir=[path]\fP " 10 +Where to put documentation files +.IP "\fB--deldoc=[yes|no]\fP " 10 +Delete doc-pak upon termination +.IP "\fB--deldesc=[yes|no]\fP " 10 +Delete description-pak upon termination +.IP "\fB--delspec=[yes|no]\fP " 10 +Delete spec file upon termination +.IP "\fB-bk\fP " 10 +Backup any overwritten files +.IP "\fB--backup=[yes|no]\fP " 10 +Toggle backup +.IP "\fB-h\fP \fB--help\fP " 10 +Show help +.IP "\fB--copywright\fP " 10 +Show copyright information +.IP "\fB--version\fP " 10 +Show version information +.SH "WEBSITE" +.PP +http://asic-linux.com.mx/~izto/checkinstall/index.php +.SH "AUTHOR" +.PP +This manual page was written by Matt Hope dopey@debian.org for +the \fBDebian GNU/Linux\fP system (but may be used by others). +.\" created by instant / docbook-to-man, Sat 06 Mar 2004, 00:35 --- checkinstall-1.5.3.orig/debian/control +++ checkinstall-1.5.3/debian/control @@ -0,0 +1,20 @@ +Source: checkinstall +Section: admin +Priority: optional +Maintainer: Matt Hope +Build-Depends-Indep: debhelper (>= 3.0.0) +Standards-Version: 3.6.2 + +Package: checkinstall +Architecture: all +Depends: installwatch (>> 0.6), file, make +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.5.3.orig/debian/rules +++ checkinstall-1.5.3/debian/rules @@ -0,0 +1,75 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 +export DH_COMPAT=3 + +TMP = $(CURDIR)/debian/checkinstall/ + +build: + +install: + dh_testdir + dh_testroot + dh_installdirs + + install -m755 checkinstall $(TMP)/usr/bin + #install -m755 makepak $(TMP)/usr/bin + install -m644 checkinstallrc $(TMP)/etc/checkinstall + + # fixing config location + perl -pi -e 's#/usr/local/lib/checkinstall/checkinstallrc#/etc/checkinstall#g' $(TMP)/usr/bin/checkinstall + # fixing location of installwatch + perl -pi -e 's#/usr/local#/usr#g' $(TMP)/usr/bin/checkinstall + perl -pi -e 's#/usr/local#/usr#g' $(TMP)/etc/checkinstall + + # Setting default to Debian packages. + perl -pi -e 's#^INSTYPE.*#INSTYPE="D"#' $(TMP)/etc/checkinstall + + # Dont automatically delete files + perl -pi -e 's#^DEL_DOCPAK.*#DEL_DOCPAK=0#' $(TMP)/etc/checkinstall + perl -pi -e 's#^DEL_SPEC.*#DEL_SPEC=0#' $(TMP)/etc/checkinstall + perl -pi -e 's#^DEL_DESC.*#DEL_DESC=0#' $(TMP)/etc/checkinstall + + + # Changing #!/bin/sh to #!/bin/bash as there are bash-isms present. + perl -pi -e 's|#!/bin/sh|#!/bin/bash|g' $(TMP)/usr/bin/checkinstall + + touch install + + +clean: + dh_testdir + -rm -f install + -$(MAKE) clean + -rm -f `find . -name "*~"` + -rm -rf debian/tmp debian/files* core debian/substvars + dh_clean + +binary-arch: + +binary-indep: install + dh_testdir + dh_testroot + dh_installdocs -A README + dh_installmanpages + dh_installchangelogs Changelog + dh_strip + dh_compress + dh_fixperms + dh_installdeb -i +# dh_shlibdeps -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb + + + +binary: binary-indep binary-arch + +.PHONY: binary binary-arch binary-indep clean manpage + + +#requires docbook-to-man (=>2.0.0) +manpage: manpage.sgml + /usr/bin/docbook-to-man manpage.sgml > checkinstall.1 +