[arch-commits] Commit in dnsmasq/repos (3 files)

[Eric Belanger]

    Date: Tuesday, July 22, 2008 @ 16:16:49
  Author: eric
Revision: 6018

Merged revisions 3635-6017 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/dnsmasq/trunk

........
  r5365 | paul | 2008-07-15 13:00:58 -0400 (Tue, 15 Jul 2008) | 2 lines
  
  upgpkg: dnsmasq 2.43-1
      update to 2.43
........
  r5974 | paul | 2008-07-21 17:20:45 -0400 (Mon, 21 Jul 2008) | 2 lines
  
  upgpkg: dnsmasq 2.43-2
      update to 2.43, fix message to be only on install, not on upgrade
........
  r5980 | paul | 2008-07-22 08:17:56 -0400 (Tue, 22 Jul 2008) | 2 lines
  
  upgpkg: dnsmasq 2.45-1
      update to 2.45
........

Modified:
  dnsmasq/repos/extra-x86_64/	(properties)
  dnsmasq/repos/extra-x86_64/PKGBUILD
  dnsmasq/repos/extra-x86_64/dnsmasq.install

-----------------+
 PKGBUILD        |    4 ++--
 dnsmasq.install |   13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)


Property changes on: dnsmasq/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /dnsmasq/trunk:1-3634
   + /dnsmasq/trunk:1-6017

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-22 19:26:22 UTC (rev 6017)
+++ extra-x86_64/PKGBUILD	2008-07-22 20:16:49 UTC (rev 6018)
@@ -3,7 +3,7 @@
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=dnsmasq
-pkgver=2.42
+pkgver=2.45
 pkgrel=1
 pkgdesc="A lightweight DNS/DHCP server ideal for small/home networks using NAT"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 depends=('glibc' 'bash')
 backup=(etc/dnsmasq.conf)
-md5sums=('78a23a31a35b8427a8589b76c1ae3ff6' 'e956eee1ec24212a3254d2b168187495'\
+md5sums=('b7956e15c9766e05b3eca3ce88fdb616' 'e956eee1ec24212a3254d2b168187495'\
          'ef61cd6c3ce1fd0767a98b02975c9c9c')
 install=$pkgname.install
 

Modified: extra-x86_64/dnsmasq.install
===================================================================
--- extra-x86_64/dnsmasq.install	2008-07-22 19:26:22 UTC (rev 6017)
+++ extra-x86_64/dnsmasq.install	2008-07-22 20:16:49 UTC (rev 6018)
@@ -1,11 +1,5 @@
 # arg 1: the new package version
 post_install() {
-	/bin/true
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
 	echo "=========================================================="
 	echo "| IMPORTANT: Unless you want to run dnsmasq as root, you |"
 	echo "|     must either enable CONFIG_SECURITY_CAPABILITIES in |"
@@ -14,8 +8,15 @@
 	echo "| For more details on configuring dnsmasq, visit:        |"
 	echo "|     http://www.thekelleys.org.uk/dnsmasq/doc.html      |"
 	echo "=========================================================="
+	/bin/true
 }
 
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+	/bin/true
+}
+
 # arg 1: the old package version
 pre_remove() {
 	/bin/true