vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-01-11 03:11:50 +00:00
Code Issues Projects Releases Wiki Activity

adapt to official debian aptly packaging

Browse Source
This commit is contained in:
André Roth
2024-11-15 14:59:07 +01:00
parent 8c2ea639fd
commit 6050051e04
14 changed files with 42 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@@ -142,7 +142,7 @@ jobs:
- name: "Install packages" - name: "Install packages"
run: | run: |
apt-get update apt-get update
apt-get install -y --no-install-recommends make ca-certificates git curl build-essential devscripts dh-golang binutils-i686-linux-gnu binutils-aarch64-linux-gnu binutils-arm-linux-gnueabihf jq apt-get install -y --no-install-recommends make ca-certificates git curl build-essential devscripts dh-golang binutils-i686-linux-gnu binutils-aarch64-linux-gnu binutils-arm-linux-gnueabihf jq bash-completion
git config --global --add safe.directory "$GITHUB_WORKSPACE" git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: "Checkout repository" - name: "Checkout repository"

8
.gitignore vendored
View File

@@ -53,18 +53,16 @@ obj-x86_64-linux-gnu/
# debian # debian
debian/.debhelper/ debian/.debhelper/
debian/aptly.debhelper.log
debian/aptly.postrm.debhelper
debian/aptly.substvars debian/aptly.substvars
debian/aptly/ debian/aptly/
debian/debhelper-build-stamp debian/debhelper-build-stamp
debian/files debian/files
debian/aptly-api/ debian/aptly-api/
debian/aptly-api.debhelper.log debian/*.debhelper
debian/aptly-api.postrm.debhelper debian/*.debhelper.log
debian/aptly-api.substvars debian/aptly-api.substvars
debian/aptly-dbg.debhelper.log
debian/aptly-dbg.substvars debian/aptly-dbg.substvars
debian/aptly-dbg/ debian/aptly-dbg/
usr
docs/ docs/

1
debian/aptly-api.maintscript vendored Normal file
View File

@@ -0,0 +1 @@
mv_conffile /etc/aptly-api.conf /etc/aptly.conf 1.6~

48
debian/aptly-api.postinst vendored Normal file → Executable file
View File

@@ -1,28 +1,13 @@
#!/bin/sh #!/bin/sh
#
# see: dh_installdeb(1)
set -e set -e
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
# * <old-postinst> `abort-upgrade' <new version>
# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
# <new-version>
# * <postinst> `abort-remove'
# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
# <failed-install-package> <version> `removing'
# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
# source debconf library # source debconf library
. /usr/share/debconf/confmodule . /usr/share/debconf/confmodule
case "$1" in case "$1" in
configure) configure|reconfigure)
# create an aptly group and user # create an aptly-api group and user
if ! getent passwd aptly-api > /dev/null; then if ! getent passwd aptly-api > /dev/null; then
useradd --system --user-group --create-home --home-dir /var/lib/aptly-api aptly-api useradd --system --user-group --create-home --home-dir /var/lib/aptly-api aptly-api
fi fi
@@ -30,32 +15,17 @@ case "$1" in
# set config file permissions not world readable as it may contain secrets # set config file permissions not world readable as it may contain secrets
chown root:aptly-api /etc/aptly.conf chown root:aptly-api /etc/aptly.conf
chmod 640 /etc/aptly.conf chmod 640 /etc/aptly.conf
;;
if [ -f /etc/aptly-api.conf.migrate ]; then abort-upgrade|abort-remove|abort-deconfigure)
rootDir=`grep rootDir /etc/aptly-api.conf.migrate | sed 's_/var/lib/aptly-api_~_' | sed -n 's/.\+: "\([^"]\+\)".*/\1/p'` ;;
if [ -n "$rootDir" ]; then
sed -i 's/\(.*"rootDir": "\)[^"]*\(".*\)/\1'$rootDir'\2/' /etc/aptly.conf
fi
echo "backing up /etc/aptly-api.conf to /etc/aptly-api.conf.old..."
mv /etc/aptly-api.conf.migrate /etc/aptly-api.conf.old
fi
;;
abort-upgrade|abort-remove|abort-deconfigure) *)
exit 0 echo "postinst called with unknown argument \`$1'" >&2
;; exit 1
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
;;
esac esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER# #DEBHELPER#
db_stop
exit 0 exit 0

38
debian/aptly-api.preinst vendored
View File

@@ -1,38 +0,0 @@
#!/bin/sh
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <new-preinst> `install'
# * <new-preinst> `install' <old-version>
# * <new-preinst> `upgrade' <old-version>
# * <old-preinst> `abort-upgrade' <new-version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
install|upgrade)
if [ -f /etc/aptly-api.conf ]; then
echo "migrating /etc/aptly-api.conf ..."
mv /etc/aptly-api.conf /etc/aptly-api.conf.migrate
fi
;;
abort-upgrade)
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0

1
debian/aptly.bash-completion vendored Normal file
View File

@@ -0,0 +1 @@
completion.d/aptly

8
debian/aptly.install vendored
View File

@@ -1,6 +1,2 @@
build/aptly usr/bin/ usr/bin/aptly
README.rst usr/share/aptly/ completion.d/_aptly usr/share/zsh/vendor-completions
LICENSE usr/share/aptly/
AUTHORS usr/share/aptly/
completion.d/_aptly usr/share/zsh/vendor-completions/
completion.d/aptly usr/share/bash-completion/completions/

1
debian/aptly.manpages vendored Normal file
View File

@@ -0,0 +1 @@
man/aptly.1

93
debian/changelog vendored
View File

@@ -1,92 +1,5 @@
aptly (1.6.0~beta1) stable; urgency=medium aptly (1.6.0~rc1) stable; urgency=medium
* upstream aptly debianization * release candidate
-- André Roth <neolynx@gmail.com> Tue, 17 Sep 2024 16:47:44 +0200 -- André Roth <neolynx@gmail.com> Sat, 16 Nov 2024 12:44:06 +0100
aptly (1.5.0+ds1-1) unstable; urgency=medium
* Team upload.
* New upstream release (Closes: #1022721), including fix for "Order of
fields in Packages/Sources is unpredictable" (Closes: #907121).
-- Roland Mas <lolando@debian.org> Tue, 31 Jan 2023 14:47:04 +0100
aptly (1.4.0+ds1-7) unstable; urgency=medium
* Team upload.
* Add support for zstd compression (Closes: #1010465)
-- Anton Gladky <gladk@debian.org> Tue, 17 May 2022 22:42:29 +0200
aptly (1.4.0+ds1-6) unstable; urgency=medium
* Conflict on gpgv1 (Closes: #990821)
-- Sebastien Delafond <seb@debian.org> Thu, 04 Nov 2021 10:24:53 +0100
aptly (1.4.0+ds1-5) unstable; urgency=medium
* Conflict on gnupg1 (Closes: #990821)
-- Sebastien Delafond <seb@debian.org> Thu, 14 Oct 2021 18:43:04 +0200
aptly (1.4.0+ds1-4) unstable; urgency=medium
* Install correct bash completion snippet (Closes: #984979)
-- Sebastien Delafond <seb@debian.org> Thu, 11 Mar 2021 15:20:57 +0100
aptly (1.4.0+ds1-3) unstable; urgency=medium
* Fix s3 etag issue (Closes: #983877)
* Bump-up d/watch version
* Bump-up Standards-Version
-- Sebastien Delafond <seb@debian.org> Wed, 03 Mar 2021 10:50:51 +0100
aptly (1.4.0+ds1-2) unstable; urgency=medium
* Use pipeline from salsa-ci-team
* Allow reprotest failure
* Pass version from d/rules (Closes: #968585)
-- Sebastien Delafond <seb@debian.org> Fri, 21 Aug 2020 10:13:44 +0200
aptly (1.4.0+ds1-1) unstable; urgency=medium
* New upstream version 1.4.0+ds1
* Rediff patches
* Depend on gnupg 2
-- Sebastien Delafond <seb@debian.org> Sun, 22 Dec 2019 15:16:25 +0100
aptly (1.3.0+ds1-4) unstable; urgency=medium
[ Debian Janitor ]
* Rename obsolete path debian/tests/control.autodep8 to debian/tests/control.
* Use secure URI in Homepage field.
* Bump debhelper from old 11 to 12.
* Set debhelper-compat version in Build-Depends.
[ Sébastien Delafond ]
* Bump up Standards-Version
-- Sebastien Delafond <seb@debian.org> Sun, 22 Dec 2019 14:10:19 +0100
aptly (1.3.0+ds1-3) unstable; urgency=medium
* Build-Depend on golang-golang-x-tools-dev instead of golang-go.tools (Closes: #945884)
* Lintian fix
-- Sebastien Delafond <seb@debian.org> Sat, 21 Dec 2019 10:29:09 +0100
aptly (1.3.0+ds1-2.3) unstable; urgency=medium
* Non-maintainer upload.
* Remove myself from uploaders.
-- Alexandre Viau <aviau@debian.org> Sun, 15 Sep 2019 19:27:47 -0400
# Older entries have been removed from this changelog.
# To read the complete changelog use `apt changelog aptly`.

1
debian/compat vendored
View File

@@ -1 +0,0 @@
11

17
debian/control vendored
View File

@@ -1,9 +1,9 @@
Source: aptly Source: aptly
Section: devel Section: utils
Priority: optional Priority: optional
Maintainer: Debian Go Packaging Team <team+pkg-go@tracker.debian.org> Maintainer: André Roth <neolynx@gmail.com>
Uploaders: TODO <admin@lepton.exnihilo> Build-Depends: bash-completion,
Build-Depends: debhelper (>= 11), debhelper-compat (= 13),
dh-golang, dh-golang,
golang-go, golang-go,
golang-github-aleksi-pointer-dev, golang-github-aleksi-pointer-dev,
@@ -78,12 +78,11 @@ Build-Depends: debhelper (>= 11),
golang-go.uber-zap-dev, golang-go.uber-zap-dev,
golang-etcd-server-dev (>= 3.5.15-7), golang-etcd-server-dev (>= 3.5.15-7),
git git
Standards-Version: 4.2.1 Standards-Version: 4.7.0
Homepage: https://github.com/aptly-dev/aptly Homepage: https://www.aptly.info
Vcs-Browser: https://salsa.debian.org/go-team/packages/aptly Vcs-Git: https://github.com/aptly-dev/aptly.git
Vcs-Git: https://salsa.debian.org/go-team/packages/aptly.git Vcs-Browser: https://github.com/aptly-dev/aptly
XS-Go-Import-Path: github.com/aptly-dev/aptly XS-Go-Import-Path: github.com/aptly-dev/aptly
Testsuite: autopkgtest-pkg-go
Package: aptly Package: aptly
Architecture: any Architecture: any

3
debian/copyright vendored
View File

@@ -1,10 +1,9 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: aptly Upstream-Name: aptly
Source: http://www.aptly.info Source: http://www.aptly.info
Files-Excluded: vendor/*
Files: * Files: *
Copyright: 2014 Andrey Smirnov <me@smira.ru> Copyright: 2014 Andrey Smirnov <me@smira.ru>, 2023 André Roth <neolynx@gmail.com>
License: Expat License: Expat
Comment: Some of aptly's vendored dependencies are already in Debian, and Comment: Some of aptly's vendored dependencies are already in Debian, and
Alexandre Viau is well on his way to packaging the rest of them so that Alexandre Viau is well on his way to packaging the rest of them so that

1
debian/manpages vendored Normal file
View File

@@ -0,0 +1 @@
src/github.com/aptly-dev/aptly/man/aptly.1

30
debian/rules vendored
View File

@@ -8,36 +8,28 @@ export DEB_BUILD_OPTIONS=crossbuildcanrunhostbinaries
export GOARCH := $(shell if [ $(DEB_TARGET_ARCH) = "i386" ]; then echo "386"; elif [ $(DEB_TARGET_ARCH) = "armhf" ]; then echo "arm"; else echo $(DEB_TARGET_ARCH); fi) export GOARCH := $(shell if [ $(DEB_TARGET_ARCH) = "i386" ]; then echo "386"; elif [ $(DEB_TARGET_ARCH) = "armhf" ]; then echo "arm"; else echo $(DEB_TARGET_ARCH); fi)
%: %:
dh $@ --buildsystem=golang --with=golang dh $@ --buildsystem=golang --with=golang,bash-completion
override_dh_auto_clean: override_dh_auto_clean:
rm -rf build/ rm -rf build/
rm -rf obj-$(DEB_TARGET_GNU_TYPE)/ rm -rf obj-$(DEB_TARGET_GNU_TYPE)/
dh_auto_clean dh_auto_clean
override_dh_auto_build: override_dh_auto_test: # disabled
echo $(DEB_VERSION) > VERSION
go build -o build/aptly
# when dependencies fully debianized:
# echo $(DEB_VERSION) > obj-$(DEB_TARGET_GNU_TYPE)/src/github.com/aptly-dev/aptly/VERSION
# dh_auto_build
override_dh_auto_test:
override_dh_auto_install: override_dh_auto_install:
dh_auto_install -- --no-source dh_auto_install -- --no-source
mkdir -p build
test -f debian/tmp/usr/bin/aptly && mv debian/tmp/usr/bin/aptly build/ || true
mkdir -p debian/aptly/usr/share/man/man1/
cp man/aptly.1 debian/aptly/usr/share/man/man1
gzip debian/aptly/usr/share/man/man1/aptly.1
override_dh_strip: override_dh_strip:
dh_strip --dbg-package=aptly-dbg dh_strip --dbg-package=aptly-dbg
# only with full debian dependencies: override_dh_golang: # fails on non native debian build
override_dh_golang:
# not needed with golang, fails with cross compiling # override_dh_makeshlibs: # fails with cross compiling on non native debian build
# override_dh_makeshlibs:
override_dh_dwz: # somehow dwz works only with certain newer debhelper versions
dhver=`dpkg-query -f '$${Version}' -W debhelper`; (dpkg --compare-versions "$$dhver" lt 13 || test "$$dhver" = "13.3.4" || test "$$dhver" = "13.6ubuntu1") || dh_dwz
override_dh_auto_build:
echo $(DEB_VERSION) > VERSION
go build -o usr/bin/aptly