r3101 - in packages/mbsystem/trunk/debian: . patches

[hamish-guest at alioth.debian.org]

Author: hamish-guest
Date: 2013-06-06 03:45:50 +0000 (Thu, 06 Jun 2013)
New Revision: 3101

Removed:
   packages/mbsystem/trunk/debian/patches/older_autoconf.patch
Modified:
   packages/mbsystem/trunk/debian/changelog
   packages/mbsystem/trunk/debian/patches/series
   packages/mbsystem/trunk/debian/patches/system_proj4.patch
Log:
sync to latest upstream (patch applied)

Modified: packages/mbsystem/trunk/debian/changelog
===================================================================
--- packages/mbsystem/trunk/debian/changelog	2013-06-05 14:52:26 UTC (rev 3100)
+++ packages/mbsystem/trunk/debian/changelog	2013-06-06 03:45:50 UTC (rev 3101)
@@ -1,4 +1,4 @@
-mbsystem (5.4.2097-0) UNRELEASED; urgency=low
+mbsystem (5.4.2098-0) UNRELEASED; urgency=low
 
   * Initial packaging incorporating upstream support for shared libs
   * Split off -dev, -doc, -data packages

Deleted: packages/mbsystem/trunk/debian/patches/older_autoconf.patch
===================================================================
--- packages/mbsystem/trunk/debian/patches/older_autoconf.patch	2013-06-05 14:52:26 UTC (rev 3100)
+++ packages/mbsystem/trunk/debian/patches/older_autoconf.patch	2013-06-06 03:45:50 UTC (rev 3101)
@@ -1,18 +0,0 @@
-Last-Update: 2013-06-02
-Author: Hamish Bowman <hamish_b yahoo.com>
-Applied-Upstream: no
-Forwarded: yes
-Bug-MC: 
-Description: Allow build to continue on Squeeze
-
-
---- a/configure.in	(revision 2083)
-+++ b/configure.in	(working copy)
-@@ -1,6 +1,6 @@
- dnl Process this file with autoconf to produce a configure script.
- dnl configure.in for mbsystem
--AC_PREREQ([2.69])
-+AC_PREREQ([2.67])
- 
- dnl Disable configure caching
- define([AC_CACHE_LOAD], )

Modified: packages/mbsystem/trunk/debian/patches/series
===================================================================
--- packages/mbsystem/trunk/debian/patches/series	2013-06-05 14:52:26 UTC (rev 3100)
+++ packages/mbsystem/trunk/debian/patches/series	2013-06-06 03:45:50 UTC (rev 3101)
@@ -1,2 +1 @@
-older_autoconf.patch
 system_proj4.patch

Modified: packages/mbsystem/trunk/debian/patches/system_proj4.patch
===================================================================
--- packages/mbsystem/trunk/debian/patches/system_proj4.patch	2013-06-05 14:52:26 UTC (rev 3100)
+++ packages/mbsystem/trunk/debian/patches/system_proj4.patch	2013-06-06 03:45:50 UTC (rev 3101)
@@ -6,13 +6,13 @@
 Description: Use Debian's PROJ.4 programs instead of bundled ones
 
 
---- a/src/proj/Makefile.am	(revision 2097)
+--- a/src/proj/Makefile.am	(revision 2098)
 +++ b/src/proj/Makefile.am	(working copy)
 @@ -1,14 +1,14 @@
 -bin_PROGRAMS = proj geod
 +#bin_PROGRAMS = proj geod
  
- AM_CPPFLAGS = -I at top_srcdir@/src
+ AM_CPPFLAGS = -I at top_srcdir@/src/mbio
  
  include_HEADERS = proj_api.h
  
@@ -28,7 +28,7 @@
  
  lib_LTLIBRARIES = libmbproj.la
  
---- a/src/man/man1/Makefile.am	(revision 2083)
+--- a/src/man/man1/Makefile.am	(revision 2098)
 +++ b/src/man/man1/Makefile.am	(working copy)
 @@ -1,4 +1,4 @@
 -man_MANS = geod.1 \
@@ -45,7 +45,7 @@
 +mbvelocitytool.1
  
  EXTRA_DIST = $(man_MANS)
---- a/src/man/man3/Makefile.am	(revision 2083)
+--- a/src/man/man3/Makefile.am	(revision 2098)
 +++ b/src/man/man3/Makefile.am	(working copy)
 @@ -1,4 +1,4 @@
 -man_MANS = mbio.3  pj_init.3