[libvigraimpex] 03/04: don't ship libvigraimpex-dev with old style vigra-config script
Daniel Stender
danstender-guest at moszumanska.debian.org
Mon Feb 15 02:47:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
danstender-guest pushed a commit to branch master
in repository libvigraimpex.
commit 9d2ad8cf6810fb80fc12f6349e30e868d5090515
Author: Daniel Stender <debian at danielstender.com>
Date: Sun Feb 14 22:44:04 2016 +0100
don't ship libvigraimpex-dev with old style vigra-config script
---
debian/NEWS | 9 +++++++++
debian/changelog | 3 ++-
debian/control | 3 +--
debian/libvigraimpex-dev.install | 1 -
debian/libvigraimpex-dev.manpages | 1 -
debian/rules | 1 -
debian/vigra-config.1 | 28 ----------------------------
7 files changed, 12 insertions(+), 34 deletions(-)
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..8eb1a55
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,9 @@
+libvigraimpex (1.10.0+git20160211.167be93-1) experimental; urgency=medium
+
+ libvigraimpex-dev isn't shipped any longer with the convenience script
+ /usr/bin/vigra-config. This is an old style config script which would need
+ to disable multiarch support for the development package. pkg-config
+ support for libvigraimpex is going to be available very soon, this could be
+ used instead then.
+
+ -- Daniel Stender <debian at danielstender.com> Sun, 14 Feb 2016 21:59:52 +0100
diff --git a/debian/changelog b/debian/changelog
index ece65b6..3c8b335 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libvigraimpex (1.10.0+git20160211.167be93-1) UNRELEASED; urgency=medium
[ Daniel Stender ]
* Build libvigraimpex6 (Closes: #813415).
* Add support for multiarch (Closes: #812560).
+ + don't ship libvigraimpex-dev with old style vigra-config script.
* deb/control:
+ depend libvigraimpex-dev on libpng-dev [thanks to Tobias Frost].
+ use HTTPS for Vcs fields.
@@ -25,7 +26,7 @@ libvigraimpex (1.10.0+git20160211.167be93-1) UNRELEASED; urgency=medium
+ deb/control: version libboost-python-dev build-dependency.
+ deb/rules: tighten dh_makeshlibs -V argument.
- -- Daniel Stender <debian at danielstender.com> Sun, 14 Feb 2016 20:55:59 +0100
+ -- Daniel Stender <debian at danielstender.com> Sun, 14 Feb 2016 22:04:33 +0100
libvigraimpex (1.10.0+git20160120.803d5d4-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index c111d0c..a4ae820 100644
--- a/debian/control
+++ b/debian/control
@@ -44,8 +44,7 @@ Depends:
libpng-dev,
libtiff5-dev,
libvigraimpex6 (= ${binary:Version}),
- ${misc:Depends},
- ${python:Depends}
+ ${misc:Depends}
Suggests:
libvigraimpex-doc
Description: development files for the C++ computer vision library
diff --git a/debian/libvigraimpex-dev.install b/debian/libvigraimpex-dev.install
index fccf26c..8b3b981 100644
--- a/debian/libvigraimpex-dev.install
+++ b/debian/libvigraimpex-dev.install
@@ -1,3 +1,2 @@
-/usr/bin/vigra-config
/usr/include/*
/usr/lib/*/lib*.so
diff --git a/debian/libvigraimpex-dev.manpages b/debian/libvigraimpex-dev.manpages
deleted file mode 100644
index 7f077bf..0000000
--- a/debian/libvigraimpex-dev.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/vigra-config.1
diff --git a/debian/rules b/debian/rules
index a9715ab..0ee0742 100755
--- a/debian/rules
+++ b/debian/rules
@@ -110,7 +110,6 @@ binary-arch: build-arch
sh debian/convert-changelog.sh < docsrc/credits_changelog.dxx > doc/changelog
dh_installchangelogs -a
dh_installexamples -a
- dh_installman -a
dh_lintian -a
dh_python2 -a
dh_link -a
diff --git a/debian/vigra-config.1 b/debian/vigra-config.1
deleted file mode 100644
index 38c2371..0000000
--- a/debian/vigra-config.1
+++ /dev/null
@@ -1,28 +0,0 @@
-.TH VIGRA-CONFIG "1" "January 2011" "vigra-config 1.7.1" "User Commands"
-.SH NAME
-vigra-config \- get information about the installed version of VIGRA
-.SH SYNOPSIS
-.B vigra-config
-[\fIoptions\fR]
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Display help message and exit.
-.TP
-\fB\-\-version\fR
-Print version information.
-.TP
-\fB\-\-impex\-lib\fR, \fB\-\-libs\fR
-Print the linker flags that are needed to link with the \fBlibvigraimpex\fR library.
-.TP
-\fB\-\-fftw\-lib\fR
-Print the linker flags that are needed to link with the FFTW library.
-.TP
-\fB\-\-cppflags\fR
-Print the compiler flags that are needed to find the VIGRA include files.
-.TP
-\fB\-\-include\-path\fR, \fB\-\-includepath\fR
-Print path to VIGRA include files.
-.TP
-\fB\-\-docdir\fR
-Print path to VIGRA documentation.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libvigraimpex.git
More information about the debian-science-commits
mailing list