Update packaging as of Ubuntu devel packaging

packaging/debian/README.source

@@ -0,0 +1,11 @@
+This package is vendoring all the Go dependencies for reasons explained in LP: #1896246
+
+To update the debian/extra/vendor/ dir run:
+
+rm -r debian/extra/vendor
+go mod vendor
+mv vendor debian/extra/
+
+Update debian/copyright, for example using decopy.
+
+ -- Balint Reczey <[email protected]>, Fri, 18 Sep 2020 17:25:04 +0200

packaging/debian/control

@@ -1,14 +1,23 @@
 Source: google-osconfig-agent
 Maintainer: Google Cloud Team <[email protected]>
-Section: misc
+Section: devel
+Testsuite: autopkgtest-pkg-go
 Priority: optional
-Standards-Version: 3.9.8
-Build-Depends: debhelper (>= 10), dh-golang (>= 1.1), golang-go
+Build-Depends: debhelper-compat (= 12),
+               dh-golang,
+               golang-any
+Standards-Version: 4.5.0
+Homepage: https://github.com/GoogleCloudPlatform/osconfig
+Rules-Requires-Root: no
+XS-Go-Import-Path: github.com/GoogleCloudPlatform/osconfig
 
 Package: google-osconfig-agent
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Google Compute Engine OSConfig Agent
- Contains the OSConfig agent service binary as well as systemd
- startup scripts
-XS-Go-Import-Path: github.com/GoogleCloudPlatform/osconfig
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Built-Using: ${misc:Built-Using}
+Description: Google OS Config Agent
+ The OS Config agent currently supports the following main features:
+  * OS inventory management
+  * OS patch management
+  * OS configuration management

packaging/debian/copyright

@@ -1,21 +1,150 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: google-compute-engine
-Upstream-Contact: gc-team@google.com
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: osconfig
+Source: https://github.com/GoogleCloudPlatform/osconfig
 
 Files: *
-Copyright: Copyright 2017 Google Inc.
+Copyright: 2011-2019, Google Inc.
 License: Apache-2.0
 
 Files: debian/*
-Copyright: Copyright 2017 Google Inc.
+Copyright: 2020, Canonical Group, Ltd.
 License: Apache-2.0
+Comment: Debian packaging is licensed under the same terms as upstream
+
+Files: debian/extra/*
+Copyright: 2009, 2010, 2013, 2017-2019, The Go Authors.
+License: BSD-3-clause
+
+Files: debian/extra/vendor/cloud.google.com/*
+Copyright: 2014-2020, Google Inc.
+License: Apache-2.0
+
+Files: debian/extra/vendor/github.com/GoogleCloudPlatform/*
+Copyright: 2019, Google Inc
+License: Apache-2.0
+
+Files: debian/extra/vendor/github.com/GoogleCloudPlatform/guest-logging-go/logger/*
+Copyright: 2011-2015, 2017-2019, Google Inc.
+License: Apache-2.0
+
+Files: debian/extra/vendor/github.com/StackExchange/*
+Copyright: 2013, Stack Exchange
+ 2019, Google Inc.
+License: Apache-2.0 or Expat
+
+Files: debian/extra/vendor/github.com/StackExchange/wmi/README.md
+  debian/extra/vendor/github.com/StackExchange/wmi/swbemservices.go
+  debian/extra/vendor/github.com/StackExchange/wmi/wmi.go
+Copyright: 2019, Google Inc.
+License: Apache-2.0
+
+Files: debian/extra/vendor/github.com/go-ole/*
+Copyright: 2013-2017, Yasuhiro Matsumoto, <[email protected]>
+License: Expat
+
+Files: debian/extra/vendor/github.com/golang/groupcache/*
+Copyright: 2011-2015, 2017-2019, Google Inc.
+License: Apache-2.0
+
+Files: debian/extra/vendor/github.com/golang/protobuf/jsonpb/*
+Copyright: 2009-2020, The Go Authors.
+License: Apache-2.0
+
+Files: debian/extra/vendor/github.com/golang/protobuf/proto/*
+Copyright: 2009-2020, The Go Authors.
+License: Apache-2.0
+
+Files: debian/extra/vendor/github.com/golang/protobuf/protoc-gen-go/*
+Copyright: 2019, Google Inc.
+License: Apache-2.0
+
+Files: debian/extra/vendor/github.com/golang/protobuf/ptypes/*
+Copyright: 2019, Google Inc.
+License: Apache-2.0
+
+Files: debian/extra/vendor/github.com/golang/protobuf/ptypes/any.go
+  debian/extra/vendor/github.com/golang/protobuf/ptypes/doc.go
+  debian/extra/vendor/github.com/golang/protobuf/ptypes/duration.go
+  debian/extra/vendor/github.com/golang/protobuf/ptypes/timestamp.go
+Copyright: 2009-2020, The Go Authors.
+License: Apache-2.0
+
+Files: debian/extra/vendor/github.com/google/go-cmp/cmp/*
+Copyright: 2009-2020, The Go Authors.
+License: Apache-2.0
+
+Files: debian/extra/vendor/github.com/googleapis/*
+Copyright: 2008, 2011, 2016, 2018, Google Inc.
+License: BSD-3-clause
+
+Files: debian/extra/vendor/github.com/googleapis/gax-go/v2/go.mod
+Copyright: 2019, Google Inc.
+License: Apache-2.0
+
+Files: debian/extra/vendor/github.com/julienschmidt/*
+Copyright: 2013, Julien Schmidt
+License: BSD-3-clause
+
+Files: debian/extra/vendor/github.com/sirupsen/*
+Copyright: 2014 Simon Eskildsen
+License: Expat
+
+Files: debian/extra/vendor/github.com/tarm/*
+Copyright: 2009, 2010, 2013, 2017-2019, The Go Authors.
+License: BSD-3-clause
+
+Files: debian/extra/vendor/github.com/ulikunitz/*
+Copyright: 2014-2020, Ulrich Kunitz
+ 2019, Google Inc.
+License: Apache-2.0
+
+Files: debian/extra/vendor/go.chromium.org/*
+Copyright: 2014-2020, The LUCI Authors
+           2014, The Go Authors
+License: Apache-2.0
+
+Files: debian/extra/vendor/go.opencensus.io/*
+Copyright: 2017-2019, OpenCensus Authors
+License: Apache-2.0
+
+Files: debian/extra/vendor/golang.org/x/*
+Copyright: 2009-2020, The Go Authors.
+License: BSD-3-clause
+
+Files: debian/extra/vendor/google.golang.org/api/*
+Copyright: 2008, 2011, 2016, 2018, Google Inc.
+License: BSD-3-clause
+
+Files: debian/extra/vendor/google.golang.org/api/internal/third_party/*
+Copyright: 2013, Joshua Tacoma.
+License: BSD-3-clause
+
+Files: debian/extra/vendor/google.golang.org/appengine/*
+Copyright: 2019, Google Inc.
+License: Apache-2.0
+
+Files: debian/extra/vendor/google.golang.org/genproto/googleapis/*
+Copyright: 2019, Google Inc.
+License: Apache-2.0
+
+Files: debian/extra/vendor/google.golang.org/genproto/protobuf/*
+Copyright: 2019, Google Inc.
+License: Apache-2.0
+
+Files: debian/extra/vendor/google.golang.org/grpc/*
+Copyright: 2014, gRPC authors.
+License: Apache-2.0
+
+Files: debian/extra/vendor/google.golang.org/protobuf/*
+Copyright: 2009-2020, The Go Authors.
+License: BSD-3-clause
 
 License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
  .
-     http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
  .
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,3 +154,59 @@ License: Apache-2.0
  .
  On Debian systems, the complete text of the Apache version 2.0 license
  can be found in "/usr/share/common-licenses/Apache-2.0".
+
+License: BSD-3-clause
+ This software is Copyright (c) 2020 by foo.
+ This is free software, licensed under:
+ The (three-clause) BSD License
+ The BSD License
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of foo nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: Expat
+ This software is Copyright (c) 2020 by foo.
+ This is free software, licensed under:
+ The MIT (X11) License
+ The MIT License
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated
+ documentation files (the "Software"), to deal in the Software
+ without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to
+ whom the Software is furnished to do so, subject to the
+ following conditions:
+ The above copyright notice and this permission notice shall
+ be included in all copies or substantial portions of the
+ Software.
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT
+ WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+ SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.