The following commit has been merged in the master branch: commit 7eefd9b4d012c669440575d735d1d728b00b4fef Author: Andy Spencer <andy753...@gmail.com> Date: Sun Jun 19 21:52:06 2011 +0000
Version bump for Grits 0.5 diff --git a/debian/changelog b/debian/changelog index 21d9ae5..6089c1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libgrits (0.5-1) UNRELEASED; urgency=low + + * Update for Grits 0.5 + + -- Andy Spencer <andy753...@gmail.com> Fri, 12 Nov 2010 15:45:35 -0800 + libgrits (0.4.2-1) unstable; urgency=low * Initial debian package (Closes: #603393) diff --git a/debian/control b/debian/control index ee76dc3..fcbad32 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Uploaders: Andy Spencer <andy753...@gmail.com> Build-Depends: debhelper (>= 7.0.50~), libglib2.0-dev (>= 2.14), libcairo2-dev, libgtk2.0-dev (>= 2.16), libgtkglext1-dev, libsoup2.4-dev (>= 2.26) Standards-Version: 3.9.1 Section: science -Homepage: http://lug.rose-hulman.edu/code/projects/grits +Homepage: http://lug.rose-hulman.edu/proj/aweather/grits Vcs-Git: git://git.debian.org/pkg-grass/grits.git Vcs-Browser: http://git.debian.org/?p=pkg-grass/grits.git diff --git a/debian/patches/build-fixes b/debian/patches/build-fixes new file mode 100644 index 0000000..42a7e91 --- /dev/null +++ b/debian/patches/build-fixes @@ -0,0 +1,29 @@ +Description: Remove dependency on Glut and fix build with --as-needed flag. +Author: Andy Spencer <andy753...@gmail.com> + +--- libgrits-0.5.orig/src/Makefile.am ++++ libgrits-0.5/src/Makefile.am +@@ -3,7 +3,7 @@ SUBDIRS = data objects . plugins + AM_CFLAGS = -Wall --std=gnu99 -I$(top_srcdir)/src + AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GL_CFLAGS) $(SOUP_CFLAGS) + AM_LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(GL_LIBS) $(SOUP_LIBS) +-AM_LDFLAGS = --as-needed -no-undefined ++AM_LDFLAGS = -Wl,--as-needed -Wl,--no-undefined + + BUILT_SOURCES = grits-marshal.c grits-marshal.h + +--- libgrits-0.5.orig/src/plugins/Makefile.am ++++ libgrits-0.5/src/plugins/Makefile.am +@@ -14,12 +14,5 @@ map_la_SOURCES = map.c map.h + env_la_SOURCES = env.c env.h + test_la_SOURCES = test.c test.h + +-if NOTWIN32 +-noinst_LTLIBRARIES = teapot.la +-teapot_la_SOURCES = \ +- $(top_srcdir)/examples/plugin/teapot.c \ +- $(top_srcdir)/examples/plugin/teapot.h +-endif +- + test: + ( cd ../; make test ) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..2282ce6 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +build-fixes -- A Virtual Globe library _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel