From e1a65e5b1eda31353ebd56b882568cd53507d34a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 28 Sep 2007 19:17:01 +0000 Subject: * 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 --- debian/changelog | 6 ++- ...x_vpn_ftbfs_dont_disable_gnome_deprecated.patch | 44 ++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7e5aa1f1..c3d83182 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,12 @@ network-manager (0.6.5-2) unstable; urgency=low - Install nm-vpn-properties manpage. * debian/control - Use the new "Homepage:" field to specify the upstream URL. + * 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. - -- Michael Biebl Fri, 28 Sep 2007 20:37:08 +0200 + -- Michael Biebl Fri, 28 Sep 2007 21:12:33 +0200 network-manager (0.6.5-1) unstable; urgency=low 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) \ + -- cgit 1.3.0-6-gf8a5