Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Point to official aptly #3

Open
wants to merge 6 commits into
base: feature/aptly-1.4.0
Choose a base branch
from
Open

Point to official aptly #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
22831b0
Update aptly to molior-rebase branch
lbolla Aug 25, 2021
6dc990b
Bump aptly in molior-rebase branch
lbolla Sep 14, 2021
6c09559
Bump aptly
lbolla Sep 20, 2021
7240b9e
Allow to build on bullseye
lbolla Feb 1, 2022
0e55726
Point aptly submodule to official tip
lbolla Feb 1, 2022
e0f603e
Drop aptly submodule in favor of go modules
lbolla Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/go.mod
/go.sum
debian/aptly.debhelper.log
debian/aptly.substvars
debian/aptly/
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion debian/compat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
11
2 changes: 1 addition & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: aptly
Section: utils
Priority: extra
Maintainer: Sebastien Delafond <[email protected]>
Build-Depends: debhelper (>= 9.0.0), golang (>= 2:1.7~5~bpo8+1), bash-completion, dh-systemd (>= 1.5)
Build-Depends: debhelper (>= 9.20160709), golang (>= 2:1.7~5~bpo8+1), bash-completion
Standards-Version: 3.9.6
Homepage: http://www.aptly.info
Vcs-Git: git://anonscm.debian.org/collab-maint/aptly.git
Expand Down
2 changes: 1 addition & 1 deletion debian/manpages
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
src/github.com/aptly-dev/aptly/man/aptly.1
man/aptly.1
13 changes: 10 additions & 3 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,26 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1

SOURCE_DIR := $(CURDIR)/src/github.com/aptly-dev/aptly
DEST_DIR := $(CURDIR)/debian/aptly
VERSION := $(shell dpkg-parsechangelog -S Version)
APTLY_VERSION := 814d4dbb

%:
dh $@ --with systemd
dh $@

override_dh_auto_clean:
rm -f aptly

override_dh_auto_build:
GOPATH=$(CURDIR) go build -o aptly $(SOURCE_DIR)/main.go
rm -f go.mod
go mod init local/build
go mod edit -require github.com/aptly-dev/aptly@${APTLY_VERSION}
go build -o aptly -ldflags "-X main.Version=$(VERSION)" github.com/aptly-dev/aptly

override_dh_auto_install:
dh_bash-completion
mkdir -p $(DEST_DIR)/usr/bin
mv aptly $(DEST_DIR)/usr/bin/

override_dh_installman:
dh_installman --sourcedir=$(shell go env GOPATH)/pkg/mod/github.com/aptly-dev/aptly@$(shell go mod edit -print | grep aptly-dev | cut -d ' ' -f 3)/
1 change: 0 additions & 1 deletion src/github.com/aptly-dev/aptly
Open in desktop
Submodule aptly deleted from 3d2ccf