[Pkg-utopia-commits] r1747 - in /packages/unstable/networkmanager/debian: changelog patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Sep 28 19:17:01 2007
New Revision: 1747

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1747
Log:
* 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.

Added:
    packages/unstable/networkmanager/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch
Modified:
    packages/unstable/networkmanager/debian/changelog

Modified: packages/unstable/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/changelog?rev=1747&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/changelog (original)
+++ packages/unstable/networkmanager/debian/changelog Fri Sep 28 19:17:01 2007
@@ -7,8 +7,12 @@
     - Install nm-vpn-properties manpage.
   * debian/control
     - Use the new "Homepage:" field to specify the upstream URL.
-
- -- Michael Biebl <biebl at debian.org>  Fri, 28 Sep 2007 20:37:08 +0200
+  * 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 <biebl at debian.org>  Fri, 28 Sep 2007 21:12:33 +0200
 
 network-manager (0.6.5-1) unstable; urgency=low
 

Added: packages/unstable/networkmanager/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch?rev=1747&op=file
==============================================================================
--- packages/unstable/networkmanager/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch (added)
+++ packages/unstable/networkmanager/debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch Fri Sep 28 19:17:01 2007
@@ -1,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)                     \
+