Bug#645104: (no subject)

[Janne Snabb]

See attached patch.

Move the gnome-pty-helper into the -common package and install
only a single copy of this set-gid binary in /usr/lib/libvte.

The downside of this approach is that the -common package becomes
architecture specific.

This patch is against the Ubuntu source package but it probably
works with the Debian package too.
-------------- next part --------------
=== modified file 'debian/control'
--- debian/control	2011-09-07 07:41:26 +0000
+++ debian/control	2011-10-12 18:48:15 +0000
@@ -137,7 +137,7 @@
  VTE widget with GTK+ 3.0.
 
 Package: libvte-common
-Architecture: all
+Architecture: any
 Depends: ${misc:Depends}
 Replaces: libvte2 (<= 0.5.1-2)
 Breaks: libvte9 (<< 1:0.28)

=== modified file 'debian/control.in'
--- debian/control.in	2011-09-07 07:41:26 +0000
+++ debian/control.in	2011-10-12 18:47:47 +0000
@@ -132,7 +132,7 @@
  VTE widget with GTK+ 3.0.
 
 Package: libvte-common
-Architecture: all
+Architecture: any
 Depends: ${misc:Depends}
 Replaces: libvte2 (<= 0.5.1-2)
 Breaks: libvte9 (<< 1:0.28)

=== modified file 'debian/libvte-2.90-9.install'
--- debian/libvte-2.90-9.install	2011-05-17 10:19:47 +0000
+++ debian/libvte-2.90-9.install	2011-10-12 18:46:06 +0000
@@ -1,2 +1,1 @@
 usr/lib/libvte2_90.so.*
-usr/lib/libvte2-90

=== removed file 'debian/libvte-2.90-9.lintian-overrides'
--- debian/libvte-2.90-9.lintian-overrides	2011-05-17 10:19:47 +0000
+++ debian/libvte-2.90-9.lintian-overrides	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-# Setgid on purpose to write the utmp file
-libvte-2.90-9: setgid-binary usr/lib/libvte2-90/gnome-pty-helper 2755 root/utmp
-# Not a big deal, and not worth fixing.
-libvte-2.90-9: package-name-doesnt-match-sonames libvte2-90-9
-

=== modified file 'debian/libvte-common.install'
--- debian/libvte-common.install	2011-05-17 10:19:47 +0000
+++ debian/libvte-common.install	2011-10-12 18:47:01 +0000
@@ -1,3 +1,4 @@
+usr/lib/libvte
 usr/share/locale
 usr/share/glade3
 usr/share/vte/termcap-0.0

=== renamed file 'debian/libvte9.lintian-overrides' => 'debian/libvte-common.lintian-overrides'
--- debian/libvte9.lintian-overrides	2011-05-17 10:19:47 +0000
+++ debian/libvte-common.lintian-overrides	2011-10-12 18:41:15 +0000
@@ -1,2 +1,2 @@
 # Setgid on purpose to write the utmp file
-libvte9: setgid-binary usr/lib/libvte9/gnome-pty-helper 2755 root/utmp
+libvte9: setgid-binary usr/lib/libvte/gnome-pty-helper 2755 root/utmp

=== modified file 'debian/libvte9.install'
--- debian/libvte9.install	2011-05-17 10:19:47 +0000
+++ debian/libvte9.install	2011-10-12 18:46:30 +0000
@@ -1,2 +1,1 @@
 usr/lib/libvte.so.*
-usr/lib/libvte9

=== modified file 'debian/rules'
--- debian/rules	2011-09-07 07:41:26 +0000
+++ debian/rules	2011-10-12 18:40:13 +0000
@@ -22,14 +22,13 @@
 DEB_CONFIGURE_EXTRA_FLAGS += PYTHON="/usr/bin/$(cdbs_make_curflavor)"
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
+	--libexecdir=/usr/lib/libvte \
 	--enable-glade-catalogue
 
 DEB_CONFIGURE_FLAGS_main += \
-	--libexecdir=/usr/lib/$(libvteN) \
 	--disable-python
 
 DEB_CONFIGURE_FLAGS_gtk3 += \
-	--libexecdir=/usr/lib/libvte2-90 \
 	--with-gtk=3.0 \
 	--enable-introspection \
 	--disable-python