[dune-uggrid] 03/06: Follow dune-uggrid instead of UG.

Ansgar Burchardt ansgar at moszumanska.debian.org
Mon Nov 21 20:03:30 UTC 2016 

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

ansgar pushed a commit to branch master
in repository dune-uggrid.

commit 3f4edd10f51e023f29df4f144f3bebf83c74ba15
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Mon Nov 21 20:50:25 2016 +0100

    Follow dune-uggrid instead of UG.
    
    We are only interested in the UG grid manager for DUNE.  The old UG
    library will no longer be maintained in the future.
---
 debian/control                            | 47 +++++++++++--------------------
 debian/copyright                          |  4 +--
 debian/libdune-uggrid-dev.install         |  2 ++
 debian/libug-dev.install                  |  4 ---
 debian/libug3.12.1.install                |  1 -
 debian/patches/link-test-fifo.patch       |  6 ++++
 debian/patches/series                     |  2 ++
 debian/patches/use-dune_add_library.patch | 11 ++++++++
 debian/rules                              | 15 ++--------
 9 files changed, 42 insertions(+), 50 deletions(-)

diff --git a/debian/control b/debian/control
index c91d15b..268a0a1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,22 +1,26 @@
-Source: ug
+Source: dune-uggrid
 Section: libs
 Priority: optional
 Standards-Version: 3.9.6
 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: https://anonscm.debian.org/cgit/debian-science/packages/ug.git
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/ug.git
-Homepage: http://www.iwr.uni-heidelberg.de/frame/iwrwikiequipment/software/ug
-Build-Depends: debhelper (>= 9), dh-autoreconf,
- bison, flex, libltdl-dev
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/dune-uggrid.git
+Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/dune-uggrid.git
+Homepage: https://gitlab.dune-project.org/staging/dune-uggrid/
+Build-Depends: debhelper (>= 9),
+ cmake, gfortran, mpi-default-bin, mpi-default-dev, pkg-config, python3,
+ libdune-common-dev (>= 2.5.0~rc1)
 
-Package: libug-dev
+Package: libdune-uggrid-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends},
- libug3.12.1 (= ${binary:Version})
-Suggests: libug-dbg (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ libdune-common-dev (>= 2.5.0~rc1)
+Provides: ${dune:shared-library}
+Suggests: libdune-uggrid-dbg (= ${binary:Version})
+Conflicts: libug-dev
+Replaces: libug-dev
 Description: software framework for finite element methods (development files)
  UG is a flexible software tool for the numerical solution of partial
  differential equations on unstructured meshes, with a focus on
@@ -31,32 +35,13 @@ Description: software framework for finite element methods (development files)
  .
  This package contains the development files.
 
-Package: libug3.12.1
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Description: software framework for finite element methods (library)
- UG is a flexible software tool for the numerical solution of partial
- differential equations on unstructured meshes, with a focus on
- multigrid methods. It has a very powerful grid manager, which supports
- two- and three-dimensional grids with mixed element types. The grids
- can be adaptively refinement using either classic
- red/green-refinement, or pure red refinement with hanging nodes. All
- this is fully parallelized and can run on large distributed machines.
- .
- The version in this package has been built with the necessary flags for use
- with the Dune software system.
- .
- This package contains the shared library.
-
-Package: libug-dbg
+Package: libdune-uggrid-dbg
 Section: debug
 Priority: extra
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
- libug3.12.1 (= ${binary:Version})
+ libdune-uggrid-dev (= ${binary:Version})
 Description: software framework for finite element methods (debug symbols)
  UG is a flexible software tool for the numerical solution of partial
  differential equations on unstructured meshes, with a focus on
diff --git a/debian/copyright b/debian/copyright
index 61687a7..d508e16 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: ug
-Source: http://www.iwr.uni-heidelberg.de/wiki-link-pages/wiki-software
+Upstream-Name: dune-uggrid
+Source: https://gitlab.dune-project.org/staging/dune-uggrid/
 
 Files: *
 Copyright:
diff --git a/debian/libdune-uggrid-dev.install b/debian/libdune-uggrid-dev.install
new file mode 100644
index 0000000..da07fdd
--- /dev/null
+++ b/debian/libdune-uggrid-dev.install
@@ -0,0 +1,2 @@
+usr/include
+usr/lib
diff --git a/debian/libug-dev.install b/debian/libug-dev.install
deleted file mode 100644
index 111fa0c..0000000
--- a/debian/libug-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include
-usr/lib/*/cmake
-usr/lib/*/pkgconfig
-usr/lib/*/lib????.so
diff --git a/debian/libug3.12.1.install b/debian/libug3.12.1.install
deleted file mode 100644
index e5f94d8..0000000
--- a/debian/libug3.12.1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/lib*-*.so
diff --git a/debian/patches/link-test-fifo.patch b/debian/patches/link-test-fifo.patch
new file mode 100644
index 0000000..b5ae01b
--- /dev/null
+++ b/debian/patches/link-test-fifo.patch
@@ -0,0 +1,6 @@
+--- a/low/test/CMakeLists.txt
++++ b/low/test/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ dune_add_test(SOURCES test-fifo.cc)
+-target_link_libraries(test-fifo ugL2)
++target_link_libraries(test-fifo ugL2 ugS2)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cf19e95
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+link-test-fifo.patch
+use-dune_add_library.patch
diff --git a/debian/patches/use-dune_add_library.patch b/debian/patches/use-dune_add_library.patch
new file mode 100644
index 0000000..5aabdbd
--- /dev/null
+++ b/debian/patches/use-dune_add_library.patch
@@ -0,0 +1,11 @@
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -7,7 +7,7 @@
+ 
+ set(_dim_libs ug_gm np algebra udm ugui low)
+ 
+-ug_add_dim_libs(ugL SOURCES ../initug.cc OBJECT_DIM_LIBS ${_dim_libs} OBJECT_LIBS  devices low)
++ug_add_dim_libs(ugL DUNE SOURCES ../initug.cc OBJECT_DIM_LIBS ${_dim_libs} OBJECT_LIBS  devices low)
+ ug_add_dim_libs(ugS APPEND DUNE SOURCES ../initug.cc
+   OBJECT_DIM_LIBS ${_dim_libs} domS ${_parallel_dim_libs}
+   OBJECT_LIBS devices low ${_parallel_libs})
diff --git a/debian/rules b/debian/rules
index 5b13992..0e18963 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,9 @@
 #! /usr/bin/make -f
 
-CONFIGURE_FLAGS := \
-  --enable-dune \
-  --enable-shared \
-  --disable-static
+include /usr/share/dune/dune-debian.mk
 
 %:
-	dh $@ --with autoreconf
-
-override_dh_auto_configure:
-	dh_auto_configure -- $(CONFIGURE_FLAGS)
+	dh $@ --parallel --builddirectory=build
 
 override_dh_strip:
-	dh_strip --dbg-package=libug-dbg
-
-get-orig-source:
-	$(error Please use the get-orig-source script included in the dune-common source package)
+	dh_strip --dbg-package=libdune-uggrid-dbg

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

More information about the debian-science-commits mailing list