Merge lp:~ubuntu-branches/ubuntu/saucy/golang/saucy-201403042219 into lp:ubuntu/saucy/golang

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/saucy/golang reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/saucy/golang/saucy-201403042219. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

26. By Michael on 2012-08-02

* Add myself to uploaders, as discussed in #683421.
* cherry-pick r820ffde8c396 (net/http: non-keepalive connections close
  successfully) (Closes: #683421)

25. By Michael on 2012-07-20

* Non-maintainer upload. (as discussed with Ondřej in #679692)
* Fix godoc-symlinks.diff (godoc didn’t find docs) (Closes: #679692)

24. By Ondřej Surý on 2012-06-28

[ Ondřej Surý ]
* Imported Upstream version 1.0.2
* Update Vcs fields to reflect new git repository location
* Kill get-orig-source, since 1.0.0, the tarballs can be downloaded
  from webpage

[ Michael Stapelberg ]
* golang-mode: use debian-pkg-add-load-path-item (Closes: #664802)
* Add manpages (Closes: #632964)
* Use updated pt.po from Pedro Ribeiro (Closes: #674958)

23. By Ondřej Surý on 2012-05-02

* Imported Upstream version 1.0.1
* Apply godoc patch to display package list correctly (Closes: #669354)

22. By Ondřej Surý on 2012-04-15

* Rewrite test conditions to make them more readable
  (and fix the debian/rules to really not check on armel+kfreebsd)
* Patch upstream test to not fail on missing home directory

21. By Ondřej Surý on 2012-04-11

* Use VERSION provided by upstream for packaging purposes
* Run tests as a part of a build process
* Install full src tree (except pkg/debug) because go command depend
  on sources available
* Install sources without testdata and *_test.go
* Remove circular dependency golang-go->golang-doc->golang-go
* Make sure that timestamp on installed binaries and libraries is same
  because go build/install recompiles everything if the go binary has
  more recent timestamp than libraries (Closes: #668235)
  + Need to update timestamps at postinst time because already created
    directories can have time in the past
* Fix couple of lintian errors and warnings

20. By Ondřej Surý on 2012-04-06

Remove preserving of old -tools settings, there are too many options
now anyway (Closes: #666007)

19. By Ondřej Surý on 2011-11-28

Imported Upstream version 60.3

18. By Ondřej Surý on 2011-10-06

Imported Upstream version 60.2

17. By Ondřej Surý on 2011-09-19

Imported Upstream version 60.1