[SCM] Packaging for Google Go branch, debian-sid, updated. debian/1%60.2-1-32-ga228561

Ondřej Surý ondrej at sury.org
Wed Apr 11 21:27:04 UTC 2012


The following commit has been merged in the debian-sid branch:
commit cf4a606eef5fa23bfcd1540d369a1e9acd8a6f46
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Apr 11 17:18:08 2012 +0200

    Install full src tree (except pkg/debug) because go command depend on sources available

diff --git a/debian/control b/debian/control
index 6f97898..9c83bd1 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Homepage: http://golang.org/
 
 Package: golang-go
 Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 armel armhf
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
+	 golang-src (>= ${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
@@ -31,9 +32,10 @@ Description: Go programming language compiler
  tool chain.
 
 Package: golang-src
-Replaces: golang-weekly-src
+Replaces: golang-weekly-src, golang-go (<< 2:1-3~)
 Conflicts: golang-weekly-src
 Provides: golang-weekly-src
+Breaks: golang-go (<< 2:1-3~)
 Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 armel armhf
 Depends: ${shlibs:Depends}, ${misc:Depends}, golang-go
 Description: Go programming language compiler - source files
diff --git a/debian/golang-src.install b/debian/golang-src.install
new file mode 100644
index 0000000..8885d62
--- /dev/null
+++ b/debian/golang-src.install
@@ -0,0 +1 @@
+src /usr/share/go/
diff --git a/debian/rules b/debian/rules
index cc8776b..927bb77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,9 +31,7 @@ override_dh_compress:
 
 override_dh_install:
 	dh_install --fail-missing
-	for f in $$(find src/cmd -name \*.go ; find src/pkg -name \*.go); do \
-	  install -p -D -m 0644 $$f debian/$(PACKAGE)-src/$(datadir)/$$f; \
-	done
+	rm -r $(CURDIR)/debian/golang-src/usr/share/go/src/pkg/debug/
 
 override_dh_strip:
 	dh_strip -X".a" -Xgoinstall -Xgodoc -Xgoyacc -Xbin/cgo -Xebnflint -Xgofix -Xgofmt -Xgovet -Xgotest --dbg-package=$(PACKAGE)-dbg

-- 
Packaging for Google Go



More information about the Pkg-google-commits mailing list