Commit ab86a46a authored by Dmitry Smirnov's avatar Dmitry Smirnov

Do not install "vendor" directory.

 It did not work as expected and may even cause FTBFS.
parent 6c3b8291
Last-Update: 2016-07-03
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/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.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/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/deep_copy_generated.go
+++ b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/resource/deep_copy_generated.go
@@ -21,9 +21,9 @@
package resource
import (
inf_v0 "gopkg.in/inf.v0"
- conversion "k8s.io/kubernetes/pkg/conversion"
+ conversion "github.com/appc/spec/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion"
)
func DeepCopy_resource_Quantity(in Quantity, out *Quantity, c *conversion.Cloner) error {
if in.Amount != nil {
--- a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/deep_copy_generated.go
+++ b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/deep_copy_generated.go
@@ -20,9 +20,9 @@
package conversion
import (
- forked_reflect "k8s.io/kubernetes/third_party/forked/reflect"
+ forked_reflect "github.com/appc/spec/Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect"
reflect "reflect"
)
func DeepCopy_conversion_Cloner(in Cloner, out *Cloner, c *Cloner) error {
--- a/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/deep_equal.go
+++ b/Godeps/_workspace/src/k8s.io/kubernetes/pkg/conversion/deep_equal.go
@@ -16,9 +16,9 @@
package conversion
import (
- "k8s.io/kubernetes/third_party/forked/reflect"
+ "github.com/appc/spec/Godeps/_workspace/src/k8s.io/kubernetes/third_party/forked/reflect"
)
// The code for this type must be located in third_party, since it forks from
// go std lib. But for convenience, we expose the type here, too.
--- 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)
......@@ -17,7 +17,6 @@ override_dh_clean:
-find Godeps/_workspace/src -mindepth 1 -type d -empty -delete -printf 'removed %p\n'
override_dh_auto_configure:
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