← Back to branch summary

~ubuntu-branches/ubuntu/precise/gvfs/precise-proposed

« back to all changes in this revision

Viewing changes to debian/patches/05_shared_libdaemon.patch

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2011-11-17 07:43:33 UTC
  • mfrom: (1.1.77) (33.1.18 experimental)
  • Revision ID: package-import@ubuntu.com-20111117074333-ua4kq03btq4shvb1
Tags: 1.10.1-1ubuntu1
* Merge with Debian experimental. Remaining Ubuntu changes:
  - debian/control.in: Drop libbluray-dev build dependency (in universe).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/05_shared_libdaemon.patch
1
 
Index: gvfs-1.9.1/daemon/Makefile.am
 
1
Index: gvfs-1.10.1/daemon/Makefile.am
2
2
===================================================================
3
 
--- gvfs-1.9.1.orig/daemon/Makefile.am  2011-06-13 17:31:01.000000000 +0200
4
 
+++ gvfs-1.9.1/daemon/Makefile.am       2011-07-08 07:12:15.498273284 +0200
5
 
@@ -19,12 +19,14 @@
 
3
--- gvfs-1.10.1.orig/daemon/Makefile.am 2011-11-13 09:41:56.004836632 +0100
 
4
+++ gvfs-1.10.1/daemon/Makefile.am      2011-11-13 09:42:19.372950874 +0100
 
5
@@ -19,12 +19,14 @@ INCLUDES =                                  \
6
6
        -DGVFS_LOCALEDIR=\""$(localedir)"\"     \
7
 
        -DG_DISABLE_DEPRECATED
 
7
        $(NULL)
8
8
 
9
9
-noinst_LTLIBRARIES=libdaemon.la
10
10
+privlibdir = $(libdir)/gvfs
20
20
 
21
21
 gvfs_gschemas =
22
22
 gvfs_gschemas_convert =
23
 
@@ -127,7 +129,7 @@
 
23
@@ -133,7 +135,7 @@ noinst_PROGRAMS =                           \
24
24
        gvfsd-test                      \
25
25
        $(NULL)
26
26
 
29
29
        gvfsdaemon.c gvfsdaemon.h \
30
30
        gvfsbackend.c gvfsbackend.h \
31
31
        gvfschannel.c gvfschannel.h \
32
 
@@ -175,6 +177,12 @@
 
32
@@ -181,6 +183,12 @@ libdaemon_la_SOURCES = \
33
33
        gvfskeyring.h gvfskeyring.c \
34
34
         $(NULL)
35
35
 
42
42
 gvfsd_SOURCES = \
43
43
        mount.c mount.h \
44
44
        main.c
45
 
Index: gvfs-1.9.1/common/Makefile.am
 
45
Index: gvfs-1.10.1/common/Makefile.am
46
46
===================================================================
47
 
--- gvfs-1.9.1.orig/common/Makefile.am  2011-06-13 17:31:01.000000000 +0200
48
 
+++ gvfs-1.9.1/common/Makefile.am       2011-07-08 07:12:15.498273284 +0200
 
47
--- gvfs-1.10.1.orig/common/Makefile.am 2011-11-13 09:41:56.004836632 +0100
 
48
+++ gvfs-1.10.1/common/Makefile.am      2011-11-13 09:42:19.372950874 +0100
49
49
@@ -1,6 +1,8 @@
50
50
 NULL =
51
51
 
56
56
 
57
57
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
58
58
        -I$(top_srcdir)/daemon \
59
 
@@ -22,7 +24,7 @@
 
59
@@ -22,7 +24,7 @@ libgvfscommon_la_SOURCES =    \
60
60
        $(NULL)
61
61
 
62
62
 # needed by cygwin (see bug #564003)
65
65
 
66
66
 libgvfscommon_la_LIBADD =      \
67
67
        $(DBUS_LIBS)            \
68
 
@@ -30,7 +32,7 @@
 
68
@@ -30,7 +32,7 @@ libgvfscommon_la_LIBADD =     \
69
69
        $(BLURAY_LIBS)
70
70
 
71
71
 if HAVE_AVAHI
74
74
 
75
75
 libgvfscommon_dnssd_la_SOURCES =       \
76
76
        gvfsdnssdutils.c gvfsdnssdutils.h \
77
 
@@ -40,6 +42,8 @@
 
77
@@ -40,6 +42,8 @@ libgvfscommon_dnssd_la_SOURCES =      \
78
78
 libgvfscommon_dnssd_la_CFLAGS =        \
79
79
        $(AVAHI_CFLAGS)
80
80