From 46efdb6a1ccbe8aceb9e78065c01ececd466dd5f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 3 Apr 2008 00:22:06 +0000 Subject: Mark the patches, which were pulled from upstream svn differently. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2155 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3662e3ab..a9f48af7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,15 +6,15 @@ network-manager (0.6.6-1) UNRELEASED; urgency=low - debian/patches/04-if_fix.patch (obsolete) - debian/patches/11-man_page_sh_name.patch (merged upstream) - debian/patches/12_readme_format.patch (merged upstream) - - debian/patches/20-stable_branch_updates_r2652.patch (merged upstream) - - debian/patches/21-endianess_fix_r2754.patch (merged upstream) + - debian/patches/20-stable_branch_updates_r2652.patch (applied upstream) + - debian/patches/21-endianess_fix_r2754.patch (applied upstream) - debian/patches/22-fix_vpn_ftbfs_dont_disable_gnome_deprecated.patch (merged upstream) - debian/patches/23-rfkill_return_type.patch (fixed upstream) - - debian/patches/24-get_mode_fix_r3122.patch (merged upstream) - - debian/patches/25-libnl_unique_pid_r3155.patch (merged upstream) - - debian/patches/26-libnl_1.0-pre8_r3206.patch (merged upstream) - - debian/patches/27-dont_repeat_errors.patch (merged upstream) + - debian/patches/24-get_mode_fix_r3122.patch (applied upstream) + - debian/patches/25-libnl_unique_pid_r3155.patch (applied upstream) + - debian/patches/26-libnl_1.0-pre8_r3206.patch (applied upstream) + - debian/patches/27-dont_repeat_errors.patch (applied upstream) * debian/patches/06-dispatch_more_events.patch - NetworkManagerDispatcher.1.in has been renamed to NetworkManagerDispatcher.8.in. Update the patch accordingly. -- cgit 1.3.0-6-gf8a5