[Pkg-pulseaudio-devel] r104 - in /libasyncns/trunk/debian: changelog control libasyncns0.docs patches/ patches/00list patches/01_resolv-configure-check.dpatch rules

[neurocyte-guest at users.alioth.debian.org]

Author: neurocyte-guest
Date: Tue Feb 20 02:37:11 2007
New Revision: 104

URL: http://svn.debian.org/wsvn/pkg-pulseaudio/?sc=1&rev=104
Log:
Add res_query configure check patch. Add version info to shlibs. Ship upstream README.

Added:
    libasyncns/trunk/debian/libasyncns0.docs
    libasyncns/trunk/debian/patches/
    libasyncns/trunk/debian/patches/00list
    libasyncns/trunk/debian/patches/01_resolv-configure-check.dpatch
Modified:
    libasyncns/trunk/debian/changelog
    libasyncns/trunk/debian/control
    libasyncns/trunk/debian/rules

Modified: libasyncns/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/libasyncns/trunk/debian/changelog?rev=104&op=diff
==============================================================================
--- libasyncns/trunk/debian/changelog (original)
+++ libasyncns/trunk/debian/changelog Tue Feb 20 02:37:11 2007
@@ -1,3 +1,13 @@
+libasyncns (0.2-2) unstable; urgency=low
+
+  * debian/patches/01_resolv-configure-check.dpatch:
+    + Added. Fixes res_query configure check to work properly on amd64.
+      Submitted by Sjoerd Simmons. (Closes: #411582)
+  * debian/rules: Added version info to shlibs because 0.2 added new symbols.
+  * debian/libasyncns0.docs: Ship upstream README file.
+
+ -- CJ van den Berg <cj at vdbonline.com>  Tue, 20 Feb 2007 02:28:55 +0100
+
 libasyncns (0.2-1) unstable; urgency=low
 
   * New upstream version. Adds res_query() support.

Modified: libasyncns/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/libasyncns/trunk/debian/control?rev=104&op=diff
==============================================================================
--- libasyncns/trunk/debian/control (original)
+++ libasyncns/trunk/debian/control Tue Feb 20 02:37:11 2007
@@ -1,7 +1,8 @@
 Source: libasyncns
 Priority: optional
 Maintainer: CJ van den Berg <cj at vdbonline.com>
-Build-Depends: debhelper (>= 5), autotools-dev
+Build-Depends: debhelper (>= 5), autotools-dev, dpatch, autoconf
+Build-Conflicts: autoconf2.13
 Standards-Version: 3.7.2
 Section: libs
 

Added: libasyncns/trunk/debian/libasyncns0.docs
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/libasyncns/trunk/debian/libasyncns0.docs?rev=104&op=file
==============================================================================
--- libasyncns/trunk/debian/libasyncns0.docs (added)
+++ libasyncns/trunk/debian/libasyncns0.docs Tue Feb 20 02:37:11 2007
@@ -1,0 +1,1 @@
+README

Added: libasyncns/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/libasyncns/trunk/debian/patches/00list?rev=104&op=file
==============================================================================
--- libasyncns/trunk/debian/patches/00list (added)
+++ libasyncns/trunk/debian/patches/00list Tue Feb 20 02:37:11 2007
@@ -1,0 +1,1 @@
+01_resolv-configure-check.dpatch

Added: libasyncns/trunk/debian/patches/01_resolv-configure-check.dpatch
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/libasyncns/trunk/debian/patches/01_resolv-configure-check.dpatch?rev=104&op=file
==============================================================================
--- libasyncns/trunk/debian/patches/01_resolv-configure-check.dpatch (added)
+++ libasyncns/trunk/debian/patches/01_resolv-configure-check.dpatch Tue Feb 20 02:37:11 2007
@@ -1,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_resolv-configure-check.dpatch.dpatch by  <sjoerd at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix resolv.h configure check.
+
+ at DPATCH@
+
+Index: libasyncns/configure.ac
+===================================================================
+--- libasyncns/configure.ac	(revision 30)
++++ libasyncns/configure.ac	(working copy)
+@@ -96,8 +96,16 @@
+ 
+ AC_CHECK_FUNC(res_query, , 
+   [AC_CHECK_LIB(resolv, res_query, [], 
+-    [ AC_CHECK_LIB(bind, res_query, 
+-                   [], [ AC_MSG_ERROR(res_query not found) ] ) ] )
++    [ save_libs="$LIBS"
++      LIBS="-lresolv $LIBS"
++      AC_MSG_CHECKING([for res_query in -lresolv (alternate version)])
++      AC_LINK_IFELSE(
++        [AC_LANG_PROGRAM([[#include <resolv.h>]], [[res_query(0,0,0,0,0)]])], 
++        [ AC_MSG_RESULT(yes) ],  
++        [ AC_MSG_RESULT(no)
++          LIBS="$save_libs"
++          AC_CHECK_LIB(bind, res_query, 
++            [], [ AC_MSG_ERROR(res_query not found) ] ) ] ) ] )
+   ]
+ )
+ 

Modified: libasyncns/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/libasyncns/trunk/debian/rules?rev=104&op=diff
==============================================================================
--- libasyncns/trunk/debian/rules (original)
+++ libasyncns/trunk/debian/rules Tue Feb 20 02:37:11 2007
@@ -19,8 +19,9 @@
 	CONFIGURE_FLAGS += --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
 endif
 
-config.status: configure
+config.status: patch-stamp configure
 	dh_testdir
+	autoconf
 	./configure $(CONFIGURE_FLAGS)
 
 build: build-stamp
@@ -43,6 +44,15 @@
 endif
 	dh_clean 
 
+patch: patch-stamp
+patch-stamp:
+	dpatch apply-all
+	touch patch-stamp
+
+unpatch:
+	dpatch deapply-all
+	rm -rf patch-stamp debian/patched
+
 install: build
 	dh_testdir
 	dh_testroot
@@ -63,7 +73,7 @@
 	dh_strip
 	dh_compress 
 	dh_fixperms
-	dh_makeshlibs
+	dh_makeshlibs --version-info
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
@@ -71,4 +81,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install patch