[Pkg-golang-commits] [golang] 01/01: Apply wrap-and-sort

Tianon Gravi tianon at debian.org
Sat Sep 26 16:14:56 UTC 2015


This is an automated email from the git hooks/post-receive script.

tianon pushed a commit to branch debian-sid
in repository golang.

commit 2490d42f37843910aede01c1d2af70e14abb4f1f
Author: Tianon Gravi <tianon at debian.org>
Date:   Sat Sep 26 09:14:48 2015 -0700

    Apply wrap-and-sort
---
 debian/control       | 58 +++++++++++++++++++++++++++-------------------------
 debian/control.base  | 34 +++++++++++++++---------------
 debian/control.cross |  2 +-
 3 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/debian/control b/debian/control
index 63e4a9c..ef0e51f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,19 +8,21 @@ Uploaders: Michael Stapelberg <stapelberg at debian.org>,
            Tianon Gravi <tianon at debian.org>
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-golang/golang.git
 Vcs-Git: git://anonscm.debian.org/pkg-golang/golang.git
-Build-Depends: debhelper (>= 7.4.10), bison, ed, mawk | awk, perl, netbase
+Build-Depends: bison, debhelper (>= 7.4.10), ed, mawk | awk, netbase, perl
 Build-Depends-Indep: po-debconf
 Standards-Version: 3.9.6
 Homepage: https://golang.org
 
 Package: golang-go
-Architecture: i386 amd64 armel armhf
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
-	 golang-src (>= ${source:Version}),
-	 golang-go-linux-${go:Hostarch} (= ${source:Version})
-Replaces: golang-weekly-go, golang-weekly-tools, golang-tools
-Conflicts: golang-weekly-go, golang-weekly-tools, golang-tools
-Provides: go-compiler, golang-weekly-go, golang-weekly-tools, golang-tools
+Architecture: amd64 armel armhf i386
+Depends: golang-go-linux-${go:Hostarch} (= ${source:Version}),
+         golang-src (>= ${source:Version}),
+         ${misc:Depends},
+         ${perl:Depends},
+         ${shlibs:Depends}
+Replaces: golang-tools, golang-weekly-go, golang-weekly-tools
+Conflicts: golang-tools, golang-weekly-go, golang-weekly-tools
+Provides: go-compiler, golang-tools, golang-weekly-go, golang-weekly-tools
 Suggests: bzr, git, golang-go.tools, mercurial, subversion
 Description: Go programming language compiler
  The Go programming language is an open source project to make
@@ -38,12 +40,12 @@ Description: Go programming language compiler
  tool chain.
 
 Package: golang-src
-Replaces: golang-weekly-src, golang-go (<< 2:1-3~)
+Replaces: golang-go (<< 2:1-3~), golang-weekly-src
 Conflicts: golang-weekly-src
 Provides: golang-weekly-src
 Breaks: golang-go (<< 2:1-3~)
-Architecture: i386 amd64 armel armhf
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Architecture: amd64 armel armhf i386
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Go programming language compiler - source files
  The Go programming language is an open source project to make
  programmers more productive. Go is expressive, concise, clean, and
@@ -62,7 +64,7 @@ Package: golang-doc
 Replaces: golang-weekly-doc
 Conflicts: golang-weekly-doc
 Provides: golang-weekly-doc
-Depends: ${misc:Depends}, golang-go
+Depends: golang-go, ${misc:Depends}
 Architecture: all
 Section: doc
 Description: Go programming language compiler - documentation
@@ -84,10 +86,10 @@ Package: golang
 Replaces: golang-weekly
 Conflicts: golang-weekly
 Provides: golang-weekly
-Depends: ${misc:Depends},
-	 golang-go (>= ${source:Version}),
-	 golang-src (>= ${source:Version}),
-	 golang-doc (>= ${source:Version})
+Depends: golang-doc (>= ${source:Version}),
+         golang-go (>= ${source:Version}),
+         golang-src (>= ${source:Version}),
+         ${misc:Depends}
 Architecture: all
 Description: Go programming language compiler - metapackage
  The Go programming language is an open source project to make
@@ -105,7 +107,7 @@ Description: Go programming language compiler - metapackage
 
 Package: golang-go-linux-amd64
 Architecture: i386 amd64 armel armhf
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Breaks: golang-go (<< 2:1.1-2)
 Replaces: golang-go (<< 2:1.1-2)
 Description: Go standard library compiled for linux_amd64
@@ -123,7 +125,7 @@ Description: Go standard library compiled for linux_amd64
 
 Package: golang-go-linux-arm
 Architecture: i386 amd64 armel armhf
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Breaks: golang-go (<< 2:1.1-2)
 Replaces: golang-go (<< 2:1.1-2)
 Description: Go standard library compiled for linux_arm
@@ -141,7 +143,7 @@ Description: Go standard library compiled for linux_arm
 
 Package: golang-go-linux-386
 Architecture: i386 amd64 armel armhf
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Breaks: golang-go (<< 2:1.1-2)
 Replaces: golang-go (<< 2:1.1-2)
 Description: Go standard library compiled for linux_386
@@ -159,7 +161,7 @@ Description: Go standard library compiled for linux_386
 
 Package: golang-go-freebsd-amd64
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Breaks: golang-go (<< 2:1.1-2)
 Replaces: golang-go (<< 2:1.1-2)
 Description: Go standard library compiled for freebsd_amd64
@@ -177,7 +179,7 @@ Description: Go standard library compiled for freebsd_amd64
 
 Package: golang-go-freebsd-arm
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Breaks: golang-go (<< 2:1.1-2)
 Replaces: golang-go (<< 2:1.1-2)
 Description: Go standard library compiled for freebsd_arm
@@ -195,7 +197,7 @@ Description: Go standard library compiled for freebsd_arm
 
 Package: golang-go-freebsd-386
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Breaks: golang-go (<< 2:1.1-2)
 Replaces: golang-go (<< 2:1.1-2)
 Description: Go standard library compiled for freebsd_386
@@ -213,7 +215,7 @@ Description: Go standard library compiled for freebsd_386
 
 Package: golang-go-windows-amd64
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Breaks: golang-go (<< 2:1.1-2)
 Replaces: golang-go (<< 2:1.1-2)
 Description: Go standard library compiled for windows_amd64
@@ -231,7 +233,7 @@ Description: Go standard library compiled for windows_amd64
 
 Package: golang-go-windows-386
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Breaks: golang-go (<< 2:1.1-2)
 Replaces: golang-go (<< 2:1.1-2)
 Description: Go standard library compiled for windows_386
@@ -249,7 +251,7 @@ Description: Go standard library compiled for windows_386
 
 Package: golang-go-darwin-amd64
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Breaks: golang-go (<< 2:1.1-2)
 Replaces: golang-go (<< 2:1.1-2)
 Description: Go standard library compiled for darwin_amd64
@@ -267,7 +269,7 @@ Description: Go standard library compiled for darwin_amd64
 
 Package: golang-go-darwin-386
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Breaks: golang-go (<< 2:1.1-2)
 Replaces: golang-go (<< 2:1.1-2)
 Description: Go standard library compiled for darwin_386
@@ -285,7 +287,7 @@ Description: Go standard library compiled for darwin_386
 
 Package: golang-go-netbsd-amd64
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Breaks: golang-go (<< 2:1.1-2)
 Replaces: golang-go (<< 2:1.1-2)
 Description: Go standard library compiled for netbsd_amd64
@@ -303,7 +305,7 @@ Description: Go standard library compiled for netbsd_amd64
 
 Package: golang-go-netbsd-386
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Breaks: golang-go (<< 2:1.1-2)
 Replaces: golang-go (<< 2:1.1-2)
 Description: Go standard library compiled for netbsd_386
diff --git a/debian/control.base b/debian/control.base
index 7a2369a..ce75547 100644
--- a/debian/control.base
+++ b/debian/control.base
@@ -7,19 +7,21 @@ Uploaders: Michael Stapelberg <stapelberg at debian.org>,
            Tianon Gravi <tianon at debian.org>
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-golang/golang.git
 Vcs-Git: git://anonscm.debian.org/pkg-golang/golang.git
-Build-Depends: debhelper (>= 7.4.10), bison, ed, mawk | awk, perl, netbase
+Build-Depends: bison, debhelper (>= 7.4.10), ed, mawk | awk, netbase, perl
 Build-Depends-Indep: po-debconf
 Standards-Version: 3.9.6
 Homepage: https://golang.org
 
 Package: golang-go
-Architecture: i386 amd64 armel armhf
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
-	 golang-src (>= ${source:Version}),
-	 golang-go-linux-${go:Hostarch} (= ${source:Version})
-Replaces: golang-weekly-go, golang-weekly-tools, golang-tools
-Conflicts: golang-weekly-go, golang-weekly-tools, golang-tools
-Provides: go-compiler, golang-weekly-go, golang-weekly-tools, golang-tools
+Architecture: amd64 armel armhf i386
+Depends: golang-go-linux-${go:Hostarch} (= ${source:Version}),
+         golang-src (>= ${source:Version}),
+         ${misc:Depends},
+         ${perl:Depends},
+         ${shlibs:Depends}
+Replaces: golang-tools, golang-weekly-go, golang-weekly-tools
+Conflicts: golang-tools, golang-weekly-go, golang-weekly-tools
+Provides: go-compiler, golang-tools, golang-weekly-go, golang-weekly-tools
 Suggests: bzr, git, golang-go.tools, mercurial, subversion
 Description: Go programming language compiler
  The Go programming language is an open source project to make
@@ -37,12 +39,12 @@ Description: Go programming language compiler
  tool chain.
 
 Package: golang-src
-Replaces: golang-weekly-src, golang-go (<< 2:1-3~)
+Replaces: golang-go (<< 2:1-3~), golang-weekly-src
 Conflicts: golang-weekly-src
 Provides: golang-weekly-src
 Breaks: golang-go (<< 2:1-3~)
-Architecture: i386 amd64 armel armhf
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Architecture: amd64 armel armhf i386
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Go programming language compiler - source files
  The Go programming language is an open source project to make
  programmers more productive. Go is expressive, concise, clean, and
@@ -61,7 +63,7 @@ Package: golang-doc
 Replaces: golang-weekly-doc
 Conflicts: golang-weekly-doc
 Provides: golang-weekly-doc
-Depends: ${misc:Depends}, golang-go
+Depends: golang-go, ${misc:Depends}
 Architecture: all
 Section: doc
 Description: Go programming language compiler - documentation
@@ -83,10 +85,10 @@ Package: golang
 Replaces: golang-weekly
 Conflicts: golang-weekly
 Provides: golang-weekly
-Depends: ${misc:Depends},
-	 golang-go (>= ${source:Version}),
-	 golang-src (>= ${source:Version}),
-	 golang-doc (>= ${source:Version})
+Depends: golang-doc (>= ${source:Version}),
+         golang-go (>= ${source:Version}),
+         golang-src (>= ${source:Version}),
+         ${misc:Depends}
 Architecture: all
 Description: Go programming language compiler - metapackage
  The Go programming language is an open source project to make
diff --git a/debian/control.cross b/debian/control.cross
index 592b4f9..e878987 100644
--- a/debian/control.cross
+++ b/debian/control.cross
@@ -1,7 +1,7 @@
 
 Package: golang-go- at OS@- at ARCH@
 Architecture: @BUILDARCHS@
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Breaks: golang-go (<< 2:1.1-2)
 Replaces: golang-go (<< 2:1.1-2)
 Description: Go standard library compiled for @OS at _@ARCH@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-golang/golang.git



More information about the pkg-golang-commits mailing list