This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository mbsystem.
commit 9dc53aa1e0e9da8300ece2370ad45ec13dc94286
Author: M. Hamish Bowman <hamis...@yahoo.com>
Date: Thu Jun 6 03:45:50 2013 +0000
sync to latest upstream (patch applied)
---
debian/changelog | 2 +-
debian/patches/older_autoconf.patch | 18 ------------------
debian/patches/series | 1 -
debian/patches/system_proj4.patch | 8 ++++----
4 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 29b568f..00c969b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/patches/older_autoconf.patch
b/debian/patches/older_autoconf.patch
deleted file mode 100644
index 4f66799..0000000
--- a/debian/patches/older_autoconf.patch
+++ /dev/null
@@ -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], )
diff --git a/debian/patches/series b/debian/patches/series
index 3d2c668..3ca62fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-older_autoconf.patch
system_proj4.patch
diff --git a/debian/patches/system_proj4.patch
b/debian/patches/system_proj4.patch
index c082393..5984b05 100644
--- a/debian/patches/system_proj4.patch
+++ b/debian/patches/system_proj4.patch
@@ -6,13 +6,13 @@ Bug-MC:
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@top_srcdir@/src
+ AM_CPPFLAGS = -I@top_srcdir@/src/mbio
include_HEADERS = proj_api.h
@@ -28,7 +28,7 @@ Description: Use Debian's PROJ.4 programs instead of bundled
ones
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 @@ Description: Use Debian's PROJ.4 programs instead of bundled
ones
+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
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/mbsystem.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
