← Back to branch summary

~ubuntu-branches/ubuntu/maverick/brasero/maverick

« back to all changes in this revision

Viewing changes to debian/patches/014_plugin_directory.patch

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-09-14 10:23:22 UTC
  • mfrom: (1.1.44 upstream)
  • Revision ID: james.westby@ubuntu.com-20100914102322-7eigq8pge5wqfol1
Tags: 2.31.92-0ubuntu1
* New upstream release:
  - Revert to libunique from GApplication (Luis Medinas)
  - Remove dbus-glib requires from pkgconfig file (Luis Medinas)
  - Some more debugging to find out about problems with encrypted DVDs
    (Philippe Rouquier)
  - Fix minor issues in gdbus conversion. (Luis Medinas)
  - Remove dbus-glib check from configure (Luis Medinas)
  - Replace last part of dbus-glib by GDBus (Luis Medinas)
  - Fix Inhibit() d-bus parameters (Robert Ancell)
  - Remove dbus libraries from the Makefile. (Luis Medinas)
  - Use --with-gtk switch for gtk 2/3 selection (Christian Persch)
  - Fix image checksuming that did not occur when GConf or GSetting returned 0
    as a value for the checksum type key (Philippe Rouquier)
  - Don't hardcode gconf gsettings backend (Robert Ancell)
  - Fix brasero plugin directory (Robert Ancell)
* debian/control:
  - build-dep on libunique
* debian/patches/010_lpi.patch,31_link_libice.patch:
  - adapt to latest code
* debian/patches/013_gsettings_backend.patch,014_plugin_directory.patch,
  015_inhibit_params.patch:
  - removed, now upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/014_plugin_directory.patch
1
 
From 99c61fd1b64652c8e6f4e1c2c4fa2dba3c7558d3 Mon Sep 17 00:00:00 2001
2
 
From: Robert Ancell <robert.ancell@canonical.com>
3
 
Date: Tue, 31 Aug 2010 16:17:32 +1000
4
 
Subject: [PATCH 1/2] Fix brasero plugin directory
5
 
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=628391
6
 
 
7
 
---
8
 
 configure.in                |    1 -
9
 
 libbrasero-burn/Makefile.am |    1 +
10
 
 2 files changed, 1 insertions(+), 1 deletions(-)
11
 
 
12
 
diff --git a/configure.in b/configure.in
13
 
index 4d59851..32c476d 100644
14
 
--- a/configure.in
15
 
+++ b/configure.in
16
 
@@ -320,7 +320,6 @@ AM_CONDITIONAL(BUILD_NAUTILUS, test x"$build_nautilus" = "xyes")
17
 
 #
18
 
 
19
 
 BRASERO_PLUGIN_DIRECTORY=${libdir}/brasero${BRASERO_LIBRARY_SUFFIX}/plugins
20
 
-AC_DEFINE_UNQUOTED(BRASERO_PLUGIN_DIRECTORY, "${BRASERO_PLUGIN_DIRECTORY}", [Path where the plugins are installed])
21
 
 AC_SUBST(BRASERO_PLUGIN_DIRECTORY)
22
 
 
23
 
 dnl ****************check for libburn (optional)**************
24
 
diff --git a/libbrasero-burn/Makefile.am b/libbrasero-burn/Makefile.am
25
 
index 3891ae1..606ca51 100644
26
 
--- a/libbrasero-burn/Makefile.am
27
 
+++ b/libbrasero-burn/Makefile.am
28
 
@@ -10,6 +10,7 @@ INCLUDES = \
29
 
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                          \
30
 
        -DBRASERO_DATADIR=\"$(datadir)/brasero\"                        \
31
 
        -DBRASERO_LIBDIR=\"$(libdir)\"                                  \
32
 
+       -DBRASERO_PLUGIN_DIRECTORY=\"$(BRASERO_PLUGIN_DIRECTORY)\"      \
33
 
        $(WARN_CFLAGS)                                                  \
34
 
        $(DISABLE_DEPRECATED)                                           \
35
 
        $(BRASERO_GMODULE_CFLAGS)                                       \
36
 
1.7.1
37