diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2020-09-14 11:48:04 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-09-14 11:48:04 -0700 |
| commit | cb45d8df8cfff79db634e7b5f49523aa0e6e66dc (patch) | |
| tree | b03b76d3f99633383456e9544c76102b852414da | |
| parent | 34f5f0f513cdaae0342068d71f097cf1e384e1bc (diff) | |
drop patch
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/deal-with-.setup-sdist-no-longer-support.patch | 24 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 2 insertions, 25 deletions
diff --git a/debian/changelog b/debian/changelog index 957e5b77..69b226f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ propellor (5.12-1) UNRELEASED; urgency=medium * New upstream release. + * Drop Makefile patch in last upload. + Applied upstream. -- Sean Whitton <spwhitton@spwhitton.name> Mon, 14 Sep 2020 11:46:42 -0700 diff --git a/debian/patches/deal-with-.setup-sdist-no-longer-support.patch b/debian/patches/deal-with-.setup-sdist-no-longer-support.patch deleted file mode 100644 index 18be5856..00000000 --- a/debian/patches/deal-with-.setup-sdist-no-longer-support.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Sean Whitton <spwhitton@spwhitton.name> -Date: Sun, 13 Sep 2020 20:06:25 -0700 -X-Dgit-Generated: 5.11-1 c724e40103f39c0451b6d8fd207f1932037ddd8a -Subject: deal with ./Setup sdist no longer supporting output to stdout - -Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> - ---- - ---- propellor-5.11.orig/Makefile -+++ propellor-5.11/Makefile -@@ -17,7 +17,11 @@ install: - install -s dist/build/propellor/propellor $(DESTDIR)/usr/bin/propellor; \ - fi - mkdir -p gittmp -- $(CABAL) sdist -o - | (cd gittmp && tar zx --strip-components=1) -+ if [ "$(CABAL)" = ./Setup ]; then \ -+ ./Setup sdist --output-directory=gittmp; \ -+ else \ -+ $(CABAL) sdist -o - | (cd gittmp && tar zx --strip-components=1); \ -+ fi - # cabal sdist does not preserve symlinks, so copy over file - cd gittmp && for f in $$(find -type f); do rm -f $$f; cp -a ../$$f $$f; done - # reset mtime on files in git bundle so bundle is reproducible diff --git a/debian/patches/series b/debian/patches/series index 7a051d3d..7d0cb20f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 0002-dpkg-mergechangelogs.patch -deal-with-.setup-sdist-no-longer-support.patch |