Commit 6c3b8291 authored by Dmitry Smirnov's avatar Dmitry Smirnov

Improve sub-vendoring + changelog summary

parent a4d7a80e
golang-github-appc-spec (0.8.4+dfsg-2) unstable; urgency=medium
* Improved sub-vendoring.
* Removed "private-libs.patch".
-- Dmitry Smirnov <onlyjob@debian.org> Mon, 20 Jun 2016 05:12:30 +1000
golang-github-appc-spec (0.8.4+dfsg-1) unstable; urgency=medium
[ Tim Potter ]
......
Last-Update: 2016-05-21
Forwarded: not-needed
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: private libs.
--- a/schema/image.go
+++ b/schema/image.go
@@ -21,9 +21,9 @@
"fmt"
"github.com/appc/spec/schema/types"
- "go4.org/errorutil"
+ "github.com/appc/spec/Godeps/_workspace/src/go4.org/errorutil"
)
const (
ACIExtension = ".aci"
--- a/schema/types/isolator_resources.go
+++ b/schema/types/isolator_resources.go
@@ -18,9 +18,9 @@
"encoding/json"
"errors"
"fmt"
- "k8s.io/kubernetes/pkg/api/resource"
+ "github.com/appc/spec/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource"
)
var (
ErrDefaultTrue = errors.New("default must be false")
--- a/schema/pod.go
+++ b/schema/pod.go
@@ -21,9 +21,9 @@
"fmt"
"github.com/appc/spec/schema/types"
- "go4.org/errorutil"
+ "github.com/appc/spec/Godeps/_workspace/src/go4.org/errorutil"
)
const PodManifestKind = types.ACKind("PodManifest")
--- a/schema/types/isolator_resources_test.go
+++ b/schema/types/isolator_resources_test.go
@@ -17,9 +17,9 @@
import (
"reflect"
"testing"
- "k8s.io/kubernetes/pkg/api/resource"
+ "github.com/appc/spec/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource"
)
func mustQuantity(s string) *resource.Quantity {
q := resource.MustParse(s)
......@@ -14,9 +14,10 @@ override_dh_clean:
dh_clean
## Remove Files-Excluded (when built from checkout or non-DFSG tarball):
$(RM) -rv `perl -0nE 'say $$1 if m{^Files\-Excluded\:\s*(.*?)(?:\n\n|Files:|Comment:)}sm;' debian/copyright`
-find Godeps/_workspace/src -mindepth 1 -type d -empty -delete -printf 'removed %p\n'
override_dh_auto_configure:
mkdir -p _build && cp -r Godeps/_workspace/src _build/
mkdir -p _build/src/$(DH_GOPKG)/vendor && cp -r Godeps/_workspace/src/* _build/src/$(DH_GOPKG)/vendor/
dh_auto_configure
perl -0nE 'say $$1 if m{^Files\-Excluded\:\s*(.*?)(?:\n\n|Files:|Comment:)}sm;' debian/copyright \
| while read D; do D="$${D##Godeps/_workspace/src/}" ; printf "Patching 3rd party includes: $$D\n" ;\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment