~ubuntu-branches/ubuntu/intrepid/network-manager-applet/intrepid

Viewing all changes in revision 4.

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2007-06-26 10:52:45 UTC
  • Revision ID: james.westby@ubuntu.com-20070626105245-ezxl42pngzd1gc9u
Tags: 0.6.5-0ubuntu3
* Re-import applet patches from network-manager

* debian/control: tighten build-depends on network-manager to
  >= 0.6.5-0ubuntu3

* Make patches apply against applet sources + drop patches that have
  been applied upstream:
 - debian/patches/01_static_network-admin.patch: fix diff path for
   new source layout: gnome/applet -> src/ + update line numbers.
 - debian/patches/02_manual_means_always_online.diff: fix diff path
   for new source layout: gnome/applet -> src/ + update line numbers;
   drop diffs for sources not in this tarball: src/NetworkManagerDbus.c,
   src/NetworkManagerMain.h and src/nm-device.c.
 - debian/patches/03_manual_config_available_when_connected.patch: fix
   diff path for new source layout: gnome/applet -> src/ + update line
   numbers.
 - debian/patches/04_nm-vpn-properties_path.patch: nm-vpn-properties
   are shipped in network-manager pkglibdir
 - debian/patches/10-po_fr.patch: all but one translation fixes were applied
   upstream.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: