[Pkg-libvirt-commits] [gtk-vnc] 13/26: Changes from Ubuntu to add multiarch and avoid a FTBFS
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Mon Jan 9 06:28:12 UTC 2017
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian/sid
in repository gtk-vnc.
commit 07767c2d151bcc1b66397221b56ca27661634d9d
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Mon Jan 9 02:49:10 2017 -0200
Changes from Ubuntu to add multiarch and avoid a FTBFS
---
debian/control | 9 +++++++++
debian/gir1.2-gtk-vnc-2.0.install | 2 +-
debian/libgtk-vnc-1.0-0.install | 2 +-
debian/libgtk-vnc-1.0-dev.install | 4 ++--
debian/libgtk-vnc-2.0-0.install | 2 +-
debian/libgtk-vnc-2.0-dev.install | 4 ++--
debian/libgvnc-1.0-0.install | 4 ++--
debian/libgvnc-1.0-dev.install | 8 ++++----
debian/rules | 4 +++-
9 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/debian/control b/debian/control
index e75ee86..91b026b 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,9 @@ Homepage: https://wiki.gnome.org/Projects/gtk-vnc
Package: libgvnc-1.0-0
Architecture: any
+Multi-Arch: same
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Replaces: libgtk-vnc-1.0-0 (<= 0.4.3-1)
Description: VNC gobject wrapper (runtime libraries)
@@ -46,6 +48,7 @@ Description: VNC gobject wrapper (runtime libraries)
Package: libgvnc-1.0-0-dbg
Architecture: any
+Multi-Arch: same
Section: debug
Depends: libgvnc-1.0-0 (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Breaks: libgtk-vnc-1.0-0-dbg (<< 0.4.3-2)
@@ -84,7 +87,9 @@ Description: VNC GObject wrapper (development files)
Package: libgtk-vnc-1.0-0
Architecture: any
+Multi-Arch: same
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: VNC viewer widget for GTK+2 (runtime libraries)
It is built using coroutines, allowing it to be completely asynchronous while
@@ -99,6 +104,7 @@ Description: VNC viewer widget for GTK+2 (runtime libraries)
Package: libgtk-vnc-1.0-0-dbg
Architecture: any
+Multi-Arch: same
Section: debug
Depends: libgtk-vnc-1.0-0 (=${binary:Version}),
${misc:Depends},
@@ -137,6 +143,7 @@ Description: VNC viewer widget for GTK+2 (development files)
Package: libgtk-vnc-2.0-0
Architecture: any
+Multi-Arch: same
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: VNC viewer widget for GTK+3 (runtime libraries)
@@ -152,6 +159,7 @@ Description: VNC viewer widget for GTK+3 (runtime libraries)
Package: libgtk-vnc-2.0-0-dbg
Architecture: any
+Multi-Arch: same
Section: debug
Depends: libgtk-vnc-2.0-0 (=${binary:Version}),
${misc:Depends},
@@ -192,6 +200,7 @@ Description: VNC viewer widget for GTK+3 (development files)
Package: gir1.2-gtk-vnc-2.0
Section: introspection
Architecture: any
+Multi-Arch: same
Provides: gir1.2-gvnc-1.0
Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}
Description: GObject introspection data for GTK-VNC.
diff --git a/debian/gir1.2-gtk-vnc-2.0.install b/debian/gir1.2-gtk-vnc-2.0.install
index 75f1a9b..49d71c9 100644
--- a/debian/gir1.2-gtk-vnc-2.0.install
+++ b/debian/gir1.2-gtk-vnc-2.0.install
@@ -1 +1 @@
-usr/lib/girepository-1.0
+usr/lib/*/girepository-1.0
diff --git a/debian/libgtk-vnc-1.0-0.install b/debian/libgtk-vnc-1.0-0.install
index 63444e0..bfe703a 100644
--- a/debian/libgtk-vnc-1.0-0.install
+++ b/debian/libgtk-vnc-1.0-0.install
@@ -1 +1 @@
-/usr/lib/libgtk-vnc-*.so.*
+/usr/lib/*/libgtk-vnc-*.so.*
diff --git a/debian/libgtk-vnc-1.0-dev.install b/debian/libgtk-vnc-1.0-dev.install
index 656431a..890a94f 100644
--- a/debian/libgtk-vnc-1.0-dev.install
+++ b/debian/libgtk-vnc-1.0-dev.install
@@ -1,3 +1,3 @@
/usr/include/gtk-vnc-1.0/
-/usr/lib/libgtk-vnc-1.0.so
-/usr/lib/pkgconfig/gtk-vnc-1.0.*
+/usr/lib/*/libgtk-vnc-1.0.so
+/usr/lib/*/pkgconfig/gtk-vnc-1.0.*
diff --git a/debian/libgtk-vnc-2.0-0.install b/debian/libgtk-vnc-2.0-0.install
index 63444e0..bfe703a 100644
--- a/debian/libgtk-vnc-2.0-0.install
+++ b/debian/libgtk-vnc-2.0-0.install
@@ -1 +1 @@
-/usr/lib/libgtk-vnc-*.so.*
+/usr/lib/*/libgtk-vnc-*.so.*
diff --git a/debian/libgtk-vnc-2.0-dev.install b/debian/libgtk-vnc-2.0-dev.install
index 1d62b05..6b54759 100644
--- a/debian/libgtk-vnc-2.0-dev.install
+++ b/debian/libgtk-vnc-2.0-dev.install
@@ -1,5 +1,5 @@
/usr/include/gtk-vnc-2.0/
-/usr/lib/libgtk-vnc-2.0.so
-/usr/lib/pkgconfig/gtk-vnc-2.0.*
+/usr/lib/*/libgtk-vnc-2.0.so
+/usr/lib/*/pkgconfig/gtk-vnc-2.0.*
/usr/share/gir-1.0/GtkVnc-2.0.gir
/usr/share/vala/vapi/gtk-vnc-2.0.*
diff --git a/debian/libgvnc-1.0-0.install b/debian/libgvnc-1.0-0.install
index c19efa8..6f40b47 100644
--- a/debian/libgvnc-1.0-0.install
+++ b/debian/libgvnc-1.0-0.install
@@ -1,2 +1,2 @@
-/usr/lib/libgvnc-*.so.*
-/usr/lib/libgvncpulse-*.so.*
+/usr/lib/*/libgvnc-*.so.*
+/usr/lib/*/libgvncpulse-*.so.*
diff --git a/debian/libgvnc-1.0-dev.install b/debian/libgvnc-1.0-dev.install
index c7020cc..eb371fe 100644
--- a/debian/libgvnc-1.0-dev.install
+++ b/debian/libgvnc-1.0-dev.install
@@ -1,9 +1,9 @@
/usr/include/gvnc-1.0/
/usr/include/gvncpulse-1.0/
-/usr/lib/libgvnc-1.0.so
-/usr/lib/libgvncpulse-1.0.so
-/usr/lib/pkgconfig/gvnc-1.0.pc
-/usr/lib/pkgconfig/gvncpulse-1.0.pc
+/usr/lib/*/libgvnc-1.0.so
+/usr/lib/*/libgvncpulse-1.0.so
+/usr/lib/*/pkgconfig/gvnc-1.0.pc
+/usr/lib/*/pkgconfig/gvncpulse-1.0.pc
/usr/share/gir-1.0/GVnc-1.0.gir
/usr/share/gir-1.0/GVncPulse-1.0.gir
/usr/share/vala/vapi/gvnc-1.0.vapi
diff --git a/debian/rules b/debian/rules
index 6375ccb..cea5798 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,18 @@
#! /usr/bin/make -f
%:
- dh $@ --with python2
+ dh $@ --with python2,autoreconf
override_dh_auto_configure:
dh_auto_configure -B build/gtk2 -- --with-gtk=2.0 \
--with-python \
--disable-introspection \
+ --libdir="\$${prefix}/lib/$(DEB_HOST_MULTIARCH)" \
$(shell dpkg-buildflags --export=configure)
dh_auto_configure -B build/gtk3 -- --with-gtk=3.0 \
--with-examples \
--enable-introspection \
+ --libdir="\$${prefix}/lib/$(DEB_HOST_MULTIARCH)" \
$(shell dpkg-buildflags --export=configure)
override_dh_auto_build:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/gtk-vnc.git
More information about the Pkg-libvirt-commits
mailing list