Skip to content

Commit

Permalink
Merge pull request #2244 from git-lfs/release-2.1-backport-deb-9
Browse files Browse the repository at this point in the history
release: backport Debian 9-related changes
  • Loading branch information
ttaylorr committed May 19, 2017
2 parents 17c74ee + 3ef5ca1 commit af1ccad
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
5 changes: 5 additions & 0 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ override_dh_strip:
# strip disabled as golang upstream doesn't support it and it makes go
# crash. See https://launchpad.net/bugs/1200255.

override_dh_golang:
# The dh_golang is used to add the Built-using field to the deb. This is only for reference.
# As of https://anonscm.debian.org/cgit/collab-maint/dh-golang.git/commit/script/dh_golang?id=7c3fbec6ea92294477fa8910264fe9bd823f21c3
# dh_golang errors out because the go compiler used was not installed via a package. Therefore the step is skipped

override_dh_auto_install:
mkdir -p debian/git-lfs/usr/bin
cp $(BUILD_DIR)/bin/git-lfs debian/git-lfs/usr/bin/
Expand Down
2 changes: 1 addition & 1 deletion docker/run_dockers.bsh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ while [[ $# > 0 ]]; do
done

if [[ ${#IMAGES[@]} == 0 ]]; then
IMAGES=(centos_6 centos_7 debian_7 debian_8)
IMAGES=(centos_6 centos_7 debian_7 debian_8 debian_9)
fi

mkdir -p "${PACKAGE_DIR}"
Expand Down
11 changes: 9 additions & 2 deletions script/packagecloud.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,20 @@
),
"debian/8" => %w(
debian/jessie
linuxmint/sarah
linuxmint/rebecca
linuxmint/rafaela
linuxmint/rebecca
linuxmint/rosa
ubuntu/trusty
ubuntu/vivid
ubuntu/wily
),
"debian/9" => %W(
debian/stretch
linuxmint/sarah
linuxmint/serena
ubuntu/xenial
ubuntu/yakkety
ubuntu/zesty
),
}

Expand Down Expand Up @@ -91,6 +97,7 @@ def distro_names_for(filename)
os, distro = case full_path
when /debian\/7/ then ["Debian 7", "debian/wheezy"]
when /debian\/8/ then ["Debian 8", "debian/jessie"]
when /debian\/9/ then ["Debian 9", "debian/stretch"]
when /centos\/5/ then ["RPM RHEL 5/CentOS 5", "el/5"]
when /centos\/6/ then ["RPM RHEL 6/CentOS 6", "el/6"]
when /centos\/7/ then ["RPM RHEL 7/CentOS 7", "el/7"]
Expand Down

0 comments on commit af1ccad

Please sign in to comment.