[SM-Commit] GIT changes to master grimoire by George Sherwood (a2cb4703c57ae011d4b75691d267d6fe2ffaec05)

George Sherwood scm at sourcemage.org
Thu Aug 14 13:42:03 EDT 2008


GIT changes to master grimoire by George Sherwood <gsherwood at sourcemage.org>:

 dev/null                                      |binary
 utils/checkinstall/BUILD                      |    2 +-
 utils/checkinstall/DETAILS                    |    2 +-
 utils/checkinstall/HISTORY                    |    6 ++++++
 utils/checkinstall/INSTALL                    |    8 +-------
 utils/checkinstall/PRE_BUILD                  |    6 ++----
 utils/checkinstall/checkinstall-1.6.0.tgz.sig |    0 
 utils/checkinstall/checkinstall-1.6.1.tgz.sig |binary
 8 files changed, 11 insertions(+), 13 deletions(-)

New commits:
commit a2cb4703c57ae011d4b75691d267d6fe2ffaec05
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    checkinstall: Updated to version 1.6.1.  Fix to not install
    installwatch.  Fix install directories.

diff --git a/utils/checkinstall/BUILD b/utils/checkinstall/BUILD
index 27ba77d..8f58e6d 100755
--- a/utils/checkinstall/BUILD
+++ b/utils/checkinstall/BUILD
@@ -1 +1 @@
-true
+make
diff --git a/utils/checkinstall/DETAILS b/utils/checkinstall/DETAILS
index 4207d4b..29645d7 100755
--- a/utils/checkinstall/DETAILS
+++ b/utils/checkinstall/DETAILS
@@ -1,5 +1,5 @@
            SPELL=checkinstall
-         VERSION=1.6.0
+         VERSION=1.6.1
           SOURCE=${SPELL}-${VERSION}.tgz
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
diff --git a/utils/checkinstall/HISTORY b/utils/checkinstall/HISTORY
index 9ec79ce..0f29c11 100644
--- a/utils/checkinstall/HISTORY
+++ b/utils/checkinstall/HISTORY
@@ -1,3 +1,9 @@
+2008-08-14 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 1.6.1
+	* BUILD: added make
+	* INSTALL: Use make install
+	* PRE_BUILD: fix install location.  Do not build installwatch.
+
 2006-07-24 Pol Vinogradov <vin.public at gmail.com>
 	* BUILD, DEPENDS, DETAILS, HISTORY, INSTALL, PRE_BUILD,
 	  checkinstall-1.6.0.tgz.sig: created spell
diff --git a/utils/checkinstall/INSTALL b/utils/checkinstall/INSTALL
index 828d8ff..e6fe4f7 100755
--- a/utils/checkinstall/INSTALL
+++ b/utils/checkinstall/INSTALL
@@ -1,7 +1 @@
-cp checkinstall makepak ${INSTALL_ROOT}/usr/sbin  &&
-mkdir -p ${INSTALL_ROOT}/usr/lib/checkinstall/locale  &&
-mkdir -p ${INSTALL_ROOT}/usr/lib/checkinstall/locale/es/LC_MESSAGES  &&
-cp locale/checkinstall-es.mo ${INSTALL_ROOT}/usr/lib/checkinstall/locale/es/LC_MESSAGES/checkinstall.mo  &&
-mkdir -p ${INSTALL_ROOT}/etc/checkinstall  &&
-cp checkinstallrc-dist ${INSTALL_ROOT}/etc/checkinstall  &&
-install_config_file ${INSTALL_ROOT}/etc/checkinstall/checkinstallrc-dist ${INSTALL_ROOT}/etc/checkinstall/checkinstallrc
+make install
diff --git a/utils/checkinstall/PRE_BUILD b/utils/checkinstall/PRE_BUILD
index 8d9f782..198a125 100755
--- a/utils/checkinstall/PRE_BUILD
+++ b/utils/checkinstall/PRE_BUILD
@@ -1,6 +1,4 @@
 default_pre_build        &&
 cd  ${SOURCE_DIRECTORY}  &&
-sedit "s:/usr/local/lib/checkinstall/checkinstallrc:${INSTALL_ROOT}/etc/checkinstall/checkinstallrc:g" checkinstall  &&
-sedit "s:/usr/doc:${INSTALL_ROOT}/usr/share/doc:g" checkinstall  &&
-sedit "s:/usr:${INSTALL_ROOT}/usr:g" checkinstall  &&
-sedit "s:usr/local:usr:g" checkinstall
+sedit "s:PREFIX=/usr/local:PREFIX=$INSTALL_ROOT/usr:g" Makefile  &&
+sedit "26 d" Makefile
diff --git a/utils/checkinstall/checkinstall-1.6.0.tgz.sig b/utils/checkinstall/checkinstall-1.6.0.tgz.sig
deleted file mode 100644
index 827c6d8..0000000
Binary files a/utils/checkinstall/checkinstall-1.6.0.tgz.sig and /dev/null differ
diff --git a/utils/checkinstall/checkinstall-1.6.1.tgz.sig b/utils/checkinstall/checkinstall-1.6.1.tgz.sig
new file mode 100644
index 0000000..1826c99
Binary files /dev/null and b/utils/checkinstall/checkinstall-1.6.1.tgz.sig differ



More information about the SM-Commit mailing list