Attachment 685218 Details for Bug 902862 – Patch to update to snapshot 121130

[patch] Patch to update to snapshot 121130

update-to-snapshot-121130.patch (text/plain), 33.87 KB, created by Jonathan Underwood on 2013-01-22 14:39:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Underwood

Created: 2013-01-22 14:39:16 UTC

Size: 33.87 KB

patch

obsolete

>diff --git a/.gitignore b/.gitignore
>index 3b05550..e215658 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1 +1,2 @@
> /gts-snapshot-111025.tar.gz
>+/gts-snapshot-121130.tar.gz
>diff --git a/gts-snapshot-121130.patch b/gts-snapshot-121130.patch
>new file mode 100644
>index 0000000..6cb7c3e
>--- /dev/null
>+++ b/gts-snapshot-121130.patch
>@@ -0,0 +1,860 @@
>+diff -up gts-snapshot-121130/acinclude.m4.bu gts-snapshot-121130/acinclude.m4
>+--- gts-snapshot-121130/acinclude.m4.bu	2012-11-30 00:17:36.000000000 +0000
>++++ gts-snapshot-121130/acinclude.m4	2013-01-21 17:26:32.583909541 +0000
>+@@ -5,7 +5,7 @@ dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTI
>+ dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
>+ dnl gthread is specified in MODULES, pass to glib-config
>+ dnl
>+-AC_DEFUN(AM_PATH_GLIB,
>++AC_DEFUN([AM_PATH_GLIB],
>+ [dnl 
>+ dnl Get the cflags and libraries from the glib-config script
>+ dnl
>+@@ -194,4 +194,3 @@ main ()
>+   AC_SUBST(GLIB_LIBS)
>+   rm -f conf.glibtest
>+ ])
>+-
>+diff -up gts-snapshot-121130/aclocal.m4.bu gts-snapshot-121130/aclocal.m4
>+--- gts-snapshot-121130/aclocal.m4.bu	2012-11-30 00:17:39.000000000 +0000
>++++ gts-snapshot-121130/aclocal.m4	2013-01-21 17:26:32.587967682 +0000
>+@@ -112,14 +112,14 @@ dnl
>+ int 
>+ main ()
>+ {
>+-  int major, minor, micro;
>++  unsigned int major, minor, micro;
>+   char *tmp_version;
>+ 
>+-  system ("touch conf.glibtest");
>++  fclose (fopen ("conf.glibtest", "w"));
>+ 
>+   /* HP/UX 9 (%@#!) writes to sscanf strings */
>+   tmp_version = g_strdup("$min_glib_version");
>+-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
>++  if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, &micro) != 3) {
>+      printf("%s, bad version string\n", "$min_glib_version");
>+      exit(1);
>+    }
>+@@ -158,9 +158,9 @@ main ()
>+        }
>+      else
>+       {
>+-        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
>++        printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n",
>+                glib_major_version, glib_minor_version, glib_micro_version);
>+-        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
>++        printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n",
>+ 	       major, minor, micro);
>+         printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
>+         printf("***\n");
>+@@ -2837,10 +2837,14 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
>+   # before this can be enabled.
>+   hardcode_into_libs=yes
>+ 
>++  # Add ABI-specific directories to the system library path.
>++  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
>++
>+   # Append ld.so.conf contents to the search path
>+   if test -f /etc/ld.so.conf; then
>+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
>+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
>++    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
>++
>+   fi
>+ 
>+   # We used to test for /lib/ld.so.1 and disable shared libraries on
>+@@ -8659,6 +8663,7 @@ m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT
>+ m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
>+ 
>+ # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
>++# serial 1 (pkg-config-0.24)
>+ # 
>+ # Copyright Â© 2004 Scott James Remnant <scott@netsplit.com>.
>+ #
>+@@ -8686,7 +8691,10 @@ m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_L
>+ AC_DEFUN([PKG_PROG_PKG_CONFIG],
>+ [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
>+ m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
>+-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
>++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
>++AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
>++AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
>++
>+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
>+ 	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
>+ fi
>+@@ -8699,7 +8707,6 @@ if test -n "$PKG_CONFIG"; then
>+ 		AC_MSG_RESULT([no])
>+ 		PKG_CONFIG=""
>+ 	fi
>+-		
>+ fi[]dnl
>+ ])# PKG_PROG_PKG_CONFIG
>+ 
>+@@ -8708,34 +8715,31 @@ fi[]dnl
>+ # Check to see whether a particular set of modules exists.  Similar
>+ # to PKG_CHECK_MODULES(), but does not set variables or print errors.
>+ #
>+-#
>+-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
>+-# this or PKG_CHECK_MODULES is called, or make sure to call
>+-# PKG_CHECK_EXISTS manually
>++# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
>++# only at the first occurence in configure.ac, so if the first place
>++# it's called might be skipped (such as if it is within an "if", you
>++# have to call PKG_CHECK_EXISTS manually
>+ # --------------------------------------------------------------
>+ AC_DEFUN([PKG_CHECK_EXISTS],
>+ [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
>+ if test -n "$PKG_CONFIG" && \
>+     AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
>+-  m4_ifval([$2], [$2], [:])
>++  m4_default([$2], [:])
>+ m4_ifvaln([$3], [else
>+   $3])dnl
>+ fi])
>+ 
>+-
>+ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
>+ # ---------------------------------------------
>+ m4_define([_PKG_CONFIG],
>+-[if test -n "$PKG_CONFIG"; then
>+-    if test -n "$$1"; then
>+-        pkg_cv_[]$1="$$1"
>+-    else
>+-        PKG_CHECK_EXISTS([$3],
>+-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
>+-			 [pkg_failed=yes])
>+-    fi
>+-else
>+-	pkg_failed=untried
>++[if test -n "$$1"; then
>++    pkg_cv_[]$1="$$1"
>++ elif test -n "$PKG_CONFIG"; then
>++    PKG_CHECK_EXISTS([$3],
>++                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
>++		     [pkg_failed=yes])
>++ else
>++    pkg_failed=untried
>+ fi[]dnl
>+ ])# _PKG_CONFIG
>+ 
>+@@ -8777,16 +8781,17 @@ and $1[]_LIBS to avoid the need to call 
>+ See the pkg-config man page for more details.])
>+ 
>+ if test $pkg_failed = yes; then
>++   	AC_MSG_RESULT([no])
>+         _PKG_SHORT_ERRORS_SUPPORTED
>+         if test $_pkg_short_errors_supported = yes; then
>+-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
>++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
>+         else 
>+-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
>++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
>+         fi
>+ 	# Put the nasty error message in config.log where it belongs
>+ 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
>+ 
>+-	ifelse([$4], , [AC_MSG_ERROR(dnl
>++	m4_default([$4], [AC_MSG_ERROR(
>+ [Package requirements ($2) were not met:
>+ 
>+ $$1_PKG_ERRORS
>+@@ -8794,25 +8799,24 @@ $$1_PKG_ERRORS
>+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
>+ installed software in a non-standard prefix.
>+ 
>+-_PKG_TEXT
>+-])],
>+-		[AC_MSG_RESULT([no])
>+-                $4])
>++_PKG_TEXT])
>++        ])
>+ elif test $pkg_failed = untried; then
>+-	ifelse([$4], , [AC_MSG_FAILURE(dnl
>++     	AC_MSG_RESULT([no])
>++	m4_default([$4], [AC_MSG_FAILURE(
>+ [The pkg-config script could not be found or is too old.  Make sure it
>+ is in your PATH or set the PKG_CONFIG environment variable to the full
>+ path to pkg-config.
>+ 
>+ _PKG_TEXT
>+ 
>+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
>+-		[$4])
>++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
>++        ])
>+ else
>+ 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
>+ 	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
>+         AC_MSG_RESULT([yes])
>+-	ifelse([$3], , :, [$3])
>++	$3
>+ fi[]dnl
>+ ])# PKG_CHECK_MODULES
>+ 
>+diff -up gts-snapshot-121130/configure.ac.bu gts-snapshot-121130/configure.ac
>+--- gts-snapshot-121130/configure.ac.bu	2012-11-30 00:17:36.000000000 +0000
>++++ gts-snapshot-121130/configure.ac	2013-01-21 17:26:50.919907713 +0000
>+@@ -59,10 +59,6 @@ AM_MAINTAINER_MODE
>+ 
>+ AC_PROG_CC
>+ 
>+-if test x$GCC = xyes ; then
>+-  CFLAGS="$CFLAGS -Wall -Werror-implicit-function-declaration -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations"
>+-fi
>+-
>+ AC_PROG_AWK
>+ AC_ISC_POSIX
>+ AC_HEADER_STDC
>+@@ -241,9 +237,9 @@ __EOF
>+ 
>+ dnl checking for #warning cpp directive
>+ AC_TRY_COMPILE(,
>+-       "{
>++       [
>+            #warning test
>+-	}", 
>++       ], 
>+ 	AC_DEFINE(CPP_HAS_WARNING, 1, 
>+ 	[Define if C preprocessor supports warning directive.]),
>+ 	AC_MSG_WARN(["C preprocessor does not support warning directive."]))
>+@@ -271,6 +267,5 @@ test/Makefile
>+ test/boolean/Makefile
>+ test/delaunay/Makefile
>+ test/coarsen/Makefile
>+-debian/Makefile
>+ ])
>+ AC_OUTPUT
>+diff -up gts-snapshot-121130/configure.bu gts-snapshot-121130/configure
>+--- gts-snapshot-121130/configure.bu	2012-11-30 00:17:43.000000000 +0000
>++++ gts-snapshot-121130/configure	2013-01-21 17:26:32.591935074 +0000
>+@@ -626,6 +626,8 @@ GOBJECT_QUERY
>+ GLIB_GENMARSHAL
>+ GLIB_LIBS
>+ GLIB_CFLAGS
>++PKG_CONFIG_LIBDIR
>++PKG_CONFIG_PATH
>+ PKG_CONFIG
>+ HAS_NETPBM_FALSE
>+ HAS_NETPBM_TRUE
>+@@ -772,7 +774,9 @@ LDFLAGS
>+ LIBS
>+ CPPFLAGS
>+ CPP
>+-PKG_CONFIG'
>++PKG_CONFIG
>++PKG_CONFIG_PATH
>++PKG_CONFIG_LIBDIR'
>+ 
>+ 
>+ # Initialize some variables set by options.
>+@@ -1424,6 +1428,10 @@ Some influential environment variables:
>+               you have headers in a nonstandard directory <include dir>
>+   CPP         C preprocessor
>+   PKG_CONFIG  path to pkg-config utility
>++  PKG_CONFIG_PATH
>++              directories to add to pkg-config's search path
>++  PKG_CONFIG_LIBDIR
>++              path overriding pkg-config's built-in search path
>+ 
>+ Use these variables to override the choices made by `configure' or to help
>+ it to find libraries and programs with nonstandard names/locations.
>+@@ -10291,10 +10299,14 @@ fi
>+   # before this can be enabled.
>+   hardcode_into_libs=yes
>+ 
>++  # Add ABI-specific directories to the system library path.
>++  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
>++
>+   # Append ld.so.conf contents to the search path
>+   if test -f /etc/ld.so.conf; then
>+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
>+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
>++    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
>++
>+   fi
>+ 
>+   # We used to test for /lib/ld.so.1 and disable shared libraries on
>+@@ -11967,10 +11979,6 @@ fi
>+ 
>+ 
>+ 
>+-if test x$GCC = xyes ; then
>+-  CFLAGS="$CFLAGS -Wall -Werror-implicit-function-declaration -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations"
>+-fi
>+-
>+ for ac_prog in gawk mawk nawk awk
>+ do
>+   # Extract the first word of "$ac_prog", so it can be a program name with args.
>+@@ -12292,6 +12300,10 @@ fi
>+ 
>+ 
>+ 
>++
>++
>++
>++
>+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
>+ 	if test -n "$ac_tool_prefix"; then
>+   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
>+@@ -12404,7 +12416,6 @@ $as_echo "yes" >&6; }
>+ $as_echo "no" >&6; }
>+ 		PKG_CONFIG=""
>+ 	fi
>+-
>+ fi
>+ 
>+   no_glib=""
>+@@ -12464,14 +12475,14 @@ else
>+ int
>+ main ()
>+ {
>+-  int major, minor, micro;
>++  unsigned int major, minor, micro;
>+   char *tmp_version;
>+ 
>+-  system ("touch conf.glibtest");
>++  fclose (fopen ("conf.glibtest", "w"));
>+ 
>+   /* HP/UX 9 (%@#!) writes to sscanf strings */
>+   tmp_version = g_strdup("$min_glib_version");
>+-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
>++  if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, &micro) != 3) {
>+      printf("%s, bad version string\n", "$min_glib_version");
>+      exit(1);
>+    }
>+@@ -12510,9 +12521,9 @@ main ()
>+        }
>+      else
>+       {
>+-        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
>++        printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n",
>+                glib_major_version, glib_minor_version, glib_micro_version);
>+-        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
>++        printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n",
>+ 	       major, minor, micro);
>+         printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
>+         printf("***\n");
>+@@ -12973,9 +12984,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
>+ int
>+ main ()
>+ {
>+-"{
>++
>+            #warning test
>+-	}"
>++
>+   ;
>+   return 0;
>+ }
>+@@ -13056,7 +13067,7 @@ fi
>+ done
>+ 
>+ 
>+-ac_config_files="$ac_config_files Makefile gts.pc src/Makefile src/gts-config tools/Makefile doc/Makefile doc/manpages/Makefile examples/Makefile test/Makefile test/boolean/Makefile test/delaunay/Makefile test/coarsen/Makefile debian/Makefile"
>++ac_config_files="$ac_config_files Makefile gts.pc src/Makefile src/gts-config tools/Makefile doc/Makefile doc/manpages/Makefile examples/Makefile test/Makefile test/boolean/Makefile test/delaunay/Makefile test/coarsen/Makefile"
>+ 
>+ cat >confcache <<\_ACEOF
>+ # This file is a shell script that caches the results of configure
>+@@ -14099,7 +14110,6 @@ do
>+     "test/boolean/Makefile") CONFIG_FILES="$CONFIG_FILES test/boolean/Makefile" ;;
>+     "test/delaunay/Makefile") CONFIG_FILES="$CONFIG_FILES test/delaunay/Makefile" ;;
>+     "test/coarsen/Makefile") CONFIG_FILES="$CONFIG_FILES test/coarsen/Makefile" ;;
>+-    "debian/Makefile") CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
>+ 
>+   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
>+   esac
>+diff -up gts-snapshot-121130/doc/Makefile.in.bu gts-snapshot-121130/doc/Makefile.in
>+--- gts-snapshot-121130/doc/Makefile.in.bu	2012-11-30 00:17:41.000000000 +0000
>++++ gts-snapshot-121130/doc/Makefile.in	2013-01-21 17:26:55.808905525 +0000
>+@@ -159,6 +159,8 @@ PACKAGE_URL = @PACKAGE_URL@
>+ PACKAGE_VERSION = @PACKAGE_VERSION@
>+ PATH_SEPARATOR = @PATH_SEPARATOR@
>+ PKG_CONFIG = @PKG_CONFIG@
>++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
>++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
>+ RANLIB = @RANLIB@
>+ SED = @SED@
>+ SET_MAKE = @SET_MAKE@
>+diff -up gts-snapshot-121130/doc/manpages/Makefile.in.bu gts-snapshot-121130/doc/manpages/Makefile.in
>+--- gts-snapshot-121130/doc/manpages/Makefile.in.bu	2012-11-30 00:17:41.000000000 +0000
>++++ gts-snapshot-121130/doc/manpages/Makefile.in	2013-01-21 17:26:55.808905525 +0000
>+@@ -145,6 +145,8 @@ PACKAGE_URL = @PACKAGE_URL@
>+ PACKAGE_VERSION = @PACKAGE_VERSION@
>+ PATH_SEPARATOR = @PATH_SEPARATOR@
>+ PKG_CONFIG = @PKG_CONFIG@
>++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
>++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
>+ RANLIB = @RANLIB@
>+ SED = @SED@
>+ SET_MAKE = @SET_MAKE@
>+diff -up gts-snapshot-121130/examples/Makefile.am.bu gts-snapshot-121130/examples/Makefile.am
>+--- gts-snapshot-121130/examples/Makefile.am.bu	2012-11-30 00:17:36.000000000 +0000
>++++ gts-snapshot-121130/examples/Makefile.am	2013-01-21 17:26:55.810967379 +0000
>+@@ -1,6 +1,6 @@
>+ ## Process this file with automake to produce Makefile.in
>+ 
>+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\
>++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src \
>+ 	 -DG_LOG_DOMAIN=\"Gts-examples\"
>+ LDADD = $(top_builddir)/src/libgts.la -lm
>+ DEPS = $(top_builddir)/src/libgts.la
>+diff -up gts-snapshot-121130/examples/Makefile.in.bu gts-snapshot-121130/examples/Makefile.in
>+--- gts-snapshot-121130/examples/Makefile.in.bu	2012-11-30 00:17:41.000000000 +0000
>++++ gts-snapshot-121130/examples/Makefile.in	2013-01-21 17:26:55.810967379 +0000
>+@@ -232,6 +232,8 @@ PACKAGE_URL = @PACKAGE_URL@
>+ PACKAGE_VERSION = @PACKAGE_VERSION@
>+ PATH_SEPARATOR = @PATH_SEPARATOR@
>+ PKG_CONFIG = @PKG_CONFIG@
>++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
>++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
>+ RANLIB = @RANLIB@
>+ SED = @SED@
>+ SET_MAKE = @SET_MAKE@
>+@@ -296,7 +298,7 @@ target_alias = @target_alias@
>+ top_build_prefix = @top_build_prefix@
>+ top_builddir = @top_builddir@
>+ top_srcdir = @top_srcdir@
>+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\
>++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src \
>+ 	 -DG_LOG_DOMAIN=\"Gts-examples\"
>+ 
>+ LDADD = $(top_builddir)/src/libgts.la -lm
>+diff -up gts-snapshot-121130/gts.pc.in.bu gts-snapshot-121130/gts.pc.in
>+--- gts-snapshot-121130/gts.pc.in.bu	2012-11-30 00:17:36.000000000 +0000
>++++ gts-snapshot-121130/gts.pc.in	2013-01-21 17:26:55.811967985 +0000
>+@@ -6,6 +6,6 @@ includedir=@includedir@
>+ Name: GTS
>+ Description: GNU Triangulated Surface Library
>+ Version: @VERSION@
>+-Requires: glib-2.0,gthread-2.0,gmodule-2.0
>++Requires: glib-2.0
>+ Libs: -L${libdir} @LIBS@ -lgts -lm
>+ Cflags: -I${includedir}
>+diff -up gts-snapshot-121130/ltmain.sh.bu gts-snapshot-121130/ltmain.sh
>+--- gts-snapshot-121130/ltmain.sh.bu	2012-11-30 00:17:37.000000000 +0000
>++++ gts-snapshot-121130/ltmain.sh	2013-01-21 17:26:55.814967309 +0000
>+@@ -136,15 +136,15 @@ progpath="$0"
>+ 
>+ : ${CP="cp -f"}
>+ test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
>+-: ${EGREP="grep -E"}
>+-: ${FGREP="grep -F"}
>+-: ${GREP="grep"}
>++: ${EGREP="/bin/grep -E"}
>++: ${FGREP="/bin/grep -F"}
>++: ${GREP="/bin/grep"}
>+ : ${LN_S="ln -s"}
>+ : ${MAKE="make"}
>+ : ${MKDIR="mkdir"}
>+ : ${MV="mv -f"}
>+ : ${RM="rm -f"}
>+-: ${SED="sed"}
>++: ${SED="/bin/sed"}
>+ : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
>+ : ${Xsed="$SED -e 1s/^X//"}
>+ 
>+diff -up gts-snapshot-121130/Makefile.am.bu gts-snapshot-121130/Makefile.am
>+--- gts-snapshot-121130/Makefile.am.bu	2012-11-30 00:17:36.000000000 +0000
>++++ gts-snapshot-121130/Makefile.am	2013-01-21 17:26:32.577945408 +0000
>+@@ -1,38 +1,9 @@
>+ ## Process this file with automake to produce Makefile.in
>+ 
>+-SUBDIRS = src tools examples doc test debian
>+-
>+-OSC_DIR=$(HOME)/local/src/osc/home:popinet/$(PACKAGE)-snapshot
>++SUBDIRS = src tools examples doc test
>+ 
>+ pkgconfigdir = $(libdir)/pkgconfig
>+ pkgconfig_DATA = gts.pc
>+ 
>+ ChangeLog:
>+ 	darcs changes > ChangeLog
>+-
>+-debian-snapshot: config.h
>+-	darcs changes > ChangeLog
>+-	sh debian/changelog.sh
>+-	dpkg-buildpackage -rfakeroot -b
>+-	rm -f debian/repo/*
>+-	mv -f ../*.changes ../*.deb debian/repo
>+-	cd debian/repo && dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
>+-
>+-launchpad-snapshot: config.h dist
>+-	tar xzf $(PACKAGE)-?.?.?.tar.gz
>+-	cd $(PACKAGE)-?.?.? && ./configure && darcs changes > ChangeLog && sh debian/changelog.sh && dpkg-buildpackage -rfakeroot -k07AB22DC -S -sa
>+-	rm -f $(PACKAGE)-?.?.?.tar.gz
>+-	rm -r -f $(PACKAGE)-?.?.?
>+-
>+-buildservice-snapshot: config.h dist
>+-	tar xzf $(PACKAGE)-?.?.?.tar.gz
>+-	rm -f $(PACKAGE)-?.?.?.tar.gz
>+-	mv -f $(PACKAGE)-?.?.? $(PACKAGE)-snapshot
>+-	cd $(PACKAGE)-snapshot && ./configure && darcs changes > ChangeLog && sh debian/changelog.sh && chmod +x debian/rules && make distclean
>+-	tar czvf $(PACKAGE)-snapshot.tar.gz $(PACKAGE)-snapshot
>+-	dpkg-source -b $(PACKAGE)-snapshot
>+-	rm -r -f $(PACKAGE)-snapshot
>+-	cd $(OSC_DIR) && osc update && rm -f $(OSC_DIR)/*
>+-	cp -f rpm/$(PACKAGE).spec $(OSC_DIR)
>+-	mv -f $(PACKAGE)-snapshot.tar.gz $(PACKAGE)-snapshot_*.tar.gz $(PACKAGE)-snapshot_*.dsc $(OSC_DIR)
>+-	cd $(OSC_DIR) && osc addremove && osc commit -m "snapshot release"
>+diff -up gts-snapshot-121130/Makefile.in.bu gts-snapshot-121130/Makefile.in
>+--- gts-snapshot-121130/Makefile.in.bu	2012-11-30 00:17:42.000000000 +0000
>++++ gts-snapshot-121130/Makefile.in	2013-01-21 17:26:32.578905192 +0000
>+@@ -199,6 +199,8 @@ PACKAGE_URL = @PACKAGE_URL@
>+ PACKAGE_VERSION = @PACKAGE_VERSION@
>+ PATH_SEPARATOR = @PATH_SEPARATOR@
>+ PKG_CONFIG = @PKG_CONFIG@
>++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
>++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
>+ RANLIB = @RANLIB@
>+ SED = @SED@
>+ SET_MAKE = @SET_MAKE@
>+@@ -263,8 +265,7 @@ target_alias = @target_alias@
>+ top_build_prefix = @top_build_prefix@
>+ top_builddir = @top_builddir@
>+ top_srcdir = @top_srcdir@
>+-SUBDIRS = src tools examples doc test debian
>+-OSC_DIR = $(HOME)/local/src/osc/home:popinet/$(PACKAGE)-snapshot
>++SUBDIRS = src tools examples doc test
>+ pkgconfigdir = $(libdir)/pkgconfig
>+ pkgconfig_DATA = gts.pc
>+ all: config.h
>+@@ -791,33 +792,6 @@ uninstall-am: uninstall-pkgconfigDATA
>+ ChangeLog:
>+ 	darcs changes > ChangeLog
>+ 
>+-debian-snapshot: config.h
>+-	darcs changes > ChangeLog
>+-	sh debian/changelog.sh
>+-	dpkg-buildpackage -rfakeroot -b
>+-	rm -f debian/repo/*
>+-	mv -f ../*.changes ../*.deb debian/repo
>+-	cd debian/repo && dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
>+-
>+-launchpad-snapshot: config.h dist
>+-	tar xzf $(PACKAGE)-?.?.?.tar.gz
>+-	cd $(PACKAGE)-?.?.? && ./configure && darcs changes > ChangeLog && sh debian/changelog.sh && dpkg-buildpackage -rfakeroot -k07AB22DC -S -sa
>+-	rm -f $(PACKAGE)-?.?.?.tar.gz
>+-	rm -r -f $(PACKAGE)-?.?.?
>+-
>+-buildservice-snapshot: config.h dist
>+-	tar xzf $(PACKAGE)-?.?.?.tar.gz
>+-	rm -f $(PACKAGE)-?.?.?.tar.gz
>+-	mv -f $(PACKAGE)-?.?.? $(PACKAGE)-snapshot
>+-	cd $(PACKAGE)-snapshot && ./configure && darcs changes > ChangeLog && sh debian/changelog.sh && chmod +x debian/rules && make distclean
>+-	tar czvf $(PACKAGE)-snapshot.tar.gz $(PACKAGE)-snapshot
>+-	dpkg-source -b $(PACKAGE)-snapshot
>+-	rm -r -f $(PACKAGE)-snapshot
>+-	cd $(OSC_DIR) && osc update && rm -f $(OSC_DIR)/*
>+-	cp -f rpm/$(PACKAGE).spec $(OSC_DIR)
>+-	mv -f $(PACKAGE)-snapshot.tar.gz $(PACKAGE)-snapshot_*.tar.gz $(PACKAGE)-snapshot_*.dsc $(OSC_DIR)
>+-	cd $(OSC_DIR) && osc addremove && osc commit -m "snapshot release"
>+-
>+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
>+ # Otherwise a system limit (for SysV at least) may be exceeded.
>+ .NOEXPORT:
>+diff -up gts-snapshot-121130/src/gts-config.in.bu gts-snapshot-121130/src/gts-config.in
>+--- gts-snapshot-121130/src/gts-config.in.bu	2012-11-30 00:17:36.000000000 +0000
>++++ gts-snapshot-121130/src/gts-config.in	2013-01-21 17:26:55.817968446 +0000
>+@@ -1,14 +1,5 @@
>+ #!/bin/sh
>+ 
>+-glib_libs="@glib_libs@"
>+-glib_cflags="@glib_cflags@"
>+-glib_thread_libs="@glib_thread_libs@"
>+-glib_thread_cflags="@glib_thread_cflags@"
>+-glib_module_libs="@glib_module_libs@"
>+-glib_module_cflags="@glib_module_cflags@"
>+-
>+-prefix=@prefix@
>+-exec_prefix=@exec_prefix@
>+ exec_prefix_set=no
>+ 
>+ usage()
>+@@ -30,24 +21,13 @@ EOF
>+ 	exit $1
>+ }
>+ 
>+-uniquify()
>+-{
>+-    echo $1 | awk '{
>+-	for (i = 1; i <= NF; i++) {
>+-	    unique = 1;
>+-	    for (j = i + 1; j <= NF && unique; j++)
>+-		if ($i == $j)
>+-		    unique = 0;
>+-            if (unique)
>+-		printf ("%s ", $i);
>+-	}
>+-    }'
>+-}
>+-
>+ if test $# -eq 0; then
>+ 	usage 1 1>&2
>+ fi
>+ 
>++PKG_CONFIG_ARGS=
>++PKG_CONFIG_MODS=gts
>++
>+ while test $# -gt 0; do
>+   case "$1" in
>+   -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
>+@@ -56,23 +36,23 @@ while test $# -gt 0; do
>+ 
>+   case $1 in
>+     --prefix=*)
>+-      prefix=$optarg
>++      PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=prefix=$optarg"
>+       if test $exec_prefix_set = no ; then
>+-        exec_prefix=$optarg
>++        PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=exec_prefix=$optarg"
>+       fi
>+       ;;
>+     --prefix)
>+       echo_prefix=yes
>+       ;;
>+     --exec-prefix=*)
>+-      exec_prefix=$optarg
>++      PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=exec_prefix=$optarg"
>+       exec_prefix_set=yes
>+       ;;
>+     --exec-prefix)
>+       echo_exec_prefix=yes
>+       ;;
>+     --version)
>+-      echo @GTS_VERSION@
>++      pkg-config --modversion gts
>+       exit 0
>+       ;;
>+     --cflags)
>+@@ -85,13 +65,12 @@ while test $# -gt 0; do
>+       echo_check=yes
>+       ;;
>+     gts)
>+-      lib_gts=yes
>+       ;;
>+     gmodule)
>+-      lib_gmodule=yes
>++      PKG_CONFIG_MODS="$PKG_CONFIG_MODS gmodule-2.0"
>+       ;;
>+     gthread)
>+-      lib_gthread=yes
>++      PKG_CONFIG_MODS="$PKG_CONFIG_MODS gthread-2.0"
>+       ;;
>+     *)
>+       usage 1 1>&2
>+@@ -101,34 +80,18 @@ while test $# -gt 0; do
>+ done
>+ 
>+ if test "$echo_prefix" = "yes"; then
>+-	echo $prefix
>++	pkg-config $PKG_CONFIG_ARGS --variable=prefix gts
>+ fi
>+ if test "$echo_exec_prefix" = "yes"; then
>+-	echo $exec_prefix
>++	pkg-config $PKG_CONFIG_ARGS --variable=exec_prefix gts
>+ fi
>+ if test "$echo_cflags" = "yes"; then
>+-	if test "$lib_gmodule" = "yes"; then
>+-	    glib_cflags="$glib_cflags $glib_module_cflags"
>+-	fi
>+-	if test "$lib_gthread" = "yes"; then
>+-	    glib_cflags="$glib_cflags $glib_thread_cflags"
>+-	fi
>+-	glib_cflags="$glib_cflags -I${prefix}/include"
>+-	glib_cflags=`uniquify "$glib_cflags"`
>+         if test "$echo_check" = "yes"; then
>+-	    echo -DGTS_CHECK_CASTS $glib_cflags
>++           echo -DGTS_CHECK_CASTS `pkg-config $PKG_CONFIG_ARGS --cflags $PKG_CONFIG_MODS`
>+         else
>+-	    echo $glib_cflags
>+-	fi
>++           echo `pkg-config $PKG_CONFIG_ARGS --cflags $PKG_CONFIG_MODS`
>++        fi
>+ fi
>+ if test "$echo_libs" = "yes"; then
>+-	if test "$lib_gmodule" = "yes"; then
>+-	    glib_libs="$glib_libs $glib_module_libs"
>+-	fi
>+-	if test "$lib_gthread" = "yes"; then
>+-	    glib_libs="$glib_libs $glib_thread_libs"
>+-	fi
>+-	glib_libs="-L${exec_prefix}/lib -lgts $glib_libs -lm"
>+-	glib_libs=`uniquify "$glib_libs"`
>+-	echo $glib_libs
>++	echo `pkg-config $PKG_CONFIG_ARGS --libs $PKG_CONFIG_MODS`
>+ fi
>+diff -up gts-snapshot-121130/src/Makefile.am.bu gts-snapshot-121130/src/Makefile.am
>+--- gts-snapshot-121130/src/Makefile.am.bu	2012-11-30 00:17:36.000000000 +0000
>++++ gts-snapshot-121130/src/Makefile.am	2013-01-21 17:26:55.816967770 +0000
>+@@ -1,6 +1,6 @@
>+ ## Process this file with automake to produce Makefile.in
>+ 
>+-INCLUDES = -I$(top_srcdir) -I$(includedir) -DG_LOG_DOMAIN=\"Gts\"
>++INCLUDES = -I$(top_srcdir) -DG_LOG_DOMAIN=\"Gts\"
>+ 
>+ bin_SCRIPTS=gts-config
>+ 
>+diff -up gts-snapshot-121130/src/Makefile.in.bu gts-snapshot-121130/src/Makefile.in
>+--- gts-snapshot-121130/src/Makefile.in.bu	2012-11-30 00:17:41.000000000 +0000
>++++ gts-snapshot-121130/src/Makefile.in	2013-01-21 17:26:55.816967770 +0000
>+@@ -177,6 +177,8 @@ PACKAGE_URL = @PACKAGE_URL@
>+ PACKAGE_VERSION = @PACKAGE_VERSION@
>+ PATH_SEPARATOR = @PATH_SEPARATOR@
>+ PKG_CONFIG = @PKG_CONFIG@
>++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
>++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
>+ RANLIB = @RANLIB@
>+ SED = @SED@
>+ SET_MAKE = @SET_MAKE@
>+@@ -241,7 +243,7 @@ target_alias = @target_alias@
>+ top_build_prefix = @top_build_prefix@
>+ top_builddir = @top_builddir@
>+ top_srcdir = @top_srcdir@
>+-INCLUDES = -I$(top_srcdir) -I$(includedir) -DG_LOG_DOMAIN=\"Gts\"
>++INCLUDES = -I$(top_srcdir) -DG_LOG_DOMAIN=\"Gts\"
>+ bin_SCRIPTS = gts-config
>+ BUILT_SOURCES = \
>+ 	gts-config \
>+diff -up gts-snapshot-121130/test/boolean/Makefile.am.bu gts-snapshot-121130/test/boolean/Makefile.am
>+--- gts-snapshot-121130/test/boolean/Makefile.am.bu	2012-11-30 00:17:36.000000000 +0000
>++++ gts-snapshot-121130/test/boolean/Makefile.am	2013-01-21 17:26:55.819945916 +0000
>+@@ -1,6 +1,6 @@
>+ ## Process this file with automake to produce Makefile.in
>+ 
>+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\
>++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src \
>+ 	 -DG_LOG_DOMAIN=\"Gts-test\"
>+ LDADD = $(top_builddir)/src/libgts.la -lm
>+ DEPS = $(top_builddir)/src/libgts.la
>+diff -up gts-snapshot-121130/test/boolean/Makefile.in.bu gts-snapshot-121130/test/boolean/Makefile.in
>+--- gts-snapshot-121130/test/boolean/Makefile.in.bu	2012-11-30 00:17:42.000000000 +0000
>++++ gts-snapshot-121130/test/boolean/Makefile.in	2013-01-21 17:26:55.820967716 +0000
>+@@ -149,6 +149,8 @@ PACKAGE_URL = @PACKAGE_URL@
>+ PACKAGE_VERSION = @PACKAGE_VERSION@
>+ PATH_SEPARATOR = @PATH_SEPARATOR@
>+ PKG_CONFIG = @PKG_CONFIG@
>++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
>++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
>+ RANLIB = @RANLIB@
>+ SED = @SED@
>+ SET_MAKE = @SET_MAKE@
>+@@ -213,7 +215,7 @@ target_alias = @target_alias@
>+ top_build_prefix = @top_build_prefix@
>+ top_builddir = @top_builddir@
>+ top_srcdir = @top_srcdir@
>+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\
>++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src \
>+ 	 -DG_LOG_DOMAIN=\"Gts-test\"
>+ 
>+ LDADD = $(top_builddir)/src/libgts.la -lm
>+diff -up gts-snapshot-121130/test/coarsen/Makefile.am.bu gts-snapshot-121130/test/coarsen/Makefile.am
>+--- gts-snapshot-121130/test/coarsen/Makefile.am.bu	2012-11-30 00:17:36.000000000 +0000
>++++ gts-snapshot-121130/test/coarsen/Makefile.am	2013-01-21 17:26:55.820967716 +0000
>+@@ -1,6 +1,6 @@
>+ ## Process this file with automake to produce Makefile.in
>+ 
>+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\
>++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src \
>+ 	 -DG_LOG_DOMAIN=\"Gts-test\"
>+ LDADD = $(top_builddir)/src/libgts.la -lm
>+ DEPS = $(top_builddir)/src/libgts.la
>+diff -up gts-snapshot-121130/test/coarsen/Makefile.in.bu gts-snapshot-121130/test/coarsen/Makefile.in
>+--- gts-snapshot-121130/test/coarsen/Makefile.in.bu	2012-11-30 00:17:42.000000000 +0000
>++++ gts-snapshot-121130/test/coarsen/Makefile.in	2013-01-21 17:26:55.821966591 +0000
>+@@ -158,6 +158,8 @@ PACKAGE_URL = @PACKAGE_URL@
>+ PACKAGE_VERSION = @PACKAGE_VERSION@
>+ PATH_SEPARATOR = @PATH_SEPARATOR@
>+ PKG_CONFIG = @PKG_CONFIG@
>++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
>++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
>+ RANLIB = @RANLIB@
>+ SED = @SED@
>+ SET_MAKE = @SET_MAKE@
>+@@ -222,7 +224,7 @@ target_alias = @target_alias@
>+ top_build_prefix = @top_build_prefix@
>+ top_builddir = @top_builddir@
>+ top_srcdir = @top_srcdir@
>+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\
>++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src \
>+ 	 -DG_LOG_DOMAIN=\"Gts-test\"
>+ 
>+ LDADD = $(top_builddir)/src/libgts.la -lm
>+diff -up gts-snapshot-121130/test/delaunay/Makefile.am.bu gts-snapshot-121130/test/delaunay/Makefile.am
>+--- gts-snapshot-121130/test/delaunay/Makefile.am.bu	2012-11-30 00:17:36.000000000 +0000
>++++ gts-snapshot-121130/test/delaunay/Makefile.am	2013-01-21 17:26:55.821966591 +0000
>+@@ -1,6 +1,6 @@
>+ ## Process this file with automake to produce Makefile.in
>+ 
>+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir) \
>++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src \
>+ 	 -DG_LOG_DOMAIN=\"Gts-test\"
>+ LDADD = $(top_builddir)/src/libgts.la -lm
>+ DEPS = $(top_builddir)/src/libgts.la
>+diff -up gts-snapshot-121130/test/delaunay/Makefile.in.bu gts-snapshot-121130/test/delaunay/Makefile.in
>+--- gts-snapshot-121130/test/delaunay/Makefile.in.bu	2012-11-30 00:17:42.000000000 +0000
>++++ gts-snapshot-121130/test/delaunay/Makefile.in	2013-01-21 17:26:55.863909523 +0000
>+@@ -145,6 +145,8 @@ PACKAGE_URL = @PACKAGE_URL@
>+ PACKAGE_VERSION = @PACKAGE_VERSION@
>+ PATH_SEPARATOR = @PATH_SEPARATOR@
>+ PKG_CONFIG = @PKG_CONFIG@
>++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
>++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
>+ RANLIB = @RANLIB@
>+ SED = @SED@
>+ SET_MAKE = @SET_MAKE@
>+@@ -209,7 +211,7 @@ target_alias = @target_alias@
>+ top_build_prefix = @top_build_prefix@
>+ top_builddir = @top_builddir@
>+ top_srcdir = @top_srcdir@
>+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir) \
>++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src \
>+ 	 -DG_LOG_DOMAIN=\"Gts-test\"
>+ 
>+ LDADD = $(top_builddir)/src/libgts.la -lm
>+diff -up gts-snapshot-121130/test/Makefile.in.bu gts-snapshot-121130/test/Makefile.in
>+--- gts-snapshot-121130/test/Makefile.in.bu	2012-11-30 00:17:41.000000000 +0000
>++++ gts-snapshot-121130/test/Makefile.in	2013-01-21 17:26:55.818967713 +0000
>+@@ -159,6 +159,8 @@ PACKAGE_URL = @PACKAGE_URL@
>+ PACKAGE_VERSION = @PACKAGE_VERSION@
>+ PATH_SEPARATOR = @PATH_SEPARATOR@
>+ PKG_CONFIG = @PKG_CONFIG@
>++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
>++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
>+ RANLIB = @RANLIB@
>+ SED = @SED@
>+ SET_MAKE = @SET_MAKE@
>+diff -up gts-snapshot-121130/tools/Makefile.am.bu gts-snapshot-121130/tools/Makefile.am
>+--- gts-snapshot-121130/tools/Makefile.am.bu	2012-11-30 00:17:36.000000000 +0000
>++++ gts-snapshot-121130/tools/Makefile.am	2013-01-21 17:26:55.864943933 +0000
>+@@ -1,6 +1,6 @@
>+ ## Process this file with automake to produce Makefile.in
>+ 
>+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\
>++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src \
>+ 	 -DG_LOG_DOMAIN=\"Gts-tools\"
>+ LDADD = $(top_builddir)/src/libgts.la -lm
>+ DEPS = $(top_builddir)/src/libgts.la
>+diff -up gts-snapshot-121130/tools/Makefile.in.bu gts-snapshot-121130/tools/Makefile.in
>+--- gts-snapshot-121130/tools/Makefile.in.bu	2012-11-30 00:17:42.000000000 +0000
>++++ gts-snapshot-121130/tools/Makefile.in	2013-01-21 17:26:55.864943933 +0000
>+@@ -193,6 +193,8 @@ PACKAGE_URL = @PACKAGE_URL@
>+ PACKAGE_VERSION = @PACKAGE_VERSION@
>+ PATH_SEPARATOR = @PATH_SEPARATOR@
>+ PKG_CONFIG = @PKG_CONFIG@
>++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
>++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
>+ RANLIB = @RANLIB@
>+ SED = @SED@
>+ SET_MAKE = @SET_MAKE@
>+@@ -257,7 +259,7 @@ target_alias = @target_alias@
>+ top_build_prefix = @top_build_prefix@
>+ top_builddir = @top_builddir@
>+ top_srcdir = @top_srcdir@
>+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir)\
>++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src \
>+ 	 -DG_LOG_DOMAIN=\"Gts-tools\"
>+ 
>+ LDADD = $(top_builddir)/src/libgts.la -lm
>diff --git a/gts.spec b/gts.spec
>index c1f4207..a595562 100644
>--- a/gts.spec
>+++ b/gts.spec
>@@ -1,15 +1,15 @@
>-%global snapshot 111025
>+%global snapshot 121130
> 
> Name:           gts
> Version:        0.7.6
>-Release:        21.20%{snapshot}%{?dist}
>+Release:        22.20%{snapshot}%{?dist}
> Summary:        GNU Triangulated Surface Library
> Group:          Applications/Engineering
> License:        LGPLv2+
> URL:            http://gts.sourceforge.net/index.html
> Source0:        http://gts.sourceforge.net/tarballs/gts-snapshot-%{snapshot}.tar.gz
> # Misc accumulated patches
>-Patch0:         gts-snapshot-111025.patch
>+Patch0:         gts-snapshot-%{snapshot}.patch
> 
> BuildRequires:  glib2-devel
> BuildRequires:  netpbm-devel
>@@ -32,7 +32,8 @@ This package contains the gts header files and libs.
> 
> %prep
> %setup -q -n %{name}-snapshot-%{snapshot}
>-%patch0 -p1
>+%patch0 -p1 -b .bu
>+rm -rf debian
> 
> # Fix broken permissions
> chmod +x test/*/*.sh
>@@ -74,6 +75,7 @@ make check ||:
> %{_bindir}/gtshapprox
> %{_bindir}/stl2gts
> %{_bindir}/gtstransform
>+%{_bindir}/gts2xyz
> %{_libdir}/*.so.*
> %{_mandir}/man1/gtsdelaunay.1*
> %{_mandir}/man1/gts2dxf.1*
>@@ -96,6 +98,9 @@ make check ||:
> %{_mandir}/man1/gts-config.1*
> 
> %changelog
>+* Tue Jan 22 2013 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 0.7.6-22.20121130
>+- Update to new snapshot 121130
>+
> * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.6-21.20111025
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>diff --git a/sources b/sources
>index e77d309..183873b 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-a9f715a757ab957b62e47c49ca56c8cb  gts-snapshot-111025.tar.gz
>+023ebb6b13b8707534182a3ef0d12908  gts-snapshot-121130.tar.gz

Actions: View | Diff

Attachments on bug 902862: 685218