Adjust packaging for 1.6.0~alpha1

debian/NEWS

@@ -1,3 +1,16 @@
+aptly (1.6.0+ds1~alpha1-1) unstable; urgency=medium
+
+  - aptly-api: configuration file is now /etc/aptly.conf, and `rootDir`
+    defaults to `~/.aptly`
+
+  - aptly-api: default port is 8080, as declared in
+    `/etc/default/aptly-api`
+
+  - aptly: swagger support is disabled, but will be re-enabled after the
+    corresponding golang packages make it to unstable
+
+ -- Sebastien Delafond <seb@debian.org>  Tue, 15 Oct 2024 11:41:33 +0200
+
 aptly (1.3.0+ds1-2.2) unstable; urgency=medium
 
   This version tries to fix the database backwards compatibility,

debian/README.source

@@ -1,9 +0,0 @@
-aptly for Debian
-----------------
-
-For now, we bundle the Go libraries that aptly depends on, within the
-aptly tarball itself. As time goes, those will be packaged on their
-own.
-
- -- Sebastien Delafond <seb@debian.org>, Tue, 29 Apr 2014 15:56:02 +0200
-

debian/aptly-api.conf

@@ -1,3 +0,0 @@
-{
-  "rootDir": "/var/lib/aptly-api"
-}

debian/aptly-api.postinst

@@ -1,43 +1,29 @@
 #!/bin/sh
-# postinst script for aptly-api
-#
-# see: dh_installdeb(1)
 
 set -e
 
-# summary of how this script can be called:
+# source debconf library
-#        * <postinst> `configure' <most-recently-configured-version>
+. /usr/share/debconf/confmodule
-#        * <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
-
 
 case "$1" in
     configure|reconfigure)
-
         # create an aptly-api group and user
         if ! getent passwd aptly-api > /dev/null; then
-        adduser --system --home /var/lib/aptly-api --no-create-home aptly-api
+	    useradd --system --user-group --create-home --home-dir /var/lib/aptly-api aptly-api
-        addgroup --system aptly-api
-        adduser aptly-api aptly-api
         fi
 
-        # setup /var/lib/aptly-api
+        # set config file permissions not world readable as it may contain secrets
-        if [ ! -d /var/lib/aptly-api ]; then
+        chown root:aptly-api /etc/aptly.conf
-            mkdir -p /var/lib/aptly-api
+        chmod 640 /etc/aptly.conf
-        fi
-        chown aptly-api:aptly-api /var/lib/aptly-api
 
-        # set config file permissions
+        if [ -f /etc/aptly-api.conf.migrate ]; then
-        # it may contain secrets so it is not world readable
+            rootDir=`grep rootDir /etc/aptly-api.conf.migrate | sed 's_/var/lib/aptly-api_~_' | sed -n 's/.\+: "\([^"]\+\)".*/\1/p'`
-        chown root:aptly-api /etc/aptly-api.conf
+            if [ -n "$rootDir" ]; then
-        chmod 640 /etc/aptly-api.conf
+                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)

debian/aptly-api.postrm

@@ -1,24 +1,7 @@
 #!/bin/sh
-# postrm script for aptly-api
-#
-# see: dh_installdeb(1)
 
 set -e
 
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
 case "$1" in
     purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
       # Only remove /var/lib/aptly-api on purge

debian/control

@@ -109,7 +109,6 @@ Description: Swiss army knife for Debian repository management - main package
 Package: aptly-api
 Architecture: all
 Depends: ${misc:Depends}, aptly, adduser
-Built-Using: ${misc:Built-Using}
 Description: Swiss army knife for Debian repository management - API
  It offers several features making it easy to manage Debian package
  repositories:

debian/copyright

@@ -1,7 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: aptly
 Source: http://www.aptly.info
-Files-Excluded: debian/*
 
 Files: *
 Copyright: 2014 Andrey Smirnov <me@smira.ru>

debian/rules

@@ -1,19 +1,16 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
 include /usr/share/dpkg/pkg-info.mk
 
+%:
+	dh $@ --buildsystem=golang --with=golang,bash-completion
+
 override_dh_auto_test:
-	# tests are failing for now and the pacakge vendors many libraries
+	# run during autopkgtests
 
 override_dh_auto_install:
 	dh_auto_install -- --no-source
 
 override_dh_auto_build:
-	dh_auto_build -- -ldflags "-X main.Version=$(DEB_VERSION)"
+	echo $(DEB_VERSION) > obj-$(DEB_TARGET_GNU_TYPE)/src/github.com/aptly-dev/aptly/VERSION
-
+	dh_auto_build
-%:
-	dh $@ --buildsystem=golang --with=golang,bash-completion

debian/tests/control

@@ -1,8 +1,4 @@
 # This file is an addition to the autodep8 tests.
-#
-# See autodep8(1):
-# > If `debian/tests/control.autodep8` exists, autodep8
-# > will prepend the contents of that file to its own output.
 
 Test-Command: HOME=/tmp aptly repo create autopkgtest
 Restrictions: allow-stderr