[hamradio-commits] [xastir] 01/04: Updated patches for new upstream

[Iain Learmonth]

This is an automated email from the git hooks/post-receive script.

irl-guest pushed a commit to branch master
in repository xastir.

commit f1ac9cb558018b5921f88d36e24ae596a28f53e8
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Fri Nov 21 20:32:34 2014 +0000

    Updated patches for new upstream
---
 debian/patches/geotiff_directory.patch | 10 +++++-----
 debian/patches/link.patch              | 10 +++++-----
 debian/patches/simple_db.patch         | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/debian/patches/geotiff_directory.patch b/debian/patches/geotiff_directory.patch
index 8ae520d..75ddc25 100644
--- a/debian/patches/geotiff_directory.patch
+++ b/debian/patches/geotiff_directory.patch
@@ -1,6 +1,6 @@
 Debian put geotiff headers into subdirectory
---- a/acinclude.m4
-+++ b/acinclude.m4
+--- xastir.orig/acinclude.m4
++++ xastir/acinclude.m4
 @@ -37,6 +37,8 @@
  [
  AC_MSG_CHECKING([for search paths])
@@ -10,9 +10,9 @@ Debian put geotiff headers into subdirectory
  test -d /usr/local/include && CPPFLAGS="-I/usr/local/include $CPPFLAGS"
  test -d /usr/local/lib && LDFLAGS="-L/usr/local/lib $LDFLAGS"
  
---- a/configure
-+++ b/configure
-@@ -5457,6 +5457,8 @@
+--- xastir.orig/configure
++++ xastir/configure
+@@ -5492,6 +5492,8 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for search paths" >&5
  $as_echo_n "checking for search paths... " >&6; }
  
diff --git a/debian/patches/link.patch b/debian/patches/link.patch
index 2a60e3f..804ca8e 100644
--- a/debian/patches/link.patch
+++ b/debian/patches/link.patch
@@ -1,6 +1,6 @@
 Remove manual linking to allow dh_link for debian packaging.
---- a/Makefile.am
-+++ b/Makefile.am
+--- xastir.orig/Makefile.am
++++ xastir/Makefile.am
 @@ -75,9 +75,9 @@
  	-rm -rf $(DESTDIR)${pkgdatadir}/doc
  
@@ -14,9 +14,9 @@ Remove manual linking to allow dh_link for debian packaging.
   
  mandir=${prefix}/share/man
  man_MANS=xastir.1 callpass.1 xastir_udp_client.1 testdbfawk.1
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1052,9 +1052,9 @@
+--- xastir.orig/Makefile.in
++++ xastir/Makefile.in
+@@ -1135,9 +1135,9 @@
  	-rm -rf $(DESTDIR)${pkgdatadir}/doc
  
  install-data-hook:
diff --git a/debian/patches/simple_db.patch b/debian/patches/simple_db.patch
index ab54650..b40161d 100644
--- a/debian/patches/simple_db.patch
+++ b/debian/patches/simple_db.patch
@@ -1,12 +1,12 @@
 Description: Move simple db entry to front of list to use as default.
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -1014,7 +1014,7 @@
+--- xastir.orig/acinclude.m4
++++ xastir/acinclude.m4
+@@ -1017,7 +1017,7 @@
  # to specify the function call with the full prototype for it to be found.
          BDB_LIB_FOUND="none"
          AC_MSG_CHECKING([for a library containing db_create])
--        for dbname in db-4.9 db4.9 db49 db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
-+        for dbname in db db-4.9 db4.9 db49 db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4
+-        for dbname in db-5.3 db5.3 db53 db-5.2 db5.2 db52 db-5.1 db5.1 db51 db-5.0 db5.0 db50 db-4.9 db4.9 db49 db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
++        for dbname in db db-5.3 db5.3 db53 db-5.2 db5.2 db52 db-5.1 db5.1 db51 db-5.0 db5.0 db50 db-4.9 db4.9 db49 db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4
            do
  	    LIBS="$saved_LIBS -l$dbname"
  	    AC_TRY_LINK(

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/xastir.git