Merge remote-tracking branch 'official/improve/debianization' into upstream/16.0

debian/aptly-api.service

@@ -9,7 +9,7 @@ Group=aptly-api
 Environment=TERM=dumb
 WorkingDirectory=~
 EnvironmentFile=/etc/default/aptly-api
-ExecStart=/usr/bin/aptly api serve -config=/etc/aptly.conf -listen=${LISTEN_ADDRESS}
+ExecStart=/usr/bin/aptly api serve -config=/etc/aptly.conf -no-lock -listen=${LISTEN_ADDRESS}
 
 [Install]
 WantedBy=multi-user.target

debian/control

@@ -87,9 +87,41 @@ XS-Go-Import-Path: github.com/aptly-dev/aptly
 Package: aptly
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, bzip2, xz-utils, adduser, gpg (>= 2.2.12)
+Suggests: graphviz
+Conflicts: gnupg1, gpgv1
 Built-Using: ${misc:Static-Built-Using}, ${misc:Built-Using}
-Description: Debian repository management tool
- aptly is a Swiss army knife for Debian repository management.
+Description: Swiss army knife for Debian repository management - main package
+ It offers several features making it easy to manage Debian package
+ repositories:
+ .
+  - make mirrors of remote Debian/Ubuntu repositories, limiting by
+    components/architectures
+  - take snapshots of mirrors at any point in time, fixing state of
+    repository at some moment of time
+  - publish snapshot as Debian repository, ready to be consumed by apt
+  - controlled update of one or more packages in snapshot from upstream
+    mirror, tracking dependencies
+  - merge two or more snapshots into one
+ .
+ This is the main package, it contains the aptly command-line utility.
+
+Package: aptly-api
+Architecture: all
+Depends: ${misc:Depends}, aptly, adduser
+Description: Swiss army knife for Debian repository management - API
+ It offers several features making it easy to manage Debian package
+ repositories:
+ .
+  - make mirrors of remote Debian/Ubuntu repositories, limiting by
+    components/architectures
+  - take snapshots of mirrors at any point in time, fixing state of
+    repository at some moment of time
+  - publish snapshot as Debian repository, ready to be consumed by apt
+  - controlled update of one or more packages in snapshot from upstream
+    mirror, tracking dependencies
+  - merge two or more snapshots into one
+ .
+ This package contains the aptly-api service.
 
 Package: aptly-dbg
 Architecture: any
@@ -97,9 +129,3 @@ Depends: ${misc:Depends}
 Built-Using: ${misc:Static-Built-Using}, ${misc:Built-Using}
 Description: Debian repository management tool (debug files)
  Debug symbols for aptly
-
-Package: aptly-api
-Architecture: all
-Depends: ${misc:Depends}, aptly
-Description: Debian repository management tool (REST API server)
- systemd service and configuration for aptly

debian/rules

@@ -20,7 +20,15 @@ override_dh_auto_clean:
 	rm -rf obj-$(DEB_TARGET_GNU_TYPE)/
 	dh_auto_clean
 
-override_dh_auto_test:  # disabled
+override_dh_auto_build:
+	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:
 	dh_auto_install -- --no-source

debian/tests/control

@@ -0,0 +1,4 @@
+# This file is an addition to the autodep8 tests.
+
+Test-Command: HOME=/tmp aptly repo create autopkgtest
+Restrictions: allow-stderr

debian/upstream/metadata

@@ -0,0 +1,5 @@
+---
+Bug-Database: https://github.com/aptly-dev/aptly/issues
+Bug-Submit: https://github.com/aptly-dev/aptly/issues/new
+Repository: https://github.com/aptly-dev/aptly.git
+Repository-Browse: https://github.com/aptly-dev/aptly

debian/watch

@@ -0,0 +1,5 @@
+version=4
+opts=\
+repacksuffix=+ds1,\
+dversionmangle=s/\+ds\d*$// \
+https://github.com/aptly-dev/aptly/tags .*/v(\d[\d\.]*)\.tar\.gz debian uupdate