[netcdf] 01/01: libnetcdfc7 -> libnetcdf7

[Nico Schlömer]

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

nschloe-guest pushed a commit to branch split-c-f-cxx
in repository netcdf.

commit 12bfffc70f211861426472bd156c1c1f2c5ad5b1
Author: Nico Schlömer <nico.schloemer at gmail.com>
Date:   Tue May 20 13:51:57 2014 +0200

    libnetcdfc7 -> libnetcdf7
---
 debian/control                               | 9 ++++-----
 debian/{libnetcdfc7.dirs => libnetcdf7.dirs} | 0
 debian/rules                                 | 9 ---------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index f6c3ed2..22d7ef1 100644
--- a/debian/control
+++ b/debian/control
@@ -25,12 +25,12 @@ Description: Documentation for NetCDF and CF
  This package contains documentation for the NetCDF library in a
  variety of formats.
 
-Package: libnetcdfc7
+Package: libnetcdf7
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4
-Breaks: libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4
+Replaces: libnetcdfc7 (<= 4.2.0), libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4
+Breaks: libnetcdfc7 (<= 4.2.0), libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4
 Description: Interface for scientific data access to large binary data
  NetCDF (network Common Data Form) is an interface for scientific
  data access and a freely-distributed software library that provides an
@@ -46,8 +46,7 @@ Package: netcdf-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libnetcdfc7 (= ${binary:Version}), libnetcdff5 (= ${binary:Version}),
- libnetcdfc++4 (= ${binary:Version}), ${misc:Depends}
+Depends: libnetcdf7 (= ${binary:Version}), ${misc:Depends}
 Suggests: gdb
 Description: debugging symbols for NetCDF
  This package contains the files that make it possible to debug the
diff --git a/debian/libnetcdfc7.dirs b/debian/libnetcdf7.dirs
similarity index 100%
rename from debian/libnetcdfc7.dirs
rename to debian/libnetcdf7.dirs
diff --git a/debian/rules b/debian/rules
index dec59ce..3b9bdc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
 %:
 	dh $@ --buildsystem=cmake
 
-# Don't BUILD_DOCS, cf. <https://github.com/Unidata/netcdf-c/issues/56>.
 override_dh_auto_configure:
 	dh_auto_configure -- \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
@@ -30,16 +29,8 @@ install/libnetcdf-dev::
 	find debian/tmp/usr/lib/ -type l -a -name "libnetcdf*" -a -name '*.so' -exec cp -d {} debian/libnetcdf-dev/usr/lib/. \;
 	find debian/tmp/usr/lib/ -type f -a -name "libnetcdf*" -a -name '*.a' -exec cp -d {} debian/libnetcdf-dev/usr/lib/. \;
 
-install/netcdf-bin::
-	mv debian/tmp/usr/bin/* debian/netcdf-bin/usr/bin/
-
 install/netcdf-doc::
 	install -d debian/tmp/doc
 	install -d debian/tmp/usr/share/doc/netcdf
 	install -d debian/tmp/usr/share/info
 	install -m 644 -o root -g root $(CURDIR)/man4/*.html debian/tmp/doc/.
-	install -m 644 -o root -g root $(CURDIR)/man4/*.pdf debian/tmp/usr/share/doc/netcdf/.
-	install -m 644 -o root -g root $(CURDIR)/man4/*.txt debian/tmp/usr/share/doc/netcdf/.
-	install -m 644 -o root -g root $(CURDIR)/man4/*.ps debian/tmp/usr/share/doc/netcdf/.
-	install -m 644 -o root -g root $(CURDIR)/man4/*.info debian/tmp/usr/share/info/.
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git