summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2016-01-13 00:15:40 +0100
committerChristian Pointner <equinox@spreadspace.org>2016-01-13 00:15:40 +0100
commit15fb83fde9411e5f2c3694fd0a2f7023ce12231c (patch)
tree7944e282d2c3f8b852acad8ab62949dc4a4aed8c
parentfixed systemd service file handling (diff)
imported patch to allow dashes in package names
-rw-r--r--debian/changelog10
-rw-r--r--debian/patches/allow-dashes-in-repository-names.patch13
-rw-r--r--debian/patches/series1
3 files changed, 23 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index fc4c587..67624f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,12 @@
-vanity (0.1.1-2) UNRELEASED; urgency=medium
+vanity (0.1.1-3) UNRELEASED; urgency=medium
+
+ * package now actually builds from source
+ * fixed systemd service file handling
+ * added patch to allow dashes in package names
+
+ -- Christian Pointner <equinox@spreadspace.org> Wed, 13 Jan 2016 00:03:24 +0100
+
+vanity (0.1.1-2) unstable; urgency=medium
* create special user for vanity
diff --git a/debian/patches/allow-dashes-in-repository-names.patch b/debian/patches/allow-dashes-in-repository-names.patch
new file mode 100644
index 0000000..9fe5994
--- /dev/null
+++ b/debian/patches/allow-dashes-in-repository-names.patch
@@ -0,0 +1,13 @@
+This allows '-' for package names
+see: https://github.com/xiam/vanity/pull/6
+--- a/main.go
++++ b/main.go
+@@ -24,7 +24,7 @@
+ repoRootFlag = flag.String("repo-root", "", "Git repository root URL (e.g.: https://github.com/upper).")
+ )
+
+-var packagePattern = regexp.MustCompile(`^/([a-zA-Z0-9]+)\.?(v[1-9][0-9]*)?(.*)$`)
++var packagePattern = regexp.MustCompile(`^/([-a-zA-Z0-9]+)\.?(v[1-9][0-9]*)?(.*)$`)
+
+ var httpClient = &http.Client{Timeout: 10 * time.Second}
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f599fcd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+allow-dashes-in-repository-names.patch