0.5.0 readyness

Author: jgg
Date: 2001-02-21 04:25:20 GMT
0.5.0 readyness

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 3cef602fa1fa0f1709c67abe1022c6b36f074081..93988c1bdda54f7997db433dba301ca7188d1e35 100644 (file)
--- 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 c7a431ec74de8ce4454227e111059c385719b990..0dc5083a0228ad06b035f07271d725cf8a10a641 100644 (file)
--- 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 b1bb971d4976cea0a48e6ae85d7094e6cfcf883b..bc6fa28905ebfbabca342d281ed8aa7caf8484ac 100755 (executable)
--- 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 141db6e451a159908a174bdda4204fce9d6f117c..276eae5de0e940d0e6d0fb214111f642b681f6f6 100755 (executable)
--- 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 64b3635c5a215134cb7ab33ed9a99a7d6111ff2e..ac70a0279e4d18052097c220025cf67880ca6da5 100755 (executable)
--- 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 13912e9f70c54756099c0df10ffb9b1e1a36736e..7c25a661897b1763db3c026dab82c1fd6bc000c0 100755 (executable)
--- 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)