fix merge conflict

.gitignore

@@ -10,3 +10,9 @@ man/*
 *.test
 tmp
 test/remote
+
+debian/git-lfs/
+debian/*.log
+debian/files
+debian/*.substvars
+obj-*

debian/changelog

@@ -0,0 +1,5 @@
+git-lfs (0.5.1) stable; urgency=medium
+
+  * Initial release.
+
+ -- Stephen Gelman <gelman@getbraintree.com>  Fri, 08 May 2015 22:55:45 +0000

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -0,0 +1,14 @@
+Source: git-lfs
+Section: vcs
+Priority: optional
+Maintainer: Stephen Gelman <gelman@getbraintree.com>
+Build-Depends: debhelper (>= 9), dh-golang, golang-go (>= 1.3.0), git (>= 1.8.0), ruby-ronn
+Standards-Version: 3.9.4
+
+Package: git-lfs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, git
+Built-Using: ${misc:Built-Using}
+Description: Git Large File Support
+ An open source Git extension for versioning large files
+Homepage: https://git-lfs.github.com/

debian/copyright

@@ -0,0 +1 @@
+../LICENSE

debian/git-lfs.manpages

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

debian/rules

@@ -0,0 +1,37 @@
+#!/usr/bin/make -f
+
+export DH_OPTIONS
+
+BUILD_DIR := obj-$(DEB_BUILD_GNU_TYPE)
+export DH_GOPKG := github.com/github/git-lfs
+export PATH := $(CURDIR)/$(BUILD_DIR)/bin:$(PATH)
+
+%:
+	dh $@ --buildsystem=golang --with=golang
+
+override_dh_clean:
+	rm -f debian/debhelper.log
+	rm -rf man
+	dh_clean
+
+override_dh_auto_build:
+	for dir in .vendor/src/github.com/*; do \
+		ln -s ../../../$$dir $(BUILD_DIR)/src/github.com/; \
+	done
+	dh_auto_build
+	rm $(BUILD_DIR)/bin/script
+	./script/man
+
+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_auto_install:
+	mkdir -p debian/git-lfs/usr/bin
+	cp $(BUILD_DIR)/bin/git-lfs debian/git-lfs/usr/bin/
+
+override_dh_auto_test:
+	ln -s ../../../../../../commands/repos $(BUILD_DIR)/src/github.com/github/git-lfs/commands/repos
+	ln -s ../../../../bin $(BUILD_DIR)/src/github.com/github/git-lfs/bin
+	dh_auto_test
+	rm $(BUILD_DIR)/src/github.com/github/git-lfs/commands/repos $(BUILD_DIR)/src/github.com/github/git-lfs/bin

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

docs/linux-build.md

@@ -10,3 +10,10 @@ getting the right version of Ruby.
 
 Earlier versions of CentOS and Debian/Ubuntu have trouble building go, so they
 are non-starters.
+
+## Building a deb
+
+A debian package can be built by running `dpkg-buildpackage -us -uc` from the
+root of the repo.  It is currently confirmed to work on Debian jessie and
+wheezy.  On wheezy it requires `wheezy-backports` versions of `dh-golang`,
+`git`, and `golang`.