in 2.26.3-1:
* Patches no longer needed due to inclusion upstream or obsoleted
by upstream changes
- 0_versioned_plugin_config_file
and in 2.26.3 GVPLUGIN_CONFIG_FILE was introduced, with
# Increment if the interface has additions, changes, removals.
GVPLUGIN_CURRENT=6
and this was never changed between 2.26 and 2.38.
please check the proposed patch, if this works for you.
diff -Nru graphviz-2.38.0/debian/changelog graphviz-2.38.0/debian/changelog
--- graphviz-2.38.0/debian/changelog 2014-07-19 12:26:28.000000000 +0000
+++ graphviz-2.38.0/debian/changelog 2014-08-05 08:56:10.000000000 +0000
@@ -1,3 +1,13 @@
+graphviz (2.38.0-5) unstable; urgency=medium
+
+ * QA upload.
+ * Change the GVPLUGIN_CONFIG_FILE to /usr/lib/graphviz/config6a.
+ Closes: #756308.
+ * Remove old libgraphviz4 packaging files.
+ * Make library packages Multi-Arch: same.
+
+ -- Matthias Klose <d...@debian.org> Tue, 05 Aug 2014 10:51:22 +0200
+
graphviz (2.38.0-4) unstable; urgency=medium
* QA upload.
diff -Nru graphviz-2.38.0/debian/control graphviz-2.38.0/debian/control
--- graphviz-2.38.0/debian/control 2014-07-19 12:10:43.000000000 +0000
+++ graphviz-2.38.0/debian/control 2014-07-19 14:24:24.000000000 +0000
@@ -148,6 +148,8 @@
Package: libcgraph6
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libgraphviz4
Description: rich set of graph drawing tools - cgraph library
@@ -159,6 +161,8 @@
Package: libcdt5
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libgraphviz4
Description: rich set of graph drawing tools - cdt library
@@ -170,6 +174,8 @@
Package: libpathplan4
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libgraphviz4
Description: rich set of graph drawing tools - pathplan library
@@ -181,6 +187,8 @@
Package: libgvc6
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libgraphviz4, libgvc5
Description: rich set of graph drawing tools - gvc library
@@ -192,6 +200,8 @@
Package: libgvc6-plugins-gtk
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libgraphviz4, libgvc5-plugins-gtk
Description: rich set of graph drawing tools - gtk plugins
@@ -203,6 +213,8 @@
Package: libgvpr2
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libgraphviz4
Replaces: libgvpr1
@@ -215,6 +227,8 @@
Package: libxdot4
Architecture: any
Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libgraphviz4
Description: rich set of graph drawing tools - xdot library
@@ -226,6 +240,8 @@
Package: libgraphviz-dev
Architecture: any
Section: libdevel
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: libcdt5 (= ${binary:Version}),
libcgraph6 (= ${binary:Version}),
libgvc6 (= ${binary:Version}),
diff -Nru graphviz-2.38.0/debian/libcdt5.install
graphviz-2.38.0/debian/libcdt5.install
--- graphviz-2.38.0/debian/libcdt5.install 2013-12-16 06:43:34.000000000
+0000
+++ graphviz-2.38.0/debian/libcdt5.install 2014-07-19 14:17:54.000000000
+0000
@@ -1 +1 @@
-usr/lib/libcdt*.so.*
+usr/lib/*/libcdt*.so.*
diff -Nru graphviz-2.38.0/debian/libcgraph6.install
graphviz-2.38.0/debian/libcgraph6.install
--- graphviz-2.38.0/debian/libcgraph6.install 2013-12-16 06:43:34.000000000
+0000
+++ graphviz-2.38.0/debian/libcgraph6.install 2014-07-19 14:18:02.000000000
+0000
@@ -1 +1 @@
-usr/lib/libcgraph*.so.*
+usr/lib/*/libcgraph*.so.*
diff -Nru graphviz-2.38.0/debian/libgraphviz-dev.install
graphviz-2.38.0/debian/libgraphviz-dev.install
--- graphviz-2.38.0/debian/libgraphviz-dev.install 2014-01-16
08:48:27.000000000 +0000
+++ graphviz-2.38.0/debian/libgraphviz-dev.install 2014-07-19
14:18:51.000000000 +0000
@@ -1,7 +1,7 @@
usr/include/graphviz
-usr/lib/pkgconfig
-usr/lib/*.so
-usr/lib/graphviz/*.so
+usr/lib/*/pkgconfig
+usr/lib/*/*.so
+usr/lib/*/graphviz/*.so
# usr/share/man/man3/* w/o gv_*.3 (bindings)
usr/share/man/man3/cdt.3
diff -Nru graphviz-2.38.0/debian/libgraphviz4.install
graphviz-2.38.0/debian/libgraphviz4.install
--- graphviz-2.38.0/debian/libgraphviz4.install 2013-12-16 06:43:34.000000000
+0000
+++ graphviz-2.38.0/debian/libgraphviz4.install 1970-01-01 00:00:00.000000000
+0000
@@ -1,7 +0,0 @@
-# To be changed into an in extenso list if plugins are added
-usr/lib/graphviz/lib*.so.*
-usr/lib/lib*.so.*
-usr/share/lintian/overrides
-
-# Renamed afterwards to graphvizN-config-update in debian/rules
-usr/bin/dot usr/sbin
diff -Nru graphviz-2.38.0/debian/libgraphviz4.lintian-overrides
graphviz-2.38.0/debian/libgraphviz4.lintian-overrides
--- graphviz-2.38.0/debian/libgraphviz4.lintian-overrides 2013-12-16
06:43:34.000000000 +0000
+++ graphviz-2.38.0/debian/libgraphviz4.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-# That's not true, there's only one: 4
-libgraphviz4: several-sonames-in-same-package libcdt.so.5 libcgraph.so.6
libgraph.so.5 libgvc.so.5 libgvc_builtins.so.4 libpathplan.so.4 libxdot.so.4
-
-# We have several shared objects...
-libgraphviz4: package-name-doesnt-match-sonames libcdt5 libcgraph6 libgraph5
libgvc5 libgvc-builtins4 libpathplan4 libxdot4
diff -Nru graphviz-2.38.0/debian/libgraphviz4.postinst
graphviz-2.38.0/debian/libgraphviz4.postinst
--- graphviz-2.38.0/debian/libgraphviz4.postinst 2013-12-16
06:43:34.000000000 +0000
+++ graphviz-2.38.0/debian/libgraphviz4.postinst 1970-01-01
00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Update the configuration file (/usr/lib/graphviz/config3)
-# Needed for the plugins too
-if [ -x /usr/sbin/libgraphviz4-config-update ]; then
- /usr/sbin/libgraphviz4-config-update -c
-fi
-
-# Remove the old configuration file if present, see README.Debian-packaging
-# Needed only in libgraphivzN
-if [ -f /usr/lib/graphviz/config ]; then
- rm -f /usr/lib/graphviz/config
-fi
-
-#DEBHELPER#
diff -Nru graphviz-2.38.0/debian/libgraphviz4.postrm
graphviz-2.38.0/debian/libgraphviz4.postrm
--- graphviz-2.38.0/debian/libgraphviz4.postrm 2013-12-16 06:43:34.000000000
+0000
+++ graphviz-2.38.0/debian/libgraphviz4.postrm 1970-01-01 00:00:00.000000000
+0000
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Remove the configuration file if present, see README.Debian-packaging
-# Needed only in libgraphivzN
-if [ -f /usr/lib/graphviz/config4 ]; then
- rm -f /usr/lib/graphviz/config4
-fi
-
-
-#DEBHELPER#
diff -Nru graphviz-2.38.0/debian/libgv-guile.install
graphviz-2.38.0/debian/libgv-guile.install
--- graphviz-2.38.0/debian/libgv-guile.install 2013-12-16 06:43:34.000000000
+0000
+++ graphviz-2.38.0/debian/libgv-guile.install 2014-07-19 14:19:32.000000000
+0000
@@ -1,2 +1,2 @@
-usr/lib/graphviz/guile/libgv_guile.so
+usr/lib/*/graphviz/guile/libgv_guile.so
usr/share/man/man3/gv.3guile
diff -Nru graphviz-2.38.0/debian/libgv-lua.install
graphviz-2.38.0/debian/libgv-lua.install
--- graphviz-2.38.0/debian/libgv-lua.install 2013-12-16 06:43:34.000000000
+0000
+++ graphviz-2.38.0/debian/libgv-lua.install 2014-07-19 14:19:37.000000000
+0000
@@ -1,2 +1,2 @@
-usr/lib/graphviz/lua/libgv_lua.so
+usr/lib/*/graphviz/lua/libgv_lua.so
usr/share/man/man3/gv.3lua
diff -Nru graphviz-2.38.0/debian/libgv-ocaml.install
graphviz-2.38.0/debian/libgv-ocaml.install
--- graphviz-2.38.0/debian/libgv-ocaml.install 2013-12-16 06:43:34.000000000
+0000
+++ graphviz-2.38.0/debian/libgv-ocaml.install 2014-07-19 14:19:44.000000000
+0000
@@ -1,2 +1,2 @@
-usr/lib/graphviz/ocaml
+usr/lib/*/graphviz/ocaml
usr/share/man/man3/gv.3ocaml
diff -Nru graphviz-2.38.0/debian/libgv-perl.install
graphviz-2.38.0/debian/libgv-perl.install
--- graphviz-2.38.0/debian/libgv-perl.install 2014-07-14 15:51:10.000000000
+0000
+++ graphviz-2.38.0/debian/libgv-perl.install 2014-07-19 14:19:59.000000000
+0000
@@ -2,7 +2,7 @@
use Config;
my $vendorarch = substr( $Config{vendorarch}, 1 );
-print "usr/lib/graphviz/perl/gv.pm $vendorarch\n";
-print "usr/lib/graphviz/perl/gv.so $vendorarch/auto/gv\n";
-print "usr/lib/graphviz/perl/libgv_perl.so $vendorarch/auto/gv\n";
+print "usr/lib/*/graphviz/perl/gv.pm $vendorarch\n";
+print "usr/lib/*/graphviz/perl/gv.so $vendorarch/auto/gv\n";
+print "usr/lib/*/graphviz/perl/libgv_perl.so $vendorarch/auto/gv\n";
print "usr/share/man/man3/gv.3perl\n";
diff -Nru graphviz-2.38.0/debian/libgv-php5.install
graphviz-2.38.0/debian/libgv-php5.install
--- graphviz-2.38.0/debian/libgv-php5.install 2013-12-16 06:43:34.000000000
+0000
+++ graphviz-2.38.0/debian/libgv-php5.install 2014-07-19 14:20:09.000000000
+0000
@@ -1,2 +1,2 @@
-usr/lib/graphviz/php
+usr/lib/*/graphviz/php
usr/share/man/man3/gv.3php
diff -Nru graphviz-2.38.0/debian/libgv-python.install
graphviz-2.38.0/debian/libgv-python.install
--- graphviz-2.38.0/debian/libgv-python.install 2013-12-16 06:43:34.000000000
+0000
+++ graphviz-2.38.0/debian/libgv-python.install 2014-07-19 14:20:26.000000000
+0000
@@ -1,3 +1,3 @@
usr/lib/python*
-usr/lib/graphviz/python*
+usr/lib/*/graphviz/python*
usr/share/man/man3/gv.3python
diff -Nru graphviz-2.38.0/debian/libgv-ruby.install
graphviz-2.38.0/debian/libgv-ruby.install
--- graphviz-2.38.0/debian/libgv-ruby.install 2014-07-14 14:57:31.000000000
+0000
+++ graphviz-2.38.0/debian/libgv-ruby.install 2014-07-19 14:20:35.000000000
+0000
@@ -1,3 +1,3 @@
-usr/lib/graphviz/ruby/libgv_ruby.so
+usr/lib/*/graphviz/ruby/libgv_ruby.so
usr/share/man/man3/gv.3ruby
usr/lib/*/ruby/vendor_ruby/*/gv.so
diff -Nru graphviz-2.38.0/debian/libgv-tcl.install
graphviz-2.38.0/debian/libgv-tcl.install
--- graphviz-2.38.0/debian/libgv-tcl.install 2013-12-16 06:43:34.000000000
+0000
+++ graphviz-2.38.0/debian/libgv-tcl.install 2014-07-19 14:20:46.000000000
+0000
@@ -1,4 +1,4 @@
-usr/lib/graphviz/tcl/* usr/lib/tcltk/graphviz
+usr/lib/*/graphviz/tcl/* usr/lib/tcltk/graphviz
usr/share/man/man3/gv.3tcl
usr/share/man/man3/gdtclft.3tcl
usr/share/man/man3/tkspline.3tk
diff -Nru graphviz-2.38.0/debian/libgvc6-plugins-gtk.install
graphviz-2.38.0/debian/libgvc6-plugins-gtk.install
--- graphviz-2.38.0/debian/libgvc6-plugins-gtk.install 2014-01-16
08:46:27.000000000 +0000
+++ graphviz-2.38.0/debian/libgvc6-plugins-gtk.install 2014-07-19
14:19:25.000000000 +0000
@@ -1,2 +1,2 @@
# To be changed into an in extenso list if plugins are added
-usr/lib/graphviz/libgvplugin_gtk.so.*
+usr/lib/*/graphviz/libgvplugin_gtk.so.*
diff -Nru graphviz-2.38.0/debian/libgvc6-plugins-gtk.postinst
graphviz-2.38.0/debian/libgvc6-plugins-gtk.postinst
--- graphviz-2.38.0/debian/libgvc6-plugins-gtk.postinst 2014-07-17
18:43:57.000000000 +0000
+++ graphviz-2.38.0/debian/libgvc6-plugins-gtk.postinst 2014-08-05
08:49:22.000000000 +0000
@@ -2,7 +2,7 @@
set -e
-# Update the configuration file (/usr/lib/graphviz/config6)
+# Update the configuration file (/usr/lib/graphviz/config6a)
if [ -x /usr/sbin/libgvc6-config-update ]; then
libgvc6-config-update -c
fi
diff -Nru graphviz-2.38.0/debian/libgvc6-plugins-gtk.postrm
graphviz-2.38.0/debian/libgvc6-plugins-gtk.postrm
--- graphviz-2.38.0/debian/libgvc6-plugins-gtk.postrm 2014-07-17
18:44:18.000000000 +0000
+++ graphviz-2.38.0/debian/libgvc6-plugins-gtk.postrm 2014-08-05
08:49:29.000000000 +0000
@@ -2,7 +2,7 @@
set -e
-# Update the configuration file (/usr/lib/graphviz/config6)
+# Update the configuration file (/usr/lib/graphviz/config6a)
if [ -x /usr/sbin/libgvc6-config-update ]; then
libgvc6-config-update -c
fi
diff -Nru graphviz-2.38.0/debian/libgvc6.install
graphviz-2.38.0/debian/libgvc6.install
--- graphviz-2.38.0/debian/libgvc6.install 2013-12-16 06:43:34.000000000
+0000
+++ graphviz-2.38.0/debian/libgvc6.install 2014-07-19 14:19:19.000000000
+0000
@@ -1,11 +1,11 @@
# To be changed into an in extenso list if plugins are added
-usr/lib/graphviz/libgvplugin_core.so.*
-usr/lib/graphviz/libgvplugin_gd.so.*
-usr/lib/graphviz/libgvplugin_neato_layout.so.*
-usr/lib/graphviz/libgvplugin_pango.so.*
-usr/lib/graphviz/libgvplugin_xlib.so.*
-usr/lib/graphviz/libgvplugin_dot_layout.so.*
-usr/lib/libgvc*.so.*
+usr/lib/*/graphviz/libgvplugin_core.so.*
+usr/lib/*/graphviz/libgvplugin_gd.so.*
+usr/lib/*/graphviz/libgvplugin_neato_layout.so.*
+usr/lib/*/graphviz/libgvplugin_pango.so.*
+usr/lib/*/graphviz/libgvplugin_xlib.so.*
+usr/lib/*/graphviz/libgvplugin_dot_layout.so.*
+usr/lib/*/libgvc*.so.*
# Renamed afterwards to libgvcN-config-update in debian/rules
usr/bin/dot usr/sbin
diff -Nru graphviz-2.38.0/debian/libgvc6.postinst
graphviz-2.38.0/debian/libgvc6.postinst
--- graphviz-2.38.0/debian/libgvc6.postinst 2014-07-17 18:44:52.000000000
+0000
+++ graphviz-2.38.0/debian/libgvc6.postinst 2014-08-05 08:50:53.000000000
+0000
@@ -2,7 +2,7 @@
set -e
-# Update the configuration file (/usr/lib/graphviz/config6)
+# Update the configuration file (/usr/lib/graphviz/config6a)
# Needed for the plugins too
if [ -x /usr/sbin/libgvc6-config-update ]; then
libgvc6-config-update -c
@@ -11,7 +11,11 @@
# Remove the old configuration file if present, see README.Debian-packaging
# Needed only in libgraphivzN
if [ -f /usr/lib/graphviz/config ]; then
- rm -f /usr/lib/graphviz/config
+ rm -f /usr/lib/graphviz/config6
+fi
+# the current one is now /usr/lib/graphviz/config6a
+if [ -f /usr/lib/graphviz/config6a ]; then
+ rm -f /usr/lib/graphviz/config6
fi
#DEBHELPER#
diff -Nru graphviz-2.38.0/debian/libgvc6.postrm
graphviz-2.38.0/debian/libgvc6.postrm
--- graphviz-2.38.0/debian/libgvc6.postrm 2013-12-16 06:43:34.000000000
+0000
+++ graphviz-2.38.0/debian/libgvc6.postrm 2014-08-05 08:46:27.000000000
+0000
@@ -7,6 +7,9 @@
if [ -f /usr/lib/graphviz/config6 ]; then
rm -f /usr/lib/graphviz/config6
fi
+if [ -f /usr/lib/graphviz/config6a ]; then
+ rm -f /usr/lib/graphviz/config6a
+fi
#DEBHELPER#
diff -Nru graphviz-2.38.0/debian/libgvpr2.install
graphviz-2.38.0/debian/libgvpr2.install
--- graphviz-2.38.0/debian/libgvpr2.install 2013-12-16 06:43:34.000000000
+0000
+++ graphviz-2.38.0/debian/libgvpr2.install 2014-07-19 14:20:15.000000000
+0000
@@ -1 +1 @@
-usr/lib/libgvpr*.so.*
+usr/lib/*/libgvpr*.so.*
diff -Nru graphviz-2.38.0/debian/libpathplan4.install
graphviz-2.38.0/debian/libpathplan4.install
--- graphviz-2.38.0/debian/libpathplan4.install 2013-12-16 06:43:34.000000000
+0000
+++ graphviz-2.38.0/debian/libpathplan4.install 2014-07-19 14:20:56.000000000
+0000
@@ -1 +1 @@
-usr/lib/libpathplan*.so.*
+usr/lib/*/libpathplan*.so.*
diff -Nru graphviz-2.38.0/debian/libxdot4.install
graphviz-2.38.0/debian/libxdot4.install
--- graphviz-2.38.0/debian/libxdot4.install 2013-12-16 06:43:34.000000000
+0000
+++ graphviz-2.38.0/debian/libxdot4.install 2014-07-19 14:21:02.000000000
+0000
@@ -1 +1 @@
-usr/lib/libxdot*.so.*
+usr/lib/*/libxdot*.so.*
diff -Nru graphviz-2.38.0/debian/patches/series
graphviz-2.38.0/debian/patches/series
--- graphviz-2.38.0/debian/patches/series 2014-07-19 12:25:03.000000000
+0000
+++ graphviz-2.38.0/debian/patches/series 2014-08-05 08:24:16.000000000
+0000
@@ -10,3 +10,4 @@
ruby-2.1.diff
reduce-lab-color.patch
add-libm-to-dot-link.patch
+versioned-plugin-config-file.diff
diff -Nru graphviz-2.38.0/debian/patches/versioned-plugin-config-file.diff
graphviz-2.38.0/debian/patches/versioned-plugin-config-file.diff
--- graphviz-2.38.0/debian/patches/versioned-plugin-config-file.diff
1970-01-01 00:00:00.000000000 +0000
+++ graphviz-2.38.0/debian/patches/versioned-plugin-config-file.diff
2014-08-05 08:43:41.000000000 +0000
@@ -0,0 +1,15 @@
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,7 +54,9 @@ GVPLUGIN_REVISION=0
+ # precedence over adding, so set to 0 if both happened.
+ GVPLUGIN_AGE=0
+
+-GVPLUGIN_CONFIG_FILE="config$GVPLUGIN_CURRENT"
++# upstream didn't bump GVPLUGIN_CURRENT between 2.26 (gvc5) and 2.38 (gvc6).
++# just append something to differentiate this, don't go ahead before upstream
++GVPLUGIN_CONFIG_FILE="config$GVPLUGIN_CURRENT"a
+ AC_DEFINE_UNQUOTED(GVPLUGIN_CONFIG_FILE,"$GVPLUGIN_CONFIG_FILE",[Filename for
plugin configuration file.])
+ AC_SUBST([GVPLUGIN_CONFIG_FILE])
+
diff -Nru graphviz-2.38.0/debian/rules graphviz-2.38.0/debian/rules
--- graphviz-2.38.0/debian/rules 2014-07-14 15:42:16.000000000 +0000
+++ graphviz-2.38.0/debian/rules 2014-07-19 14:17:15.000000000 +0000
@@ -61,6 +61,7 @@
./configure --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
--disable-silent-rules \
--prefix=/usr \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--datadir=\$${prefix}/share \
--infodir=\$${prefix}/share/info \
--mandir=\$${prefix}/share/man \
@@ -147,13 +148,13 @@
# out if it is another case, while ignoring if there's no
# RPATH at all (there are shell scripts under /usr/bin).
for i in `find debian/tmp/usr/bin debian/tmp/usr/lib -type f` ; do \
- case `chrpath -l -k $$i` in \
- *RPATH=/usr/lib/graphviz) ;; \
- *RPATH=/usr/lib) chrpath -d $$i ;; \
- *RPATH=/usr/lib:/usr/lib/graphviz) chrpath -r
/usr/lib/graphviz $$i ;; \
- *RPATH=*) echo "Unknown RPATH: $$i" ; exit 1 ;; \
- *) ;; \
- esac ; \
+ case `chrpath -l -k $$i` in \
+ *RPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/graphviz) ;; \
+ *RPATH=/usr/lib/$(DEB_HOST_MULTIARCH)) chrpath -d $$i ;; \
+
*RPATH=/usr/lib/$(DEB_HOST_MULTIARCH):/usr/lib/$(DEB_HOST_MULTIARCH)/graphviz)
chrpath -r /usr/lib/$(DEB_HOST_MULTIARCH)/graphviz $$i ;; \
+ *RPATH=*) echo "Unknown RPATH: $$i" ; exit 1 ;; \
+ *) ;; \
+ esac ; \
done
# Compute the dependencies of the -dev package
@@ -166,7 +167,7 @@
--override s/libgvpr$(SO_GVPR)-dev// \
--override s/libxdot$(SO_XDOT)-dev// \
$(CURDIR)/debian/libgraphviz-dev.substvars \
- $(CURDIR)/debian/tmp/usr/lib/*.so
+ $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.so
# Move from debian/tmp to the appropriate packages, rename one binary
DH_COMPAT=9 dh_install --sourcedir=debian/tmp --list-missing
@@ -175,21 +176,21 @@
# Some additional work for libgv-php5
install -d $(PHP_PACKAGE)/$(PHP_EXTENSION_DIR)
- mv $(PHP_PACKAGE)/usr/lib/graphviz/php/libgv_php.so \
+ mv
$(PHP_PACKAGE)/usr/lib/$(DEB_HOST_MULTIARCH)/graphviz/php/libgv_php.so \
$(PHP_PACKAGE)/$(PHP_EXTENSION_DIR)/gv.so
install -d $(PHP_PACKAGE)/usr/share/php/libgv-php5
- mv $(PHP_PACKAGE)/usr/lib/graphviz/php/gv.php \
+ mv $(PHP_PACKAGE)/usr/lib/$(DEB_HOST_MULTIARCH)/graphviz/php/gv.php \
$(PHP_PACKAGE)/usr/share/php/libgv-php5
- rm -rf $(PHP_PACKAGE)/usr/lib/graphviz
+ rm -rf $(PHP_PACKAGE)/usr/lib/$(DEB_HOST_MULTIARCH)/graphviz
echo "php:Depends=phpapi-`php-config5 --phpapi`" >>
$(PHP_PACKAGE).substvars
# Some additional work for libgv-lua
# 1. Rename using the LUA_VERSION
- mv $(LUA_PACKAGE)/usr/lib/graphviz/lua/libgv_lua.so \
-
$(LUA_PACKAGE)/usr/lib/graphviz/lua/liblua$(LUA_VERSION)-libgv.so
+ mv
$(LUA_PACKAGE)/usr/lib/$(DEB_HOST_MULTIARCH)/graphviz/lua/libgv_lua.so \
+
$(LUA_PACKAGE)/usr/lib/$(DEB_HOST_MULTIARCH)/graphviz/lua/liblua$(LUA_VERSION)-libgv.so
# 2. Add a symlink
- install -d $(LUA_PACKAGE)/usr/lib/lua/$(LUA_VERSION)
- ln -s /usr/lib/graphviz/lua/liblua$(LUA_VERSION)-libgv.so \
+ install -d
$(LUA_PACKAGE)/usr/lib/$(DEB_HOST_MULTIARCH)/lua/$(LUA_VERSION)
+ ln -s
/usr/lib/$(DEB_HOST_MULTIARCH)/graphviz/lua/liblua$(LUA_VERSION)-libgv.so \
$(LUA_PACKAGE)/usr/lib/lua/$(LUA_VERSION)/gv.so
# Some additional work for libgv-python
@@ -199,12 +200,12 @@
# will just do the right thing.
for i in $(PYTHON_VERSIONS); do \
install -d $(PYTHON_PACKAGE)/usr/lib/$$i/$(call py_sitename_sh,
$$i) ; \
- cp $(PYTHON_PACKAGE)/usr/lib/graphviz/python/gv.py \
+ cp
$(PYTHON_PACKAGE)/usr/lib/$(DEB_HOST_MULTIARCH)/graphviz/python/gv.py \
$(PYTHON_PACKAGE)/usr/lib/$$i/$(call py_sitename_sh,
$$i) ; \
- mv $(PYTHON_PACKAGE)/usr/lib/graphviz/$$(echo $$i|sed -e
's/\.//')/*.so \
+ mv
$(PYTHON_PACKAGE)/usr/lib/$(DEB_HOST_MULTIARCH)/graphviz/$$(echo $$i|sed -e
's/\.//')/*.so \
$(PYTHON_PACKAGE)/usr/lib/$$i/$(call py_sitename_sh,
$$i) ; \
done
- rm -rf $(PYTHON_PACKAGE)/usr/lib/graphviz
+ rm -rf $(PYTHON_PACKAGE)/usr/lib/$(DEB_HOST_MULTIARCH)/graphviz
# Debian-specific manpage
dh_installman -plibgvc$(SO_GVC) \
