Skip to content

Commit 35e1225

Browse files
ottokottok
committed
WIP: updates
1 parent 20919dc commit 35e1225

File tree

6 files changed

+45
-70
lines changed

6 files changed

+45
-70
lines changed

‎debian/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*.log
33
*.substvars
44
/.debhelper/
5-
/.build/
5+
/_build/
66
/debhelper-build-stamp
77
/files
88
/tiup/

‎debian/changelog‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
1-
tiup (1.16.3+20250909~e769cc5c) unstable; urgency=medium
1+
tiup (1.16.4-1) unstable; urgency=medium
22

3-
* Initial native packaging
3+
* New upstream release
4+
* Remove multiple patches that limited TiUP functionality and dependencies
5+
intentionally when multiple packages were pending in the NEW queue in
6+
parallel, as they have all been accepted into Debian now and TiUP can be
7+
built with full functionality
8+
* Remove unused build dependencies identified by dh-make-golang
9+
* Drop redundant `Priority: optional`
10+
* Bump Debian Policy version to 4.7.3
11+
* Update copyright years for recent contributors
12+
* Update d/watch to use uscan v5 format
13+
* Update Lintian overrides about spelling errors in binaries
14+
15+
-- Otto Kekäläinen <otto@debian.org> Fri, 27 Feb 2026 08:08:08 +0000
16+
17+
tiup (1.16.3-1) unstable; urgency=medium
18+
19+
* Initial release (Closes: #1107484)
420

521
-- Otto Kekäläinen <otto@debian.org> Wed, 19 Mar 2025 23:31:49 +0000

‎debian/control‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Source: tiup
22
Section: golang
3-
Priority: optional
43
Maintainer: Debian Go Packaging Team <team+pkg-go@tracker.debian.org>
54
Uploaders:
65
Otto Kekäläinen <otto@debian.org>,
@@ -10,23 +9,19 @@ Build-Depends:
109
dh-sequence-golang,
1110
golang-any,
1211
golang-etcd-server-dev,
13-
golang-github-alecthomas-chroma-dev,
1412
golang-github-appleboy-easyssh-proxy-dev,
1513
golang-github-asaskevich-eventbus-dev,
1614
golang-github-astroprofundis-sysinfo-dev,
1715
golang-github-cavaliergopher-grab-dev,
1816
golang-github-cheggaaa-pb.v3-dev,
1917
golang-github-creasty-defaults-dev,
20-
golang-github-dchest-bcrypt-pbkdf-dev,
2118
golang-github-docker-go-units-dev,
2219
golang-github-fatih-color-dev,
2320
golang-github-gibson042-canonicaljson-go-dev,
2421
golang-github-gizak-termui-dev,
2522
golang-github-go-git-go-billy-dev,
2623
golang-github-go-sql-driver-mysql-dev,
2724
golang-github-gofrs-flock-dev,
28-
golang-github-golang-protobuf-1-5-dev,
29-
golang-github-google-shlex-dev,
3025
golang-github-google-uuid-dev,
3126
golang-github-gorilla-mux-dev,
3227
golang-github-jedib0t-go-pretty-dev,
@@ -41,7 +36,6 @@ Build-Depends:
4136
golang-github-pingcap-failpoint-dev,
4237
golang-github-pingcap-fn-dev,
4338
golang-github-pingcap-kvproto-dev,
44-
golang-github-pkg-errors-dev,
4539
golang-github-prometheus-client-model-dev,
4640
golang-github-prometheus-common-dev,
4741
golang-github-prometheus-prom2json-dev,
@@ -57,23 +51,16 @@ Build-Depends:
5751
golang-github-vishvananda-netlink-dev,
5852
golang-github-xo-dburl-dev,
5953
golang-github-xo-tblfmt-dev,
60-
golang-github-xo-terminfo-dev,
6154
golang-github-xo-usql-dev,
6255
golang-go.uber-atomic-dev,
6356
golang-go.uber-zap-dev,
64-
golang-golang-x-crypto-dev,
65-
golang-golang-x-mod-dev,
66-
golang-golang-x-sync-dev,
67-
golang-golang-x-sys-dev,
68-
golang-golang-x-term-dev,
69-
golang-google-grpc-dev,
57+
golang-gogoprotobuf-dev,
7058
golang-gopkg-ini.v1-dev,
71-
golang-gopkg-vmihailenco-msgpack.v2-dev,
7259
golang-gopkg-yaml.v3-dev,
7360
golang-sslmate-src-go-pkcs12-dev,
7461
golang-toml-dev,
7562
Testsuite: autopkgtest-pkg-go
76-
Standards-Version: 4.7.2
63+
Standards-Version: 4.7.3
7764
Vcs-Browser: https://salsa.debian.org/go-team/packages/tiup
7865
Vcs-Git: https://salsa.debian.org/go-team/packages/tiup.git
7966
Homepage: https://github.com/pingcap/tiup
@@ -87,6 +74,8 @@ Depends:
8774
${shlibs:Depends},
8875
Static-Built-Using:
8976
${misc:Static-Built-Using},
77+
Built-Using:
78+
${misc:Built-Using},
9079
Description: Component manager for TiDB
9180
TiUP is a tool designed to manage TiDB components, providing an easy way to
9281
install, update, and maintain various components of the TiDB ecosystem. It

‎debian/copyright‎

Lines changed: 19 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,31 @@ Source: https://github.com/pingcap/tiup
33
Upstream-Name: PingCAP
44
Upstream-Contact: https://github.com/pingcap/tiup/issues
55

6-
Files: *
7-
Copyright: 2020-2025 PingCAP
6+
Files:
7+
*
8+
Copyright:
9+
2018-2025 PingCAP, Inc.
810
License: Apache-2.0
911

10-
Files: debian/*
12+
Files:
13+
debian/*
1114
Copyright:
12-
2025 Otto Kekäläinen <otto@debian.org>
15+
2025-2026 Otto Kekäläinen <otto@debian.org>
1316
License: Apache-2.0
1417
Comment: Debian packaging is licensed under the same terms as upstream
1518

16-
Files: debian/vendor/github.com/zaf/temp/*
17-
Copyright: 2012 The Go Authors, 2017 Lefteris Zafiris
18-
License: BSD-3-Clause
19+
Files:
20+
pkg/cluster/api/typeutil/*.go
21+
Copyright:
22+
2016-2017 TiKV Project Authors
23+
License: Apache-2.0
24+
25+
Files:
26+
pkg/checkpoint/gotrack.go
27+
Copyright:
28+
2021 PingCAP, Inc.
29+
2014 The Go Authors
30+
License: Apache-2.0
1931

2032
License: Apache-2.0
2133
Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,29 +44,3 @@ License: Apache-2.0
3244
Comment:
3345
On Debian systems, the complete text of the Apache version 2.0 license
3446
can be found in "/usr/share/common-licenses/Apache-2.0".
35-
36-
License: BSD-3-Clause
37-
Redistribution and use in source and binary forms, with or without
38-
modification, are permitted provided that the following conditions are met:
39-
.
40-
1. Redistributions of source code must retain the above copyright notice, this
41-
list of conditions and the following disclaimer.
42-
.
43-
2. Redistributions in binary form must reproduce the above copyright notice,
44-
this list of conditions and the following disclaimer in the documentation
45-
and/or other materials provided with the distribution.
46-
.
47-
3. Neither the name of the copyright holder nor the names of its
48-
contributors may be used to endorse or promote products derived from
49-
this software without specific prior written permission.
50-
.
51-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
52-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
53-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
54-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
55-
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
56-
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
57-
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
58-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
59-
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
60-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎debian/rules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ override_dh_auto_install:
2828
(cd debian/tiup/usr/bin/ && for x in *; do mv $$x tiup-$$x; done; mv tiup-tiup tiup)
2929

3030
%:
31-
dh $@ --builddirectory=debian/.build/upstream --buildsystem=golang
31+
dh $@ --builddirectory=debian/_build/upstream --buildsystem=golang

‎debian/tiup.lintian-overrides‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,4 @@
11
# All of these spelling errors are inherited from dependencies and not issues in
2-
# this TiUP package itself:
3-
# grep -r -i -w -E 'hexidecimal|octects|userA|wtH|ment'
4-
# golang.org/x/crypto@v0.23.0/cryptobyte/asn1.go: b.err = fmt.Errorf("cryptobyte: high-tag number identifier octects not supported: 0x%x", tag)
5-
# golang.org/x/net@v0.25.0/html/testdata/webkit/tests1.dat:<?COM--MENT?>
6-
# golang.org/x/net@v0.25.0/webdav/internal/xml/marshal_test.go: Directive("DOCTYPE doc [ <!ELEMENT doc '>'> <!-- com>ment --> ]"),
7-
# golang.org/x/text@v0.15.0/unicode/runenames/tables9.0.0.go: "MENT-WALLPLANE BEND LARGESIGNWRITING MOVEMENT-WALLPLANE CORNER SMALLSIGN" +
8-
# github.com/gorilla/mux@v1.8.0/doc.go: amw.tokenUsers["aaaaaaaa"] = "userA"
9-
# github.com/gorilla/mux@v1.8.0/README.md: amw.tokenUsers["aaaaaaaa"] = "userA"
10-
# github.com/gorilla/mux@v1.8.0/example_authentication_middleware_test.go: amw.tokenUsers["aaaaaaaa"] = "userA"
11-
# github.com/!burnt!sushi/toml@v1.2.1/lex.go: lx.errorf("not a hexidecimal number: '%s%c'", lx.current(), r)
12-
# google.golang.org/genproto@v0.0.0-20240401170217-c3f982113cda/googleapis/genomics/v1/references.pb.go: // checksum is computed by sorting all lower case hexidecimal string
13-
# google.golang.org/genproto@v0.0.0-20240401170217-c3f982113cda/googleapis/devtools/containeranalysis/v1beta1/attestation/attestation.pb.go: // 160-bit fingerprint, expressed as a 40 character hexidecimal string. See
14-
tiup: spelling-error-in-binary hexidecimal hexadecimal [usr/bin/*]
2+
# this TiUP package itself
153
tiup: spelling-error-in-binary ment meant [usr/bin/*]
16-
tiup: spelling-error-in-binary octects octets [usr/bin/*]
17-
tiup: spelling-error-in-binary userA users [usr/bin/*]
18-
tiup: spelling-error-in-binary wtH with [usr/bin/*]
19-
# Prevent Lintian from nagging about typos in this file itself
20-
spelling-in-override-comment spelling-error-in-binary * [usr/share/lintian/overrides/tiup:*]
4+
tiup: spelling-error-in-binary preceed precede [usr/bin/*]

0 commit comments

Comments
 (0)