From 321893890948eb3919465f42370ae7098ea3d687 Mon Sep 17 00:00:00 2001
From: Max Erenberg <>
Date: Thu, 28 Oct 2021 21:53:51 -0400
Subject: [PATCH] add suggestions from ehashman

---
 Makefile        | 10 +++++-----
 README.md       |  4 ++--
 debian/control  |  1 +
 debian/gbp.conf |  3 +++
 4 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 debian/gbp.conf

diff --git a/Makefile b/Makefile
index 6b90d74..6691905 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,21 @@
+#!/usr/bin/make -f
 SCDFILES = $(wildcard docs/*.scd)
 MANPAGES = $(patsubst docs/%.scd,docs/%,${SCDFILES})
 CEO_HOME = /var/lib/ceo
 
-all: build
-
 build: docs venv
 
 venv:
 	python3 -m venv venv && \
 	  . venv/bin/activate && \
-	  pip install -r dev-requirements.txt && \
+	  pip install setuptools wheel && \
 	  pip install -r requirements.txt && \
 	  python setup.py install
 
 install:
 	@# Prepare the virtualenv to be moved (dangerous!)
 	@# Make sure you don't have '|' in your paths
-	grep -IRl $(CURDIR)/venv venv | \
+	grep -IRl $(CURDIR)/venv venv/bin | \
 	  xargs perl -pe 's|\Q$(CURDIR)/venv\E|$(CEO_HOME)/venv|g' -i
 	mkdir -p $(DESTDIR)$(CEO_HOME)
 	mv venv $(DESTDIR)$(CEO_HOME)
@@ -29,5 +28,6 @@ docs:
 clean:
 	rm -f ${MANPAGES}
 	rm -rf venv
+	rm -rf debian/{ceo,ceod,ceo-common,tmp}
 
-.PHONY: all build docs clean venv install
+.PHONY: build docs clean venv install
diff --git a/README.md b/README.md
index 74d310e..6e40d35 100644
--- a/README.md
+++ b/README.md
@@ -239,14 +239,14 @@ Make sure you git commit your changes *before* building the packages.
 
 To build unsigned packages:
 ```sh
-gbp buildpackage --git-ignore-new --git-upstream-tree=BRANCH --git-upstream-branch=master -uc -us
+gbp buildpackage --git-upstream-branch=master -uc -us
 ```
 
 To build signed packages (for uploading), you need to have your GPG key ready, and it should also
 be in the CSC mirror keyring.
 Once you have done that, replace '-uc -us' by '-k<your_gpg_key_id>', e.g.
 ```sh
-gbp buildpackage --git-ignore-new --git-upstream-tree=BRANCH --git-upstream-branch=master -k8E5568ABB0CF96BC367806ED127923BE10DA48DC
+gbp buildpackage --git-upstream-branch=master -k8E5568ABB0CF96BC367806ED127923BE10DA48DC
 ```
 This will create a bunch of files (deb, dsc, tar.gz, etc.) in the parent directory.
 
diff --git a/debian/control b/debian/control
index b8b9844..1f7096c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Section: admin
 Priority: optional
 Standards-Version: 4.3.0
 Vcs-Git: https://git.csclub.uwaterloo.ca/public/pyceo.git
+Vcs-Browser: https://git.csclub.uwaterloo.ca/public/pyceo
 Uploaders: Max Erenberg <merenber@csclub.uwaterloo.ca>
 Build-Depends: debhelper (>= 12.1.1),
     python3-dev (>= 3.7),
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..df925e3
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,3 @@
+[buildpackage]
+ignore-new = True
+upstream-tree = BRANCH