~ubuntu-desktop/evince/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/01_nautilus_extension_path.patch

  • Committer: Jeremy Bicha
  • Date: 2016-08-07 22:26:40 UTC
  • Revision ID: jbicha@ubuntu.com-20160807222640-r56bbj5k0na1mz2o
* Merge with Debian 3.20.1-1
* Build-depend on dh-translations and run dh --with translations
* Don't break/replace apparmor-profiles-extra << 1.7.
  Ubuntu's version didn't ship the evince profile but more importantly,
  apparmor-profiles-extra 1.7 isn't in Ubuntu yet
* debian/patches/traditional_menu_bar.patch:
  - Refreshed and re-enabled F1 keyboard shortcut for help (LP: #1610742)

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Description: Fix path of the libnautilus-extension with multi-arch
 
2
Author: Laurent Bigonville <bigon@debian.org>
 
3
 
 
4
Index: b/configure.ac
 
5
===================================================================
 
6
--- a/configure.ac
 
7
+++ b/configure.ac
 
8
@@ -417,8 +417,6 @@
 
9
   PKG_CHECK_MODULES([NAUTILUS],[gtk+-3.0 $MM gthread-2.0 libnautilus-extension >= $NAUTILUS_REQUIRED],
 
10
                     [],[AC_MSG_ERROR([libnautilus-extension not found; use --disable-nautilus to disable the nautilus extensions])])
 
11
   NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
 
12
-  NAUTILUS_EXTENSION_DIR=${NAUTILUS_EXTENSION_DIR#`$PKG_CONFIG --variable=libdir libnautilus-extension`}
 
13
-  NAUTILUS_EXTENSION_DIR=${NAUTILUS_EXTENSION_DIR#/}
 
14
   AC_SUBST(NAUTILUS_EXTENSION_DIR)
 
15
   AC_SUBST(NAUTILUS_CFLAGS)
 
16
   AC_SUBST(NAUTILUS_LIBS)
 
17
Index: b/properties/Makefile.am
 
18
===================================================================
 
19
--- a/properties/Makefile.am
 
20
+++ b/properties/Makefile.am
 
21
@@ -15,7 +15,7 @@
 
22
 
 
23
 if ENABLE_NAUTILUS
 
24
 
 
25
-nautilusextensiondir=$(libdir)/$(NAUTILUS_EXTENSION_DIR)
 
26
+nautilusextensiondir=$(NAUTILUS_EXTENSION_DIR)
 
27
 nautilusextension_LTLIBRARIES = libevince-properties-page.la
 
28
 
 
29
 libevince_properties_page_la_SOURCES =         \