summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmdline/apt-get.cc4
-rw-r--r--configure.in2
-rwxr-xr-xdebian/postrm2
-rwxr-xr-xdebian/preinst2
-rwxr-xr-xdebian/prerm2
-rwxr-xr-xdebian/rules8
6 files changed, 13 insertions, 7 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 3cef602fa..93988c1bd 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: apt-get.cc,v 1.100 2001/02/20 07:03:17 jgg Exp $
+// $Id: apt-get.cc,v 1.101 2001/02/21 04:25:20 jgg Exp $
/* ######################################################################
apt-get - Cover for dpkg
@@ -891,7 +891,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
otherwise this is not really an error. */
if (AllowFail == false)
return false;
- ioprintf(c1out,_("Package %s is not installed, so not removed"),Pkg.Name());
+ ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.Name());
return true;
}
diff --git a/configure.in b/configure.in
index c7a431ec7..0dc5083a0 100644
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.4.11")
+AC_DEFINE_UNQUOTED(VERSION,"0.5.0")
AC_DEFINE_UNQUOTED(PACKAGE,"apt")
dnl Check the archs, we want the target type.
diff --git a/debian/postrm b/debian/postrm
index b1bb971d4..bc6fa2890 100755
--- a/debian/postrm
+++ b/debian/postrm
@@ -8,6 +8,8 @@
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
+#DEBHELPER#
+
case "$1" in
purge)
echo -n "Removing APT cache and state files... "
diff --git a/debian/preinst b/debian/preinst
index 141db6e45..276eae5de 100755
--- a/debian/preinst
+++ b/debian/preinst
@@ -26,3 +26,5 @@ if [ "$1" = "upgrade" -o "$1" = "install" -a "$2" != "" ]; then
fi
touch /var/lib/apt/lists/partial/.delete-me-later || true
fi
+
+#DEBHELPER#
diff --git a/debian/prerm b/debian/prerm
index 64b3635c5..ac70a0279 100755
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,5 +1,7 @@
#! /bin/sh
+#DEBHELPER#
+
if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ] &&
dpkg --compare-versions "$2" "<<" 0.4.10
then
diff --git a/debian/rules b/debian/rules
index 13912e9f7..7c25a6618 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
# Made with the aid of dh_make, by Craig Small
# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
# Some lines taken from debmake, by Christoph Lameter.
-# $Id: rules,v 1.24 2001/02/20 07:03:17 jgg Exp $
+# $Id: rules,v 1.25 2001/02/21 04:25:20 jgg Exp $
# LD_LIBRARY_PATH=pwd/debian/tmp/usr/lib dh_shlibdeps -papt
# dpkg: /home/jgg/work/apt2/debian/tmp/usr/lib/libapt-pkg.so.2.9 not found.
@@ -279,15 +279,15 @@ binary: binary-indep binary-arch
cvs-build:
rm -rf debian/cvs-build
cvs update
- buildlib/mkChangeLog
+ #buildlib/mkChangeLog
$(MAKE) startup
$(MAKE) doc
- tar c --exclude CVS --exclude debian/cvs-build . |\
+ tar c --exclude CVS --exclude cvs-build . |\
(mkdir -p debian/cvs-build/apt-$(APT_DEBVER);cd debian/cvs-build/apt-$(APT_DEBVER);tar x)
# The next line isn't needed, as debuild will make the .tar.gz for us.
# (cd debian/cvs-build;tar zcf apt_$(APT_DEBVER).tar.gz apt-$(APT_DEBVER))
(cd debian/cvs-build/apt-$(APT_DEBVER);$(DEB_BUILD_PROG))
- rm ChangeLog
+ #rm ChangeLog
cvs-mkul:
-mkdir -p ../upload-$(APT_DEBVER)