r47886 - in /desktop/unstable/evince/debian: changelog control control.in gir1.2-evince-3.0.install libevdocument3-4.install libevince-dev.install libevview3-3.install patches/ patches/01_nautilus_extension_path.patch patches/series rules

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Mon Apr 11 18:37:50 UTC 2016 

Author: bigon
Date: Mon Apr 11 18:37:50 2016
New Revision: 47886

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47886
Log:
Convert to multi-arch

Added:
    desktop/unstable/evince/debian/patches/
    desktop/unstable/evince/debian/patches/01_nautilus_extension_path.patch
    desktop/unstable/evince/debian/patches/series
Modified:
    desktop/unstable/evince/debian/changelog
    desktop/unstable/evince/debian/control
    desktop/unstable/evince/debian/control.in
    desktop/unstable/evince/debian/gir1.2-evince-3.0.install
    desktop/unstable/evince/debian/libevdocument3-4.install
    desktop/unstable/evince/debian/libevince-dev.install
    desktop/unstable/evince/debian/libevview3-3.install
    desktop/unstable/evince/debian/rules

Modified: desktop/unstable/evince/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/changelog?rev=47886&op=diff
==============================================================================
--- desktop/unstable/evince/debian/changelog	[utf-8] (original)
+++ desktop/unstable/evince/debian/changelog	[utf-8] Mon Apr 11 18:37:50 2016
@@ -23,8 +23,9 @@
   * Run wrap-and-sort script
   * Install apparmor profiles and apport hook, both coming from Ubuntu, thanks
     to them.
-
- -- Laurent Bigonville <bigon at debian.org>  Mon, 11 Apr 2016 19:49:32 +0200
+  * Convert to multi-arch
+
+ -- Laurent Bigonville <bigon at debian.org>  Mon, 11 Apr 2016 20:15:33 +0200
 
 evince (3.20.0-1) unstable; urgency=medium
 

Modified: desktop/unstable/evince/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/control?rev=47886&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control	[utf-8] (original)
+++ desktop/unstable/evince/debian/control	[utf-8] Mon Apr 11 18:37:50 2016
@@ -92,6 +92,7 @@
 
 Package: libevdocument3-4
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: evince-common (<< 3.20.0-2~)
@@ -104,6 +105,7 @@
 
 Package: libevview3-3
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: gstreamer1.0-plugins-base, ${misc:Depends}, ${shlibs:Depends}
 Description: Document (PostScript, PDF) rendering library - Gtk+ widgets
@@ -112,6 +114,7 @@
 
 Package: libevince-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: gir1.2-evince-3.0 (= ${binary:Version}),
          libevdocument3-4 (= ${binary:Version}),
@@ -132,6 +135,7 @@
 Package: gir1.2-evince-3.0
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Provides: gir1.2-evince-document-3.0, gir1.2-evince-view-3.0
 Description: GObject introspection data for the evince libraries

Modified: desktop/unstable/evince/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/control.in?rev=47886&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control.in	[utf-8] (original)
+++ desktop/unstable/evince/debian/control.in	[utf-8] Mon Apr 11 18:37:50 2016
@@ -88,6 +88,7 @@
 
 Package: libevdocument3-4
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: evince-common (<< 3.20.0-2~)
@@ -100,6 +101,7 @@
 
 Package: libevview3-3
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: gstreamer1.0-plugins-base, ${misc:Depends}, ${shlibs:Depends}
 Description: Document (PostScript, PDF) rendering library - Gtk+ widgets
@@ -108,6 +110,7 @@
 
 Package: libevince-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: gir1.2-evince-3.0 (= ${binary:Version}),
          libevdocument3-4 (= ${binary:Version}),
@@ -128,6 +131,7 @@
 Package: gir1.2-evince-3.0
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Provides: gir1.2-evince-document-3.0, gir1.2-evince-view-3.0
 Description: GObject introspection data for the evince libraries

Modified: desktop/unstable/evince/debian/gir1.2-evince-3.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/gir1.2-evince-3.0.install?rev=47886&op=diff
==============================================================================
--- desktop/unstable/evince/debian/gir1.2-evince-3.0.install	[utf-8] (original)
+++ desktop/unstable/evince/debian/gir1.2-evince-3.0.install	[utf-8] Mon Apr 11 18:37:50 2016
@@ -1 +1 @@
-usr/lib/girepository-*
+usr/lib/*/girepository-*

Modified: desktop/unstable/evince/debian/libevdocument3-4.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/libevdocument3-4.install?rev=47886&op=diff
==============================================================================
--- desktop/unstable/evince/debian/libevdocument3-4.install	[utf-8] (original)
+++ desktop/unstable/evince/debian/libevdocument3-4.install	[utf-8] Mon Apr 11 18:37:50 2016
@@ -1,4 +1,4 @@
-usr/lib/evince/*/backends/*.evince-backend
-usr/lib/evince/*/backends/*.so
-usr/lib/libevdocument*.so.*
+usr/lib/*/evince/*/backends/*.evince-backend
+usr/lib/*/evince/*/backends/*.so
+usr/lib/*/libevdocument*.so.*
 usr/share/appdata/evince-*.metainfo.xml

Modified: desktop/unstable/evince/debian/libevince-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/libevince-dev.install?rev=47886&op=diff
==============================================================================
--- desktop/unstable/evince/debian/libevince-dev.install	[utf-8] (original)
+++ desktop/unstable/evince/debian/libevince-dev.install	[utf-8] Mon Apr 11 18:37:50 2016
@@ -1,6 +1,6 @@
 usr/include
-usr/lib/*.a
-usr/lib/*.so
-usr/lib/pkgconfig
+usr/lib/*/*.a
+usr/lib/*/*.so
+usr/lib/*/pkgconfig
 usr/share/gir-*
 usr/share/gtk-doc

Modified: desktop/unstable/evince/debian/libevview3-3.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/libevview3-3.install?rev=47886&op=diff
==============================================================================
--- desktop/unstable/evince/debian/libevview3-3.install	[utf-8] (original)
+++ desktop/unstable/evince/debian/libevview3-3.install	[utf-8] Mon Apr 11 18:37:50 2016
@@ -1 +1 @@
-usr/lib/libevview*.so.*
+usr/lib/*/libevview*.so.*

Added: desktop/unstable/evince/debian/patches/01_nautilus_extension_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/patches/01_nautilus_extension_path.patch?rev=47886&op=file
==============================================================================
--- desktop/unstable/evince/debian/patches/01_nautilus_extension_path.patch	(added)
+++ desktop/unstable/evince/debian/patches/01_nautilus_extension_path.patch	[utf-8] Mon Apr 11 18:37:50 2016
@@ -0,0 +1,25 @@
+Description: Fix path of the libnautilus-extension with multi-arch
+Author: Laurent Bigonville <bigon at debian.org>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -413,8 +413,6 @@ if test "$enable_nautilus" = "yes" ; the
+   PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-3.0 $MM gthread-2.0 libnautilus-extension >= $NAUTILUS_REQUIRED],
+                     [],[AC_MSG_ERROR([libnautilus-extension not found; use --disable-nautilus to disable the nautilus extensions])])
+   NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
+-  NAUTILUS_EXTENSION_DIR=${NAUTILUS_EXTENSION_DIR#`$PKG_CONFIG --variable=libdir libnautilus-extension`}
+-  NAUTILUS_EXTENSION_DIR=${NAUTILUS_EXTENSION_DIR#/}
+   AC_SUBST(NAUTILUS_EXTENSION_DIR)
+   AC_SUBST(NAUTILUS_CFLAGS)
+   AC_SUBST(NAUTILUS_LIBS)
+--- a/properties/Makefile.am
++++ b/properties/Makefile.am
+@@ -15,7 +15,7 @@ libevproperties_la_CFLAGS = \
+ 
+ if ENABLE_NAUTILUS
+ 
+-nautilusextensiondir=$(libdir)/$(NAUTILUS_EXTENSION_DIR)
++nautilusextensiondir=$(NAUTILUS_EXTENSION_DIR)
+ nautilusextension_LTLIBRARIES = libevince-properties-page.la
+ 
+ libevince_properties_page_la_SOURCES = 	\

Added: desktop/unstable/evince/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/patches/series?rev=47886&op=file
==============================================================================
--- desktop/unstable/evince/debian/patches/series	(added)
+++ desktop/unstable/evince/debian/patches/series	[utf-8] Mon Apr 11 18:37:50 2016
@@ -0,0 +1 @@
+01_nautilus_extension_path.patch

Modified: desktop/unstable/evince/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/rules?rev=47886&op=diff
==============================================================================
--- desktop/unstable/evince/debian/rules	[utf-8] (original)
+++ desktop/unstable/evince/debian/rules	[utf-8] Mon Apr 11 18:37:50 2016
@@ -13,7 +13,9 @@
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 include /usr/share/dpkg/buildflags.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-djvu \
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir="\$${prefix}/lib/$(DEB_HOST_MULTIARCH)" \
+                             --libexecdir=/usr/lib/evince \
+                             --enable-djvu \
                              --enable-dvi \
                              --enable-xps \
                              --enable-comics \
@@ -22,7 +24,7 @@
                              --enable-libgnome-desktop
 
 DEB_DH_MAKESHLIBS_ARGS += -X /usr/lib/nautilus/ \
-                          -X /usr/lib/evince/ \
+                          -X /usr/lib/$(DEB_HOST_MULTIARCH)/evince/ \
                           -V -- -c4
 
 DEB_DH_SHLIBDEPS_ARGS += -X /usr/lib/nautilus/

More information about the pkg-gnome-commits mailing list