[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Please unblock apticron 1.1.24



Hi,

I've figured out a stupid issue that would really bother apticron users. It's
fixed in 1.1.24. Please consider unblocking 1.1.24 for lenny. Diff from 1.1.23
is attached.

Thanks,

--
Tiago Bortoletto Vaz
http://tiagovaz.org
0xA504FECA - http://pgp.mit.edu
GNU/Linux user #188687
diff --git a/apticron b/apticron
index 29e6080..d06a791 100755
--- a/apticron
+++ b/apticron
@@ -78,7 +78,7 @@ DISTRIB_ID="Debian"    # Default to Debian
 
 if [ -z "$IPADDRESSES" ] && [ -x /sbin/ip ]; then
 	# Set the IPv4 addresses
-	IPADDRESSES=`(echo $( /bin/hostname -i ) ; 
+	IPADDRESSES=`(echo $( /bin/hostname -i ) ;
 		     /sbin/ip -f inet addr show scope global 2> /dev/null | \
 		     /bin/grep "scope global" |\
 		     /usr/bin/head -$IPADDRESSNUM |\
@@ -126,7 +126,7 @@ done
 
 # packages hold by aptitude don't go to the upgrading candidates list
 for p in $APTITUDE_HOLDS; do
-	PKGNAMES=`echo $PKGNAMES |sed -r "s/(^| )$p( |$)/ /g" |sed -e 's/^ //g'`
+	PKGNAMES=`echo $PKGNAMES |sed "s/\(^\| \)$p\( \|$\)/ /g;s/^ //g"`
 done
 
 # packages already reported won't be reported again if DIFF_ONLY option is marked
@@ -134,7 +134,7 @@ LAST_RUN_FILE="/var/lib/apticron/last_run"
 if [ "$DIFF_ONLY" = "1" ] && [ -e "$LAST_RUN_FILE" ]; then
 	EXTRA_REPORT=" since the last run"
 	for p in `cat $LAST_RUN_FILE`; do
-		PKGNAMES=`echo $PKGNAMES |sed -r "s/(^| )$p( |$)/ /g" |sed -e 's/^ //g'`
+		PKGNAMES=`echo $PKGNAMES |sed "s/\(^\| \)$p\( \|$\)/ /g;s/^ //g"`
 	done
 fi
 
@@ -237,7 +237,7 @@ EOF
 apticron
 EOF
 
-   ) 2>&1 | /usr/bin/mailx -a "Content-type: text/plain; charset=UTF-8" -s "$DISTRIB_ID package updates on `/bin/hostname`" $EMAIL
+   ) 2>&1 | /usr/bin/mailx -a "Content-type: text/plain; charset=UTF-8" -s "$DISTRIB_ID package updates on $SYSTEM" $EMAIL
 
 fi
 
diff --git a/debian/changelog b/debian/changelog
index cb15e14..7a2a3f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+apticron (1.1.24) unstable; urgency=low
+
+  * Add -f option in hostname command in order to show the user the FQDN.
+    Thanks to Sylvain de Tilly <sylvain.detilly@adelux.fr>; (Closes: #497025)
+  * moving from svn to git in collab-main;
+  * debian/control:
+    + add Vcs-Browser: and Vcs-Git: fields;
+  * Fix sed syntax in order to escape regex symbols when comparing packages
+    names;
+  * debian/postrm:
+    + fix lintian warning regarding prepended paths in maintainer scripts.
+
+ -- Tiago Bortoletto Vaz <tiago@debian-ba.org>  Thu, 18 Sep 2008 09:13:11 -0300
+
 apticron (1.1.23) unstable; urgency=low
 
   * Redirecting error to /dev/null when the system has no aptitude installed.
diff --git a/debian/control b/debian/control
index e40c082..bce278e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,8 @@ Maintainer: Tiago Bortoletto Vaz <tiago@debian-ba.org>
 Uploaders: Tassia Camoes Araujo <tassia@debian-ba.org>, Colm MacCarthaigh <colm.maccarthaigh@heanet.ie>
 Build-Depends: debhelper (>= 5), po-debconf
 Standards-Version: 3.8.0
+Vcs-Browser: http://git.debian.org/git/collab-maint/apticron.git
+Vcs-Git: git://git.debian.org/git/collab-maint/apticron.git
 
 Package: apticron
 Architecture: all
diff --git a/debian/postrm b/debian/postrm
index 5c2c4c2..e21c2ea 100755
--- a/debian/postrm
+++ b/debian/postrm
@@ -2,10 +2,8 @@
 
 case "$1" in
     purge)
-	if test -x /usr/bin/ucf ; then
-		/usr/bin/ucf --purge /etc/cron.d/apticron
-		/usr/bin/ucf --purge /etc/apticron/apticron.conf
-	fi
+	ucf --purge /etc/cron.d/apticron
+	ucf --purge /etc/apticron/apticron.conf
 	rm -f /etc/cron.d/apticron /etc/cron.d/apticron.ucf-*
 	rm -f /var/lib/misc/apticron.cron
 	rm -f /etc/apticron/apticron.conf*

Attachment: signature.asc
Description: Digital signature


Reply to: