[udunits] 06/07: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jul 28 11:57:00 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository udunits.
commit bdf1fd3740e58876c34b78aa395bd0db83fd8899
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Jul 18 09:33:22 2017 +0100
refresh patches
---
debian/patches/config_fixes.patch | 16 ++++++++--------
debian/patches/pkg-config.patch | 22 +++++++++++-----------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/debian/patches/config_fixes.patch b/debian/patches/config_fixes.patch
index c29e172..41853b4 100644
--- a/debian/patches/config_fixes.patch
+++ b/debian/patches/config_fixes.patch
@@ -3,10 +3,10 @@ Description: Fixes needed to make autoreconf work.
Last-Updated: 2014-03-03
Forwarded: no
-Index: udunits-2.2.19/configure.ac
+Index: udunits-2.2.25/configure.ac
===================================================================
---- udunits-2.2.19.orig/configure.ac
-+++ udunits-2.2.19/configure.ac
+--- udunits-2.2.25.orig/configure.ac
++++ udunits-2.2.25/configure.ac
@@ -127,8 +127,6 @@ AC_PROG_LIBTOOL
AC_CONFIG_FILES([Makefile
@@ -17,10 +17,10 @@ Index: udunits-2.2.19/configure.ac
+ lib/Makefile
prog/Makefile])
AC_OUTPUT
-Index: udunits-2.2.19/lib/Makefile.am
+Index: udunits-2.2.25/lib/Makefile.am
===================================================================
---- udunits-2.2.19.orig/lib/Makefile.am
-+++ udunits-2.2.19/lib/Makefile.am
+--- udunits-2.2.25.orig/lib/Makefile.am
++++ udunits-2.2.25/lib/Makefile.am
@@ -5,7 +5,7 @@
# redistribution conditions.
#
@@ -28,5 +28,5 @@ Index: udunits-2.2.19/lib/Makefile.am
-SUBDIRS = xmlFailures xmlSuccesses
+SUBDIRS =
lib_LTLIBRARIES = libudunits2.la
- EXTRA_DIST = tsearch.c tsearch.h
- libudunits2_la_SOURCES = unitcore.c converter.c formatter.c \
+ libudunits2_la_SOURCES = unitcore.c \
+ converter.c \
diff --git a/debian/patches/pkg-config.patch b/debian/patches/pkg-config.patch
index c62b35f..6b0b41e 100644
--- a/debian/patches/pkg-config.patch
+++ b/debian/patches/pkg-config.patch
@@ -3,10 +3,10 @@ Description: Add pkgconfig file to udunits2
Last-Updated: 2014-03-03
Forwarded: no
-Index: udunits-2.2.4/udunits.pc.in
+Index: udunits-2.2.25/udunits.pc.in
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ udunits-2.2.4/udunits.pc.in 2014-03-04 13:15:27.329647342 +0000
+--- /dev/null
++++ udunits-2.2.25/udunits.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=${prefix}
@@ -18,11 +18,11 @@ Index: udunits-2.2.4/udunits.pc.in
+Libs: -L${libdir} -ludunits2
+Libs.private: -L${libdir} -ludunits2 -lexpat
+CFlags: -I${prefix}/include
-Index: udunits-2.2.4/configure.ac
+Index: udunits-2.2.25/configure.ac
===================================================================
---- udunits-2.2.4.orig/configure.ac 2014-03-04 13:15:27.333647684 +0000
-+++ udunits-2.2.4/configure.ac 2014-03-04 13:15:27.329647342 +0000
-@@ -126,6 +126,7 @@
+--- udunits-2.2.25.orig/configure.ac
++++ udunits-2.2.25/configure.ac
+@@ -126,6 +126,7 @@ AC_CHECK_FUNCS([floor memmove memset mod
AC_PROG_LIBTOOL
AC_CONFIG_FILES([Makefile
@@ -30,11 +30,11 @@ Index: udunits-2.2.4/configure.ac
lib/Makefile
lib/xmlFailures/Makefile
lib/xmlSuccesses/Makefile
-Index: udunits-2.2.4/Makefile.am
+Index: udunits-2.2.25/Makefile.am
===================================================================
---- udunits-2.2.4.orig/Makefile.am 2014-03-04 13:15:27.333647684 +0000
-+++ udunits-2.2.4/Makefile.am 2014-03-04 13:15:58.090514714 +0000
-@@ -67,3 +67,6 @@
+--- udunits-2.2.25.orig/Makefile.am
++++ udunits-2.2.25/Makefile.am
+@@ -68,3 +68,6 @@ udunits2.pdf: version.texi COPYRIGHT
$(srcdir)/version.texi: $(srcdir)/stamp-vti
@cp $(srcdir)/stamp-vti $@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/udunits.git
More information about the debian-science-commits
mailing list