Import Debian version 0.10 debian/0.10
authorSteve McIntyre <steve@einval.com>
Fri, 5 Jan 2018 11:47:01 +0000 (11:47 +0000)
committerSteve McIntyre <steve@einval.com>
Fri, 7 Jun 2019 17:53:34 +0000 (18:53 +0100)
apt-update (0.10) stable; urgency=low

  * apt-update should call "apt-get dist-upgrade" for grabbing the package
    list, for consistency.
  * Minor updates for packaging.

22 files changed:
apt-update
build-stamp [deleted file]
debian/apt-update.dirs [new file with mode: 0644]
debian/changelog
debian/compat [new file with mode: 0644]
debian/conffiles
debian/control
debian/copyright
debian/debhelper.log [deleted file]
debian/preinst
debian/rules
debian/source/format [new file with mode: 0644]
debian/tmp/DEBIAN/conffiles [deleted file]
debian/tmp/DEBIAN/control [deleted file]
debian/tmp/DEBIAN/md5sums [deleted file]
debian/tmp/DEBIAN/preinst [deleted file]
debian/tmp/etc/apt/update.conf [deleted file]
debian/tmp/etc/cron.daily/apt-update [deleted file]
debian/tmp/usr/sbin/apt-dist-upgrade [deleted file]
debian/tmp/usr/sbin/apt-update [deleted file]
debian/tmp/usr/share/doc/apt-update/changelog.gz [deleted file]
debian/tmp/usr/share/doc/apt-update/copyright [deleted file]

index 616cfba..5dc7db0 100755 (executable)
@@ -38,7 +38,7 @@ do
   fi
   rm -f $TMPFILE
 
-  THIS_LIST=`$CHR apt-get -s -u upgrade | awk '/^Inst/ {print $2}'`
+  THIS_LIST=`$CHR apt-get -s -u dist-upgrade | awk '/^Inst/ {print $2}'`
   if [ "$THIS_LIST"x != ""x ] ; then
       UPDATE_LIST="$UPDATE_LIST\n$CHROOT:\n"
       for PKG in $THIS_LIST
diff --git a/build-stamp b/build-stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/debian/apt-update.dirs b/debian/apt-update.dirs
new file mode 100644 (file)
index 0000000..89137ca
--- /dev/null
@@ -0,0 +1,3 @@
+etc/cron.daily
+etc/apt
+usr/sbin
index ed052b1..b2b30db 100644 (file)
@@ -1,3 +1,11 @@
+apt-update (0.10) stable; urgency=low
+
+  * apt-update should call "apt-get dist-upgrade" for grabbing the package
+    list, for consistency.
+  * Minor updates for packaging.
+
+ -- Steve McIntyre <steve@einval.com>  Fri, 05 Jan 2018 11:47:01 +0000
+
 apt-update (0.9) stable; urgency=low
 
   * Don't use echo -e; printf is better. (Another place)
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..ec63514
--- /dev/null
@@ -0,0 +1 @@
+9
index 26f9962..e69de29 100644 (file)
@@ -1,2 +0,0 @@
-/etc/apt/update.conf
-/etc/cron.daily/apt-update
index 8931887..7ac193f 100644 (file)
@@ -1,12 +1,13 @@
 Source: apt-update
-Section: base
-Build-Depends-Indep: debhelper
+Section: utils
+Build-Depends: debhelper
 Priority: standard
 Maintainer: Steve McIntyre <steve@einval.com>
-Standards-Version: 3.6.2.1
+Standards-Version: 3.9.8.0
 
 Package: apt-update
 Architecture: all
+Depends: ${misc:Depends}
 Description: Useful apt wrappers
  Cron wrapper for buildd machines
 
index 57cf6a3..df5481f 100644 (file)
@@ -1,5 +1,4 @@
-Copyright (c) 2005- Steve McIntyre
+Copyright (c) 2005-2018 Steve McIntyre
 
-GPL - see /usr/share/common-licenses/GPLv2
+GPL - see /usr/share/common-licenses/GPL-2
 
diff --git a/debian/debhelper.log b/debian/debhelper.log
deleted file mode 100644 (file)
index 16f2741..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-dh_installdirs
-dh_installdocs
-dh_installchangelogs
-dh_movefiles
-dh_strip
-dh_compress
-dh_gencontrol
-dh_installdeb
-dh_fixperms
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installdocs
-dh_installchangelogs
-dh_movefiles
-dh_strip
-dh_compress
-dh_gencontrol
-dh_installdeb
-dh_fixperms
-dh_md5sums
-dh_builddeb
-dh_installdirs
-dh_installdocs
-dh_installchangelogs
-dh_movefiles
-dh_strip
-dh_compress
-dh_gencontrol
-dh_installdeb
-dh_fixperms
-dh_md5sums
-dh_builddeb
index 5f652c1..0060a38 100644 (file)
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+#DEBHELPER#
+
+set -e
+
 OLD=/etc/apt-update-roots
 NEW=/etc/apt/update.conf
 
index 828378a..cb5fc4d 100755 (executable)
 build: build-stamp
 build-stamp:
        dh_testdir
-
        touch build-stamp
 
 clean:
        rm -f debian/files
        find . -name '*~' | xargs rm -vf
+       dh_clean
 
 # Build architecture-independent files here.
+build-indep: build
 binary-indep: build
+build-arch: build
 
 # Build architecture-dependent files here.
-binary-arch: build
+binary: build
 #      dh_testversion
        dh_testdir
        dh_testroot
-       dh_clean -k
-       dh_installdirs -A etc/cron.daily etc/apt usr/sbin
+       dh_prep
+       dh_installdirs
 
-       install -m 755 cron debian/tmp/etc/cron.daily/apt-update
-       install -m 755 apt-update debian/tmp/usr/sbin
-       install -m 755 apt-dist-upgrade debian/tmp/usr/sbin
-       install -m 444 update.conf debian/tmp/etc/apt
+       install -m 755 cron debian/apt-update/etc/cron.daily/apt-update
+       install -m 755 apt-update debian/apt-update/usr/sbin
+       install -m 755 apt-dist-upgrade debian/apt-update/usr/sbin
+       install -m 444 update.conf debian/apt-update/etc/apt
 
        dh_installdocs
        dh_installchangelogs
-       dh_movefiles
        dh_strip
        dh_compress
        dh_gencontrol
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..d3827e7
--- /dev/null
@@ -0,0 +1 @@
+1.0
diff --git a/debian/tmp/DEBIAN/conffiles b/debian/tmp/DEBIAN/conffiles
deleted file mode 100644 (file)
index 26f9962..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/apt/update.conf
-/etc/cron.daily/apt-update
diff --git a/debian/tmp/DEBIAN/control b/debian/tmp/DEBIAN/control
deleted file mode 100644 (file)
index 2635e77..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-Package: apt-update
-Version: 0.8
-Architecture: all
-Maintainer: Steve McIntyre <steve@einval.com>
-Installed-Size: 64
-Section: base
-Priority: standard
-Description: Useful apt wrappers
- Cron wrapper for buildd machines
diff --git a/debian/tmp/DEBIAN/md5sums b/debian/tmp/DEBIAN/md5sums
deleted file mode 100644 (file)
index 0b06a52..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-d890efb3264a5a274185afaac973e251  usr/sbin/apt-dist-upgrade
-a1eee065e0a3f1ffecd18012651d35cb  usr/sbin/apt-update
-3a3cda01a85f4e3ba5b9c76ada8d4916  usr/share/doc/apt-update/changelog.gz
-ecba137529ebdecd0e9196e88a6ba3aa  usr/share/doc/apt-update/copyright
diff --git a/debian/tmp/DEBIAN/preinst b/debian/tmp/DEBIAN/preinst
deleted file mode 100755 (executable)
index 5f652c1..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-OLD=/etc/apt-update-roots
-NEW=/etc/apt/update.conf
-
-if [ ! -f $NEW ] && [ -f $OLD ] ; then
-    echo "Moving config file $OLD to $NEW"
-    mv -f $OLD $NEW
-fi
diff --git a/debian/tmp/etc/apt/update.conf b/debian/tmp/etc/apt/update.conf
deleted file mode 100644 (file)
index af9350d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-CHROOTS="/"
-DOWNLOAD_DEBS="yes"
-MAILTO="postmaster"
diff --git a/debian/tmp/etc/cron.daily/apt-update b/debian/tmp/etc/cron.daily/apt-update
deleted file mode 100755 (executable)
index 992f660..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# apt-update cron job
-#
-# Simple wrapper script for cron to use - check for updated packages
-# and mail admin with any recommended upgrades.
-# 
-# Assumes that apt is configured correctly before we start...
-#
-# Steve McIntyre 26/09/2001
-
-. /etc/apt/update.conf
-
-if [ "$MAILTO"x = ""x ] ; then
-    MAILTO=postmaster
-fi
-
-UPDATE_LIST=`apt-update`
-HOST=`uname -n`
-
-if [ "$UPDATE_LIST"x != ""x ] ; then
-    # Now send mail to the local admin
-    UPDATE_LIST="On $HOST the following packages need upgrading:\n$UPDATE_LIST"
-    echo -e "$UPDATE_LIST" | mail -s "$HOST needs software updates" $MAILTO
-fi
diff --git a/debian/tmp/usr/sbin/apt-dist-upgrade b/debian/tmp/usr/sbin/apt-dist-upgrade
deleted file mode 100755 (executable)
index 9045b85..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# apt-dist-upgrade
-#
-# Simple wrapper script around apt-get; upgrade all of the chroots in
-# one command
-# 
-# Assumes that apt is configured correctly before we start...
-#
-# Steve McIntyre 26/12/2004
-
-LANGUAGE=C
-LANG=C
-LC_ALL=C
-LC_CTYPE=C
-
-export LANGUAGE LANG LC_ALL LC_CTYPE
-
-. /etc/apt/update.conf
-
-for CHROOT in $CHROOTS
-do
-  if [ $CHROOT = / ] ; then
-      CHR=""
-  else
-      CHR="chroot $CHROOT"
-  fi
-  echo "Running apt-get dist-upgrade in $CHROOT"
-  $CHR apt-get $@ dist-upgrade
-  $CHR apt-get clean
-done
diff --git a/debian/tmp/usr/sbin/apt-update b/debian/tmp/usr/sbin/apt-update
deleted file mode 100755 (executable)
index 616cfba..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-#
-# apt-update
-#
-# Simple wrapper script for cron to use - check for updated packages
-# and mail admin with any recommended upgrades.
-# 
-# Assumes that apt is configured correctly before we start...
-#
-# Steve McIntyre 26/09/2001
-
-unset LANGUAGE
-unset LANG
-unset LC_ALL
-
-TMPFILE=/etc/apt/update.tmp
-
-. /etc/apt/update.conf
-
-for CHROOT in $CHROOTS
-do
-  if [ $CHROOT = / ] ; then
-      CHR=""
-  else
-      CHR="chroot $CHROOT"
-  fi
-  $CHR apt-get update > $TMPFILE 2>&1
-  error=$?
-  if [ $error -ne 0 ] ; then
-      echo $CHR update failed with error $error
-      echo
-  fi
-  # And also check for warnings:
-  grep -q ^W $TMPFILE
-  if [ $? -eq 0 ] ; then
-      echo "$CHR update gave the following warnings:"
-      grep ^W $TMPFILE
-  fi
-  rm -f $TMPFILE
-
-  THIS_LIST=`$CHR apt-get -s -u upgrade | awk '/^Inst/ {print $2}'`
-  if [ "$THIS_LIST"x != ""x ] ; then
-      UPDATE_LIST="$UPDATE_LIST\n$CHROOT:\n"
-      for PKG in $THIS_LIST
-      do
-          UPDATE_LIST="$UPDATE_LIST $PKG\n"
-      done
-      CHROOT_UPDATED="$CHROOT_UPDATED $CHROOT"
-  fi
-done
-
-if [ "$UPDATE_LIST"x != ""x ] ; then
-    # If we've been configured to download packages, grab them now
-    # before we finish
-    if [ "$DOWNLOAD_DEBS"x = "yes"x ] ; then
-        for CHROOT in $CHROOT_UPDATED
-            do
-            if [ $CHROOT = / ] ; then
-                CHR=""
-            else
-                CHR="chroot $CHROOT"
-            fi
-            $CHR apt-get -d -y dist-upgrade > /dev/null
-            error=$?
-            if [ $error -ne 0 ] ; then
-                echo $CHR package download failed with error $error
-            fi
-        done
-        UPDATE_LIST="$UPDATE_LIST\n\nPackage(s) downloaded and ready to install\n"
-    fi
-
-    printf "$UPDATE_LIST\n"
-fi
-
diff --git a/debian/tmp/usr/share/doc/apt-update/changelog.gz b/debian/tmp/usr/share/doc/apt-update/changelog.gz
deleted file mode 100644 (file)
index 0033603..0000000
Binary files a/debian/tmp/usr/share/doc/apt-update/changelog.gz and /dev/null differ
diff --git a/debian/tmp/usr/share/doc/apt-update/copyright b/debian/tmp/usr/share/doc/apt-update/copyright
deleted file mode 100644 (file)
index 57cf6a3..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-Copyright (c) 2005- Steve McIntyre
-
-GPL - see /usr/share/common-licenses/GPLv2
-