about summary refs log tree commit diff
path: root/debian/patches
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2007-09-28 19:17:01 +0000
committerMichael Biebl <biebl@debian.org>2007-09-28 19:17:01 +0000
commite1a65e5b1eda31353ebd56b882568cd53507d34a (patch)
tree3a9151a005216763440c653baa0bb10b296efc86 /debian/patches
parent26f3ae33c2f5ed4c962523597a343ef1e1532736 (diff)
* 22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch
  - Patch from Ubuntu. Don't set the GNOME_DISABLE_DEPRECATED flag as
    nm-vpn-properties requires gnome druid which has been deprecated in 
    GTK+ 2.12.

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1747 ceb527fc-18e6-0310-9fe2-813c157c29e7
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch b/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch
new file mode 100644
index 00000000..ac0459b6
--- /dev/null
+++ b/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch
@@ -0,0 +1,44 @@
+=== modified file 'gnome/vpn-properties/Makefile.am'
+--- network-manager-0.6.5.old/gnome/vpn-properties/Makefile.am	2007-06-25 13:51:34 +0000
++++ network-manager-0.6.5/gnome/vpn-properties/Makefile.am	2007-08-03 11:50:32 +0000
+@@ -21,17 +21,16 @@ nm_vpn_properties_CFLAGS =              
+         $(GCONF_CFLAGS)                                 \
+         $(GMODULE_CFLAGS)                               \
+         $(LIBGNOMEUI_CFLAGS)                            \
+         -DSYSCONFDIR=\"$(sysconfdir)\"			\
+         -DICONDIR=\""$(datadir)/icons"\"                \
+         -DGLADEDIR=\""$(gladedir)"\"                    \
+         -DG_DISABLE_DEPRECATED                          \
+         -DGDK_DISABLE_DEPRECATED                        \
+-        -DGNOME_DISABLE_DEPRECATED                      \
+ 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
+         -DVERSION=\"$(VERSION)\" \
+         $(NULL)
+ 
+ nm_vpn_properties_LDADD =               \
+         $(GLADE_LIBS)                   \
+         $(GTK_LIBS)                     \
+         $(GCONF_LIBS)                   \
+
+=== modified file 'gnome/vpn-properties/Makefile.in'
+--- network-manager-0.6.5.old/gnome/vpn-properties/Makefile.in	2007-06-25 13:51:34 +0000
++++ network-manager-0.6.5/gnome/vpn-properties/Makefile.in	2007-08-03 11:50:32 +0000
+@@ -258,17 +258,16 @@ nm_vpn_properties_CFLAGS = \
+         $(GCONF_CFLAGS)                                 \
+         $(GMODULE_CFLAGS)                               \
+         $(LIBGNOMEUI_CFLAGS)                            \
+         -DSYSCONFDIR=\"$(sysconfdir)\"			\
+         -DICONDIR=\""$(datadir)/icons"\"                \
+         -DGLADEDIR=\""$(gladedir)"\"                    \
+         -DG_DISABLE_DEPRECATED                          \
+         -DGDK_DISABLE_DEPRECATED                        \
+-        -DGNOME_DISABLE_DEPRECATED                      \
+ 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
+         -DVERSION=\"$(VERSION)\" \
+         $(NULL)
+ 
+ 
+ nm_vpn_properties_LDADD = \
+         $(GLADE_LIBS)                   \
+         $(GTK_LIBS)                     \
+