diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/golang-1.3-compat-readdir (renamed from debian/patches/golang-1.3-compat) | 4 | ||||
| -rw-r--r-- | debian/patches/golang-1.3-compat-remove-prefix-logging | 14 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
3 files changed, 18 insertions, 3 deletions
diff --git a/debian/patches/golang-1.3-compat b/debian/patches/golang-1.3-compat-readdir index f157402..b9e5c6d 100644 --- a/debian/patches/golang-1.3-compat +++ b/debian/patches/golang-1.3-compat-readdir @@ -2,7 +2,7 @@ Index: planr/fs.go =================================================================== --- planr.orig/fs.go +++ planr/fs.go -@@ -220,7 +220,7 @@ func collectFromDir( +@@ -224,7 +224,7 @@ func collectFromDir( // Read the entries in this directory for { @@ -11,7 +11,7 @@ Index: planr/fs.go if err == io.EOF { break } else if err != nil { -@@ -229,8 +229,8 @@ func collectFromDir( +@@ -233,8 +233,8 @@ func collectFromDir( for _, ent := range dirs { diff --git a/debian/patches/golang-1.3-compat-remove-prefix-logging b/debian/patches/golang-1.3-compat-remove-prefix-logging new file mode 100644 index 0000000..08a1a9e --- /dev/null +++ b/debian/patches/golang-1.3-compat-remove-prefix-logging @@ -0,0 +1,14 @@ +Index: planr/cmd/planr/main.go +=================================================================== +--- planr.orig/cmd/planr/main.go ++++ planr/cmd/planr/main.go +@@ -28,8 +28,7 @@ func dieUsage() { + + func main() { + +- log.SetFlags(log.Llongfile | log.Lmsgprefix) +- log.SetPrefix("planr: ") ++ log.SetFlags(log.Llongfile) + + if len(os.Args) < 2 { + dieUsage() diff --git a/debian/patches/series b/debian/patches/series index 7cd5d69..a80079f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ -golang-1.3-compat +golang-1.3-compat-readdir +golang-1.3-compat-remove-prefix-logging |