On 12/29/21 11:04 PM, Federico Grau wrote:
On Wed, Dec 29, 2021 at 11:21:16AM +0530, Nilesh Patra wrote:I was going to upload, but build does not work. Please fix this:- | dpkg-source: info: using patch list from debian/patches/series | dpkg-source: info: applying 02_remove_gitattributes.diff | dpkg-source: info: using source format '3.0 (quilt)' | dpkg-source: info: building golang-github-la5nta-wl2k-go using existing ./golang-github-la5nta-wl2k-go_0.8.0.orig.tar.gz | dpkg-source: info: using patch list from debian/patches/series | dpkg-source: info: local changes detected, the modified files are: | golang-github-la5nta-wl2k-go/transport/ardop/ardop.go | golang-github-la5nta-wl2k-go/transport/ardop2/ardop.go | golang-github-la5nta-wl2k-go/transport/telnet/dial.go | golang-github-la5nta-wl2k-go/transport/winmor/winmor.go | dpkg-source: info: you can integrate the local changes with dpkg-source --commitThanks for the review and feedback Nilesh, I'm not seeing the above errors when I try a build. Was it tried in a clean/fresh environment?
Yes.
Here is a link to output of my successful clean build (usng gbp and sbuild; up
3 days).
https://paste.debian.net/1225147/
I welcome more details on what may be different, so we can try correcting
things.
$ gbp clone --pristine-tar git@salsa.debian.org:go-team/packages/golang-github-la5nta-wl2k-go.git $ cd golang-github-la5nta-wl2k-go $ origtargz Trying uscan --download --download-current-version ... uscan: Newest version of golang-github-la5nta-wl2k-go on remote site is 0.8.0, specified download version is 0.8.0 Successfully renamed ../golang-github-la5nta-wl2k-go-0.8.0.tar.gz to ../golang-github-la5nta-wl2k-go_0.8.0.orig.tar.gz. $ sbuild -d unstable | dpkg-source: info: using patch list from debian/patches/series | dpkg-source: info: applying 02_remove_gitattributes.diff | dpkg-source: info: using source format '3.0 (quilt)' | dpkg-source: info: building golang-github-la5nta-wl2k-go using existing ./golang-github-la5nta-wl2k-go_0.8.0.orig.tar.gz | dpkg-source: info: using patch list from debian/patches/series | dpkg-source: info: local changes detected, the modified files are: | golang-github-la5nta-wl2k-go/transport/ardop/ardop.go | golang-github-la5nta-wl2k-go/transport/ardop2/ardop.go | golang-github-la5nta-wl2k-go/transport/telnet/dial.go | golang-github-la5nta-wl2k-go/transport/winmor/winmor.go | dpkg-source: info: you can integrate the local changes with dpkg-source --commit | dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/golang-github-la5nta-wl2k-go_0.8.0-1.diff.redBO1 | E: Failed to package source directory /home/nilesh/packages/wl2k/golang-github-la5nta-wl2k-go $ cd .. $ tar -xzvf golang-github-la5nta-wl2k-go_0.8.0.orig.tar.gz .... $ cd - $ diff -u transport/ardop/ardop.go ../wl2k-go-0.8.0/transport/ardop/ardop.go --- transport/ardop/ardop.go 2021-12-29 23:05:19.764415520 +0530 +++ ../wl2k-go-0.8.0/transport/ardop/ardop.go 2021-10-31 14:52:41.000000000 +0530 @@ -98,5 +98,5 @@ }func debugEnabled() bool {
- return os.Getenv("ARDOP_DEBUG") != ""
+ return os.Getenv("ardop_debug") != ""
}
$ diff -u transport/ardop2/ardop.go ../wl2k-go-0.8.0/transport/ardop2/ardop.go
--- transport/ardop2/ardop.go 2021-12-29 23:05:19.764415520 +0530
+++ ../wl2k-go-0.8.0/transport/ardop2/ardop.go 2021-10-31 14:52:41.000000000 +0530
@@ -67,5 +67,5 @@
}
func debugEnabled() bool {
- return os.Getenv("ARDOP_DEBUG") != ""
+ return os.Getenv("ardop_debug") != ""
}
.... so on
It does not match the tar 0.8.0 provided by upstream. You can compare the lines if you want. As an example, see here[1] and here[2]
[1]: https://salsa.debian.org/go-team/packages/golang-github-la5nta-wl2k-go/-/blob/debian/sid/transport/ardop2/ardop.go#L70
[2]: https://github.com/la5nta/wl2k-go/blob/v0.8.0/transport/ardop/ardop.go#L101
Please check what's up?
Regards
Nilesh
Attachment:
OpenPGP_signature
Description: OpenPGP digital signature