diff -Nru golang-gogoprotobuf-1.3.1/debian/changelog golang-gogoprotobuf-1.3.1/debian/changelog --- golang-gogoprotobuf-1.3.1/debian/changelog 2020-05-17 15:40:29.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/debian/changelog 2020-05-18 05:10:14.000000000 +0000 @@ -1,3 +1,14 @@ +golang-gogoprotobuf (1.3.1-2) unstable; urgency=medium + + * Team upload. + * Revert "Removed transitional package "golang-gogoprotobuf-dev"" + This reverts commit aa4027f5881cb890a7c167651eeb4922ec18c946. + Add transitional package back. There are still some packages depend this. + Remove the transitional package only after other packages have migrated to + the new dependencies. Otherwise the testing migration will be stuck. + + -- Shengjing Zhu Mon, 18 May 2020 13:10:14 +0800 + golang-gogoprotobuf (1.3.1-1) unstable; urgency=medium * Team upload. diff -Nru golang-gogoprotobuf-1.3.1/debian/control golang-gogoprotobuf-1.3.1/debian/control --- golang-gogoprotobuf-1.3.1/debian/control 2020-05-17 15:40:29.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/debian/control 2020-05-18 05:10:14.000000000 +0000 @@ -18,8 +18,17 @@ Rules-Requires-Root: no XS-Go-Import-Path: github.com/gogo/protobuf +Package: golang-gogoprotobuf-dev +Architecture: all +Section: oldlibs +Depends: gogoprotobuf, + golang-github-gogo-protobuf-dev, + ${misc:Depends}, +Description: transitional package -- safe to remove + This transitional package facilitates migration to + "golang-github-gogo-protobuf-dev" and can be safely removed. + Package: golang-github-gogo-protobuf-dev -Provides: golang-gogoprotobuf-dev, Architecture: all Depends: libprotobuf-dev, ${misc:Depends}, diff -Nru golang-gogoprotobuf-1.3.1/debian/copyright golang-gogoprotobuf-1.3.1/debian/copyright --- golang-gogoprotobuf-1.3.1/debian/copyright 2020-05-17 15:40:29.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/debian/copyright 2020-05-18 05:10:14.000000000 +0000 @@ -18,12 +18,6 @@ gogoproto/helper.go io/* plugin/* - proto/extensions_gogo.go - proto/lib_gogo.go - proto/pointer_unsafe_gogo.go - proto/properties_gogo.go - proto/skip_gogo.go - proto/text_gogo.go protoc-gen-combo/* protoc-gen-gofast/* protoc-gen-gogo/descriptor/helper.go @@ -33,159 +27,34 @@ protoc-gen-gogoslick/* protoc-gen-gostring/* protoc-min-version/* + proto/*_gogo.go + proto/wrappers.go sortkeys/* - test/Makefile - test/asymetric-issue125/Makefile - test/asymetric-issue125/asym.proto - test/asymetric-issue125/asym_test.go - test/asymetric-issue125/pop.go - test/bug_test.go - test/casttype/Makefile - test/casttype/casttype.proto - test/casttype/combos/both/casttype.proto - test/casttype/combos/marshaler/casttype.proto - test/casttype/combos/neither/casttype.proto - test/casttype/combos/unmarshaler/casttype.proto - test/casttype/mytypes.go - test/castvalue/Makefile - test/castvalue/castvalue.proto - test/castvalue/combos/both/castvalue.proto - test/castvalue/combos/both/mytypes.go - test/castvalue/combos/marshaler/castvalue.proto - test/castvalue/combos/marshaler/mytypes.go - test/castvalue/combos/unmarshaler/castvalue.proto - test/castvalue/combos/unmarshaler/mytypes.go - test/castvalue/mytypes.go - test/combos/both/bug_test.go - test/combos/both/thetest.proto - test/combos/both/uuid.go - test/combos/marshaler/bug_test.go - test/combos/marshaler/thetest.proto - test/combos/marshaler/uuid.go - test/combos/unmarshaler/bug_test.go - test/combos/unmarshaler/thetest.proto - test/combos/unmarshaler/uuid.go - test/custom-dash-type/* - test/custom/* - test/custombytesnonstruct/Makefile - test/custombytesnonstruct/custombytesnonstruct_test.go - test/custombytesnonstruct/customtype.go - test/custombytesnonstruct/proto.proto - test/dashfilename/* - test/defaultconflict/* - test/embedconflict/* - test/empty-issue70/Makefile - test/empty-issue70/empty.proto - test/empty-issue70/empty_test.go - test/enumcustomname/Makefile - test/enumcustomname/enumcustomname.proto - test/enumprefix/Makefile - test/enumprefix/enumprefix.proto - test/enumstringer/Makefile - test/enumstringer/enumstringer.proto - test/enumstringer/string.go - test/example/Makefile - test/example/example.proto - test/example/example_test.go - test/extension_test.go - test/filedotname/Makefile - test/filedotname/file.dot.proto - test/fuzztests/Makefile - test/fuzztests/fuzz.proto - test/fuzztests/fuzz_test.go - test/group/Makefile - test/group/group.proto - test/importdedup/Makefile - test/importdedup/importdedup_test.go - test/importdedup/proto.proto - test/importdedup/subpkg/customtype.go - test/importdedup/subpkg/subproto.proto - test/indeximport-issue72/Makefile - test/indeximport-issue72/index/index.proto - test/indeximport-issue72/indeximport.proto - test/issue34/Makefile - test/issue34/issue34_test.go - test/issue34/proto.proto - test/issue42order/Makefile - test/issue42order/issue42.proto - test/issue42order/order_test.go - test/issue8/Makefile - test/issue8/proto.proto - test/mapsproto2/Makefile - test/mapsproto2/combos/both/mapsproto2_test.go - test/mapsproto2/combos/marshaler/mapsproto2_test.go - test/mapsproto2/combos/neither/mapsproto2_test.go - test/mapsproto2/combos/unmarshaler/mapsproto2_test.go - test/mapsproto2/mapsproto2_test.go.in - test/mixbench/mixbench.go - test/moredefaults/Makefile - test/moredefaults/md.proto - test/moredefaults/md_test.go - test/nopackage/Makefile - test/nopackage/nopackage.proto - test/nopackage/nopackage_test.go - test/oneof/Makefile - test/oneof/combos/both/one.proto - test/oneof/combos/marshaler/one.proto - test/oneof/combos/neither/one.proto - test/oneof/combos/unmarshaler/one.proto - test/oneof/one.proto - test/oneof3/Makefile - test/oneof3/combos/both/one.proto - test/oneof3/combos/marshaler/one.proto - test/oneof3/combos/neither/one.proto - test/oneof3/combos/unmarshaler/one.proto - test/oneof3/one.proto - test/oneofembed/Makefile - test/oneofembed/oneofembed.proto - test/packed/Makefile - test/packed/packed.proto - test/packed/packed_test.go - test/protosize/Makefile - test/protosize/protosize.proto - test/protosize/protosize_test.go - test/required/Makefile - test/required/requiredexample.proto - test/required/requiredexamplepb_test.go - test/sizeunderscore/Makefile - test/sizeunderscore/sizeunderscore.proto - test/tags/Makefile - test/tags/tags.proto - test/tags/tags_test.go - test/theproto3/Makefile - test/theproto3/combos/both/proto3_test.go - test/theproto3/combos/marshaler/proto3_test.go - test/theproto3/combos/neither/proto3_test.go - test/theproto3/combos/unmarshaler/proto3_test.go - test/theproto3/proto3_test.go.in - test/thetest.proto - test/unmarshalmerge/Makefile - test/unmarshalmerge/unmarshalmerge.proto - test/unmarshalmerge/unmarshalmerge_test.go - test/unrecognized/Makefile - test/unrecognized/oldnew_test.go - test/unrecognized/unrecognized.proto - test/unrecognizedgroup/Makefile - test/unrecognizedgroup/oldnew_test.go - test/unrecognizedgroup/unrecognizedgroup.proto - test/uuid.go - test/uuid_test.go - vanity/command/* - vanity/enum.go - vanity/field.go - vanity/file.go - vanity/foreach.go - vanity/msg.go - vanity/test/Makefile - vanity/test/gogovanity.proto - vanity/test/proto3.proto - vanity/test/vanity.proto - vanity/test/vanity_test.go + test/* + vanity/* version/* Copyright: 2013,2015-2016 the GoGo Authors License: BSD-2-Clause +Files: + test/issue411/issue411.proto + test/mapsproto2/combos/both/mapsproto2.proto + test/mapsproto2/combos/marshaler/mapsproto2.proto + test/mapsproto2/combos/neither/mapsproto2.proto + test/mapsproto2/combos/unmarshaler/mapsproto2.proto + test/mapsproto2/header.proto + test/mapsproto2/mapsproto2.proto + test/theproto3/combos/both/theproto3.proto + test/theproto3/combos/marshaler/theproto3.proto + test/theproto3/combos/neither/theproto3.proto + test/theproto3/combos/unmarshaler/theproto3.proto + test/theproto3/header.proto + test/theproto3/theproto3.proto +Copyright: 2014-2015 The Go Authors + 2013 The GoGo Authors +License: BSD-3-Clause + Files: debian/* Copyright: 2014 Jelmer Vernooij 2015 Alexandre Viau