[readosm] 04/13: Refresh patches.
Bas Couwenberg
sebastic at xs4all.nl
Sun Dec 14 21:21:55 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository readosm.
commit bd8ff45bbe62a335025cbb19918636211f268b2f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Dec 14 20:10:52 2014 +0100
Refresh patches.
---
debian/changelog | 1 +
debian/patches/00-disable_tests.patch | 22 +++++++++++-----------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e24600e..966e7e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ readosm (1.0.0b+dfsg1-4) UNRELEASED; urgency=low
* Bump Standards-Version to 3.9.6, no changes required.
* Add upstream metadata.
* Add gbp.conf to use pristine-tar by default.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at xs4all.nl> Sat, 29 Nov 2014 00:13:59 +0100
diff --git a/debian/patches/00-disable_tests.patch b/debian/patches/00-disable_tests.patch
index 64a811a..c0d3ed1 100644
--- a/debian/patches/00-disable_tests.patch
+++ b/debian/patches/00-disable_tests.patch
@@ -10,8 +10,8 @@ Forwarded: no
configure.ac | 1 -
4 files changed, 3 insertions(+), 5 deletions(-)
---- readosm.orig/Makefile.am
-+++ readosm/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
@@ -1,6 +1,6 @@
ACLOCAL_AMFLAGS = -I m4
@@ -20,9 +20,9 @@ Forwarded: no
EXTRA_DIST = makefile.vc nmake.opt mainpage.doxy
---- readosm.orig/Makefile.in
-+++ readosm/Makefile.in
-@@ -250,7 +250,7 @@ top_build_prefix = @top_build_prefix@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -348,7 +348,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
@@ -31,9 +31,9 @@ Forwarded: no
EXTRA_DIST = makefile.vc nmake.opt mainpage.doxy
AUTOMAKE_OPTIONS = dist-zip
pkgconfigdir = $(libdir)/pkgconfig
---- readosm.orig/configure
-+++ readosm/configure
-@@ -16757,7 +16757,7 @@ if test "x$enable_gcov" = "xyes"; then
+--- a/configure
++++ b/configure
+@@ -16848,7 +16848,7 @@ if test "x$enable_gcov" = "xyes"; then
GCOV_FLAGS="-lgcov"
fi
@@ -42,7 +42,7 @@ Forwarded: no
-@@ -18010,7 +18010,6 @@ do
+@@ -18096,7 +18096,6 @@ do
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"headers/Makefile") CONFIG_FILES="$CONFIG_FILES headers/Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
@@ -50,8 +50,8 @@ Forwarded: no
"examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
"Doxyfile") CONFIG_FILES="$CONFIG_FILES Doxyfile" ;;
"readosm.pc") CONFIG_FILES="$CONFIG_FILES readosm.pc" ;;
---- readosm.orig/configure.ac
-+++ readosm/configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -55,7 +55,6 @@ fi
AC_CONFIG_FILES([Makefile \
headers/Makefile \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/readosm.git
More information about the Pkg-grass-devel
mailing list