[SCM] grits branch, master, updated. upstream/0.5-17-g5e5715f

[Andy Spencer]

The following commit has been merged in the master branch:
commit 5e5715f481bf154ef7dab1032b24e9d9bafac5ed
Author: Andy Spencer <andy753421 at gmail.com>
Date:   Wed Aug 24 16:16:58 2011 +0000

    Update for 0.5.1
    
    - patches merged upstream

diff --git a/debian/changelog b/debian/changelog
index 411b6d6..7d05cd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libgrits (0.5-1) unstable; urgency=low
+libgrits (0.5.1-1) unstable; urgency=low
 
-  * Update for Grits 0.5
+  * Version bump for 0.5.1
 
- -- Andy Spencer <andy753421 at gmail.com>  Sun, 07 Aug 2011 20:45:17 -0000
+ -- Andy Spencer <andy753421 at gmail.com>  Wed, 24 Aug 2011 16:23:19 +0000
 
-libgrits (0.4.2-1) unstable; urgency=low
+libgrits (0.5-1) unstable; urgency=low
 
   * Initial debian package (Closes: #603393)
 
- -- Andy Spencer <andy753421 at gmail.com>  Fri, 12 Nov 2010 15:45:35 -0800
+ -- Andy Spencer <andy753421 at gmail.com>  Mon, 01 Aug 2011 18:49:14 +0200
diff --git a/debian/control b/debian/control
index 41cdb2f..aa17050 100644
--- a/debian/control
+++ b/debian/control
@@ -33,8 +33,8 @@ Description: Development files for grits
  This is similar in concept to Google Earth and NASA World Wind, except
  implemented as a library.
  .
- This package contains the header files and static libraries which are needed
- for developing programs that use grits.
+ This package contains the header files and libraries which are needed for
+ developing programs that use grits.
 
 Package: libgrits-doc
 Architecture: all
diff --git a/debian/patches/build-fixes b/debian/patches/build-fixes
deleted file mode 100644
index 42a7e91..0000000
--- a/debian/patches/build-fixes
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Remove dependency on Glut and fix build with --as-needed flag.
-Author: Andy Spencer <andy753421 at 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
deleted file mode 100644
index 2282ce6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-build-fixes
diff --git a/debian/rules b/debian/rules
index 7a4b52e..55e375c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,5 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1

-- 
A Virtual Globe library