summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2015-07-17 23:05:40 +0300
committerIgor Pashev <pashev.igor@gmail.com>2015-07-17 23:05:40 +0300
commit447c5210c3d461d8f818a3827a03a04aa560d807 (patch)
treef0df81ddda6d402a8034ad835c05d43c48f92ec3
parent9f82f2b501fcaacaea64790e1a0a9ebeaf3d9027 (diff)
downloadgolang-447c5210c3d461d8f818a3827a03a04aa560d807.tar.gz
Define and use ${go:Hostos} in d/control*
-rw-r--r--debian/changelog1
-rw-r--r--debian/control2
-rw-r--r--debian/control.base2
-rwxr-xr-xdebian/rules1
4 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 17940ab18..01ab2c357 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ golang (2:1.4.2-3+dyson1) UNRELEASED; urgency=medium
- Added support for illumos-amd64 (d/rules, d/control*)
- Added debian/patches/dyson-EOF.patch
- Added debian/patches/dyson-libc.patch
+ * Define and use ${go:Hostos} in d/control*
-- Igor Pashev <pashev.igor@gmail.com> Fri, 17 Jul 2015 22:22:51 +0300
diff --git a/debian/control b/debian/control
index 0ccce7ef0..37195a77d 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Package: golang-go
Architecture: i386 amd64 armel armhf illumos-amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
golang-src (>= ${source:Version}),
- golang-go-linux-${go:Hostarch} (= ${source:Version})
+ golang-go-${go:Hostos}-${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
diff --git a/debian/control.base b/debian/control.base
index 3ac9dde5c..f65422a0a 100644
--- a/debian/control.base
+++ b/debian/control.base
@@ -16,7 +16,7 @@ Package: golang-go
Architecture: i386 amd64 armel armhf illumos-amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
golang-src (>= ${source:Version}),
- golang-go-linux-${go:Hostarch} (= ${source:Version})
+ golang-go-${go:Hostos}-${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
diff --git a/debian/rules b/debian/rules
index 048a271dc..990ac67aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,6 +95,7 @@ override_dh_strip:
override_dh_prep:
dh_prep
echo 'go:Hostarch=$(GOHOSTARCH)' >> debian/golang-go.substvars
+ echo 'go:Hostos=$(GOHOSTOS)' >> debian/golang-go.substvars
override_dh_builddeb:
dh_builddeb -- -Zxz