[dune-grid] 02/10: Bumped Standards-Version to 3.9.5.

[Ansgar Burchardt]

This is an automated email from the git hooks/post-receive script.

ansgar pushed a commit to annotated tag debian/2.3.20140101g16be0c0-1
in repository dune-grid.

commit a899159348138e5a66e8b0e2ecb736c3fb27b993
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Wed Jan 1 18:55:11 2014 +0100

    Bumped Standards-Version to 3.9.5.
---
 debian/control                                      | 2 +-
 debian/patches/do-not-install-amiramesh-grids.patch | 6 +++---
 debian/patches/soname.patch                         | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 5674f1d..059d617 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: dune-grid
 Section: libs
 Priority: optional
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Ansgar Burchardt <ansgar at debian.org>, Oliver Sander <sander at mi.fu-berlin.de>
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/dune-grid.git
diff --git a/debian/patches/do-not-install-amiramesh-grids.patch b/debian/patches/do-not-install-amiramesh-grids.patch
index d3b379c..b835a31 100644
--- a/debian/patches/do-not-install-amiramesh-grids.patch
+++ b/debian/patches/do-not-install-amiramesh-grids.patch
@@ -11,11 +11,11 @@ are not usable without a non-free library.
 @@ -2,8 +2,8 @@
    simplex-testgrid-2d.am  hybrid-testgrid-2d.am  simplex-testgrid-3d.am
  
- amiragridsdir=$(datadir)/doc/dune-grid/grids/amiramesh
+ amiragridsdir=$(docdir)/grids/amiramesh
 -amiragrids_DATA = $(GRIDS)
--EXTRA_DIST = $(GRIDS)
+-EXTRA_DIST = CMakeLists.txt $(GRIDS)
 +#amiragrids_DATA = $(GRIDS)
-+#EXTRA_DIST = $(GRIDS)
++#EXTRA_DIST = CMakeLists.txt $(GRIDS)
  
  include $(top_srcdir)/am/webstuff
  include $(top_srcdir)/am/global-rules
diff --git a/debian/patches/soname.patch b/debian/patches/soname.patch
index 7e887b7..60afe72 100644
--- a/debian/patches/soname.patch
+++ b/debian/patches/soname.patch
@@ -8,7 +8,7 @@
  
  # ../dune/grid/albertagrid/libalbertagrid_?d.la is a convenience library, so
  # its complete contents will be copied into libdunealbertagrid_?d.la.
-@@ -50,37 +51,46 @@
+@@ -50,38 +51,47 @@
  libdunealbertagrid_1d_la_SOURCES =
  nodist_EXTRA_libdunealbertagrid_1d_la_SOURCES = dummy.cc
  libdunealbertagrid_1d_la_LIBADD = ../dune/grid/albertagrid/libalbertagrid_1d.la	libdunegrid.la
@@ -54,4 +54,5 @@
  libdunealbertagrid_9d_la_LIBADD = ../dune/grid/albertagrid/libalbertagrid_9d.la	libdunegrid.la
 +libdunealbertagrid_9d_la_LDFLAGS = -release $(subst -,,$(PACKAGE_VERSION))
  
- include $(top_srcdir)/am/global-rules
+ dunemodulelibdir=$(libdir)
+ dunemodulelib_DATA = dunegridam2cmake.lib

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/dune-grid.git