~ubuntu-desktop/evince/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/fixed-plugin-and-extensiondir.diff

  • 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
 
Index: b/properties/Makefile.am
2
 
===================================================================
3
 
--- a/properties/Makefile.am
4
 
+++ b/properties/Makefile.am
5
 
@@ -15,7 +15,7 @@ libevproperties_la_CFLAGS = \
6
 
 
7
 
 if ENABLE_NAUTILUS
8
 
 
9
 
-nautilusextensiondir=$(libdir)/$(NAUTILUS_EXTENSION_DIR)
10
 
+nautilusextensiondir=$(prefix)/lib/$(NAUTILUS_EXTENSION_DIR)
11
 
 nautilusextension_LTLIBRARIES = libevince-properties-page.la
12
 
 
13
 
 libevince_properties_page_la_SOURCES =         \
14
 
Index: b/configure.ac
15
 
===================================================================
16
 
--- a/configure.ac
17
 
+++ b/configure.ac
18
 
@@ -483,7 +483,7 @@ if test x$enable_browser_plugin = "xyes"
19
 
   PKG_CHECK_MODULES([BROWSER_PLUGIN],[gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED])
20
 
 
21
 
   if test -z "${BROWSER_PLUGIN_DIR}"; then
22
 
-    BROWSER_PLUGIN_DIR="\${libdir}/mozilla/plugins"
23
 
+    BROWSER_PLUGIN_DIR="\${prefix}/lib/mozilla/plugins"
24
 
   fi
25
 
   AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
26
 
 fi