Control: tag -1 patch

> This is causing this error:
>
> make[1]: Entering directory '/<<PKGBUILDDIR>>'
> cd _build/src/github.com/etix/mirrorbits && \
> find -name "*.pb.go" -delete -printf "removed %p\n" && \
> protoc -I rpc 
> --go_out=plugins=grpc,Mgoogle/protobuf/empty.proto=github.com/golang/protobuf/ptypes/empty,Mgoogle/protobuf/timestamp.proto=github.com/golang/protobuf/ptypes/timestamp:rpc
>  rpc/rpc.proto
> removed ./rpc/rpc.pb.go
> protoc-gen-go: unable to determine Go import path for "rpc.proto"
>

If you don't mind, I suggest place this package in the Go packaging team
group. In the meantime, allow me to suggest the attached patch as NMU.

Best,
-rt

diff -Nru mirrorbits-0.5.1+git20240203.4e34d9b+ds1/debian/changelog mirrorbits-0.5.1+git20240203.4e34d9b+ds1/debian/changelog
--- mirrorbits-0.5.1+git20240203.4e34d9b+ds1/debian/changelog	2024-04-26 09:44:36.000000000 -0400
+++ mirrorbits-0.5.1+git20240203.4e34d9b+ds1/debian/changelog	2024-07-28 14:24:29.000000000 -0400
@@ -1,3 +1,10 @@
+mirrorbits (0.5.1+git20240203.4e34d9b+ds1-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * build against protobuf 1.5
+
+ -- Reinhard Tartler <[email protected]>  Sun, 28 Jul 2024 14:24:29 -0400
+
 mirrorbits (0.5.1+git20240203.4e34d9b+ds1-2) unstable; urgency=medium
 
   * Build-Depends += pkgconf, zlib1g-dev (Closes: #1067366)
diff -Nru mirrorbits-0.5.1+git20240203.4e34d9b+ds1/debian/control mirrorbits-0.5.1+git20240203.4e34d9b+ds1/debian/control
--- mirrorbits-0.5.1+git20240203.4e34d9b+ds1/debian/control	2024-04-26 09:44:36.000000000 -0400
+++ mirrorbits-0.5.1+git20240203.4e34d9b+ds1/debian/control	2024-07-28 14:24:29.000000000 -0400
@@ -11,7 +11,7 @@
  dh-sequence-golang,
  golang-any,
  golang-github-coreos-go-systemd-dev,
- golang-github-golang-protobuf-1-3-dev,
+ golang-github-golang-protobuf-1-5-dev,
  golang-github-gomodule-redigo-dev,
  golang-github-howeyc-gopass-dev,
  golang-github-op-go-logging-dev,
@@ -23,7 +23,7 @@
  golang-gopkg-tylerb-graceful.v1-dev,
  golang-gopkg-yaml.v3-dev,
  pkgconf,
- protoc-gen-go-1-3,
+ protoc-gen-go-1-5,
  zlib1g-dev, 
 Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/debian/mirrorbits
diff -Nru mirrorbits-0.5.1+git20240203.4e34d9b+ds1/debian/patches/series mirrorbits-0.5.1+git20240203.4e34d9b+ds1/debian/patches/series
--- mirrorbits-0.5.1+git20240203.4e34d9b+ds1/debian/patches/series	2024-04-26 09:44:36.000000000 -0400
+++ mirrorbits-0.5.1+git20240203.4e34d9b+ds1/debian/patches/series	2024-07-28 14:24:29.000000000 -0400
@@ -1,2 +1,3 @@
 Adjust-mirrorbits.conf-for-Debian.patch
 Add-more-details-to-test-failure-message.patch
+set-proto-package-name.patch
diff -Nru mirrorbits-0.5.1+git20240203.4e34d9b+ds1/debian/patches/set-proto-package-name.patch mirrorbits-0.5.1+git20240203.4e34d9b+ds1/debian/patches/set-proto-package-name.patch
--- mirrorbits-0.5.1+git20240203.4e34d9b+ds1/debian/patches/set-proto-package-name.patch	1969-12-31 19:00:00.000000000 -0500
+++ mirrorbits-0.5.1+git20240203.4e34d9b+ds1/debian/patches/set-proto-package-name.patch	2024-07-28 14:24:29.000000000 -0400
@@ -0,0 +1,22 @@
+From: Reinhard Tartler <[email protected]>
+Date: Sun, 28 Jul 2024 15:02:59 -0400
+Subject: set proto package name
+
+---
+ rpc/rpc.proto | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/rpc/rpc.proto b/rpc/rpc.proto
+index fed9eb3..c046e86 100644
+--- a/rpc/rpc.proto
++++ b/rpc/rpc.proto
+@@ -3,6 +3,9 @@ syntax = "proto3";
+ import "google/protobuf/empty.proto";
+ import "google/protobuf/timestamp.proto";
+ 
++option go_package = "./";
++
++
+ service CLI {
+     rpc GetVersion (google.protobuf.Empty) returns (VersionReply) {}
+     rpc Upgrade (google.protobuf.Empty) returns (google.protobuf.Empty) {}
diff -Nru mirrorbits-0.5.1+git20240203.4e34d9b+ds1/debian/rules mirrorbits-0.5.1+git20240203.4e34d9b+ds1/debian/rules
--- mirrorbits-0.5.1+git20240203.4e34d9b+ds1/debian/rules	2024-04-26 09:44:36.000000000 -0400
+++ mirrorbits-0.5.1+git20240203.4e34d9b+ds1/debian/rules	2024-07-28 14:24:29.000000000 -0400
@@ -13,11 +13,6 @@
 %:
 	dh $@ --builddirectory=_build --buildsystem=golang --with=bash-completion
 
-execute_after_dh_auto_configure:
-	cd _build/src/$(PKG) && \
-	find -name "*.pb.go" -delete -printf "removed %p\n" && \
-	protoc -I rpc --go_out=plugins=grpc,Mgoogle/protobuf/empty.proto=github.com/golang/protobuf/ptypes/empty,Mgoogle/protobuf/timestamp.proto=github.com/golang/protobuf/ptypes/timestamp:rpc rpc/rpc.proto
-
 override_dh_auto_build:
 	dh_auto_build -- $(GO_BUILDFLAGS) -ldflags '$(GO_LDFLAGS)'
 

Reply via email to