← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/02_deprecated.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/02_deprecated.patch
 
1
Index: gvfs-1.10.1/client/Makefile.am
 
2
===================================================================
 
3
--- gvfs-1.10.1.orig/client/Makefile.am 2011-10-17 14:48:18.000000000 +0200
 
4
+++ gvfs-1.10.1/client/Makefile.am      2011-11-13 09:40:33.764434581 +0100
 
5
@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir) \
 
6
        -I$(top_srcdir)/metadata \
 
7
        -I$(top_srcdir)/common \
 
8
        $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
 
9
-       -DG_LOG_DOMAIN=\"GVFS\" -DG_DISABLE_DEPRECATED \
 
10
+       -DG_LOG_DOMAIN=\"GVFS\" \
 
11
        -DGVFS_MODULE_DIR=\"$(libdir)/gvfs/modules\"    \
 
12
        -DGVFS_LOCALEDIR=\""$(localedir)"\"     \
 
13
        -DDBUS_API_SUBJECT_TO_CHANGE
 
14
@@ -74,7 +74,7 @@ gvfs_fuse_daemon_CFLAGS = \
 
15
        -I$(top_srcdir) \
 
16
         -I$(top_srcdir)/common \
 
17
         $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(FUSE_CFLAGS) \
 
18
-        -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" -DG_DISABLE_DEPRECATED \
 
19
+        -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" \
 
20
         -DDBUS_API_SUBJECT_TO_CHANGE
 
21
 
 
22
 gvfs_fuse_daemon_LDADD = \
 
23
Index: gvfs-1.10.1/common/Makefile.am
 
24
===================================================================
 
25
--- gvfs-1.10.1.orig/common/Makefile.am 2011-10-17 14:48:18.000000000 +0200
 
26
+++ gvfs-1.10.1/common/Makefile.am      2011-11-13 09:40:46.024494525 +0100
 
27
@@ -5,7 +5,7 @@ lib_LTLIBRARIES=libgvfscommon.la
 
28
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
 
29
        -I$(top_srcdir)/daemon \
 
30
        $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(BLURAY_CFLAGS) \
 
31
-       -DG_LOG_DOMAIN=\"GVFS\" -DG_DISABLE_DEPRECATED \
 
32
+       -DG_LOG_DOMAIN=\"GVFS\" \
 
33
        -DDBUS_API_SUBJECT_TO_CHANGE
 
34
 
 
35
 libgvfscommon_la_SOURCES =     \
 
36
Index: gvfs-1.10.1/daemon/Makefile.am
 
37
===================================================================
 
38
--- gvfs-1.10.1.orig/daemon/Makefile.am 2011-10-17 14:48:18.000000000 +0200
 
39
+++ gvfs-1.10.1/daemon/Makefile.am      2011-11-13 09:40:33.764434581 +0100
 
40
@@ -17,7 +17,7 @@ INCLUDES =                                    \
 
41
        -DLIBEXEC_DIR=\"$(libexecdir)/\"        \
 
42
        -DMOUNTABLE_DIR=\"$(mountdir)/\"        \
 
43
        -DGVFS_LOCALEDIR=\""$(localedir)"\"     \
 
44
-       -DG_DISABLE_DEPRECATED
 
45
+       $(NULL)
 
46
 
 
47
 noinst_LTLIBRARIES=libdaemon.la
 
48
 
 
49
Index: gvfs-1.10.1/monitor/gphoto2/Makefile.am
 
50
===================================================================
 
51
--- gvfs-1.10.1.orig/monitor/gphoto2/Makefile.am        2011-10-17 14:48:18.000000000 +0200
 
52
+++ gvfs-1.10.1/monitor/gphoto2/Makefile.am     2011-11-13 09:40:33.764434581 +0100
 
53
@@ -39,7 +39,6 @@ gvfs_gphoto2_volume_monitor_CFLAGS =          \
 
54
        $(GPHOTO2_CFLAGS)                       \
 
55
        -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"  \
 
56
        -DGVFS_LOCALEDIR=\""$(localedir)"\"     \
 
57
-       -DG_DISABLE_DEPRECATED                  \
 
58
        -DG_UDEV_API_IS_SUBJECT_TO_CHANGE       \
 
59
        $(NULL)
 
60
 
 
61
Index: gvfs-1.10.1/monitor/hal/Makefile.am
 
62
===================================================================
 
63
--- gvfs-1.10.1.orig/monitor/hal/Makefile.am    2011-10-17 14:48:18.000000000 +0200
 
64
+++ gvfs-1.10.1/monitor/hal/Makefile.am 2011-11-13 09:40:33.764434581 +0100
 
65
@@ -33,7 +33,6 @@ gvfs_hal_volume_monitor_CFLAGS =              \
 
66
        $(HAL_CFLAGS)                           \
 
67
        -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"  \
 
68
        -DGVFS_LOCALEDIR=\""$(localedir)"\"     \
 
69
-       -DG_DISABLE_DEPRECATED                  \
 
70
        $(NULL)
 
71
 
 
72
 gvfs_hal_volume_monitor_LDFLAGS =      \
 
73
Index: gvfs-1.10.1/monitor/proxy/Makefile.am
 
74
===================================================================
 
75
--- gvfs-1.10.1.orig/monitor/proxy/Makefile.am  2011-10-17 14:48:18.000000000 +0200
 
76
+++ gvfs-1.10.1/monitor/proxy/Makefile.am       2011-11-13 09:40:33.764434581 +0100
 
77
@@ -25,7 +25,6 @@ libgioremote_volume_monitor_la_CFLAGS =
 
78
        -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"                          \
 
79
        -DREMOTE_VOLUME_MONITORS_DIR=\"$(remote_volume_monitorsdir)\"   \
 
80
        -DGVFS_LOCALEDIR=\""$(localedir)"\"                             \
 
81
-       -DG_DISABLE_DEPRECATED                                          \
 
82
        $(NULL)
 
83
 
 
84
 libgioremote_volume_monitor_la_LDFLAGS =                               \
 
85
@@ -53,7 +52,6 @@ libgvfsproxyvolumemonitordaemon_noin_la_
 
86
        $(GDU_CFLAGS)                                           \
 
87
        -DG_LOG_DOMAIN=\"GVFS-RemoteVolumeMonitorDaemon\"       \
 
88
        -DGVFS_LOCALEDIR=\""$(localedir)"\"                     \
 
89
-       -DG_DISABLE_DEPRECATED                                  \
 
90
        $(NULL)
 
91
 
 
92
 libgvfsproxyvolumemonitordaemon_noin_la_LIBADD  =              \
 
93
Index: gvfs-1.10.1/programs/Makefile.am
 
94
===================================================================
 
95
--- gvfs-1.10.1.orig/programs/Makefile.am       2011-10-17 14:48:18.000000000 +0200
 
96
+++ gvfs-1.10.1/programs/Makefile.am    2011-11-13 09:40:33.764434581 +0100
 
97
@@ -5,7 +5,7 @@ INCLUDES =                                      \
 
98
        -I$(top_builddir)                       \
 
99
        $(GLIB_CFLAGS)                          \
 
100
        -DGVFS_LOCALEDIR=\""$(localedir)"\"     \
 
101
-       -DG_DISABLE_DEPRECATED
 
102
+       $(NULL)
 
103
 
 
104
 libraries =                                    \
 
105
        $(GLIB_LIBS)
 
106
Index: gvfs-1.10.1/test/Makefile.am
 
107
===================================================================
 
108
--- gvfs-1.10.1.orig/test/Makefile.am   2011-10-17 14:48:18.000000000 +0200
 
109
+++ gvfs-1.10.1/test/Makefile.am        2011-11-13 09:40:33.764434581 +0100
 
110
@@ -4,7 +4,7 @@ AM_CFLAGS =                       \
 
111
        -I$(top_srcdir)           \
 
112
        -I$(top_builddir)         \
 
113
        $(GLIB_CFLAGS)            \
 
114
-       -DG_DISABLE_DEPRECATED
 
115
+       $(NULL)
 
116
 
 
117
 AM_LDFLAGS =                           \
 
118
        $(GLIB_LIBS)
 
119
Index: gvfs-1.10.1/metadata/Makefile.am
 
120
===================================================================
 
121
--- gvfs-1.10.1.orig/metadata/Makefile.am       2011-10-17 14:48:18.364514085 +0200
 
122
+++ gvfs-1.10.1/metadata/Makefile.am    2011-11-13 09:41:31.624717456 +0100
 
123
@@ -23,7 +23,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdi
 
124
        $(LIBXML_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
 
125
        $(UDEV_CFLAGS) \
 
126
        -DGVFS_LOCALEDIR=\""$(localedir)"\"     \
 
127
-       -DG_LOG_DOMAIN=\"GVFS\" -DG_DISABLE_DEPRECATED \
 
128
+       -DG_LOG_DOMAIN=\"GVFS\" \
 
129
        -DDBUS_API_SUBJECT_TO_CHANGE
 
130
 
 
131
 libmetadata_la_SOURCES =               \
 
132
Index: gvfs-1.10.1/monitor/afc/Makefile.am
 
133
===================================================================
 
134
--- gvfs-1.10.1.orig/monitor/afc/Makefile.am    2011-10-17 14:48:18.364514085 +0200
 
135
+++ gvfs-1.10.1/monitor/afc/Makefile.am 2011-11-13 09:41:18.752654517 +0100
 
136
@@ -19,7 +19,6 @@ gvfs_afc_volume_monitor_CFLAGS = \
 
137
        $(WARN_CFLAGS) \
 
138
        -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
 
139
        -DGVFS_LOCALEDIR=\"$(localedir)\" \
 
140
-       -DG_DISABLE_DEPRECATED \
 
141
        $(NULL)
 
142
 
 
143
 gvfs_afc_volume_monitor_LDADD = \
 
144
Index: gvfs-1.10.1/monitor/gdu/Makefile.am
 
145
===================================================================
 
146
--- gvfs-1.10.1.orig/monitor/gdu/Makefile.am    2011-10-17 14:48:18.364514085 +0200
 
147
+++ gvfs-1.10.1/monitor/gdu/Makefile.am 2011-11-13 09:41:06.096592627 +0100
 
148
@@ -22,7 +22,6 @@ gvfs_gdu_volume_monitor_CFLAGS =              \
 
149
        $(DBUS_CFLAGS)                          \
 
150
        -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"  \
 
151
        -DGVFS_LOCALEDIR=\""$(localedir)"\"     \
 
152
-       -DG_DISABLE_DEPRECATED                  \
 
153
        -DGDU_API_IS_SUBJECT_TO_CHANGE          \
 
154
        $(NULL)
 
155