← Back to branch summary

~ubuntu-branches/ubuntu/trusty/iproute/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/ip_rule_usage.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Wirt, Andreas Henriksson, Justin B Rye, Alexander Wirt
  • Date: 2008-05-11 11:18:29 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20080511111829-rfewew7s6kiev0bh
Tags: 20080417-1
http://bugs.debian.org/467557
http://bugs.debian.org/480173
http://bugs.debian.org/464521
[ Andreas Henriksson ]
* New upstream release, v2.6.25 a.k.a. snapshot 20080417.
  - Initial documentation for xfrm (Partially fixes #451337)
  - Fixes manpage error caught by lintian!
* Fix typos (syntax error) in ip(8) manpage.
  - Introduced by upstream, caught by lintian yet again!
* Don't ship useless headers in iproute-dev (Closes: #467557)
* Cherry-pick "Fix bad hash calculation because of signed address" from
  upstream. (Closes: #480173)

[ Justin B Rye ]
* Update package description (Closes: #464521)

[ Alexander Wirt ]
* Fix typo in short package description.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ip_rule_usage.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## ip_rule_usage.dpatch by  <formorer@lisa.springfield.lan>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: No description.
6
 
 
7
 
@DPATCH@
8
 
diff -urNad iproute-20070313~/ip/iprule.c iproute-20070313/ip/iprule.c
9
 
--- iproute-20070313~/ip/iprule.c       2007-03-13 22:50:56.000000000 +0100
10
 
+++ iproute-20070313/ip/iprule.c        2007-06-10 17:54:46.000000000 +0200
11
 
@@ -38,7 +38,7 @@
12
 
 {
13
 
        fprintf(stderr, "Usage: ip rule [ list | add | del | flush ] SELECTOR ACTION\n");
14
 
        fprintf(stderr, "SELECTOR := [ not ] [ from PREFIX ] [ to PREFIX ] [ tos TOS ] [ fwmark FWMARK[/MASK] ]\n");
15
 
-       fprintf(stderr, "            [ dev STRING ] [ pref NUMBER ]\n");
16
 
+       fprintf(stderr, "            [ dev STRING ] [ pref NUMBER ] [ prio NUMBER ]\n");
17
 
        fprintf(stderr, "ACTION := [ table TABLE_ID ]\n");
18
 
        fprintf(stderr, "          [ prohibit | reject | unreachable ]\n");
19
 
        fprintf(stderr, "          [ realms [SRCREALM/]DSTREALM ]\n");