diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-15 21:51:36 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-15 21:51:36 +0100 |
| commit | 447bec8bf47f6d3c8c3c25df8999a774becce716 (patch) | |
| tree | a400807e4fd85e5adeef6300d203e8ea63ad125e /debian/patches | |
| parent | 73eaec8b7aaa02e77cd475ccfdb117e188895457 (diff) | |
| download | pkg-cgit-master.zip pkg-cgit-master.tar.gz pkg-cgit-master.tar.bz2 | |
sync debian folder with latest debian release
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/Use-debian-binary-name-rst2html | 3 | ||||
| -rw-r--r-- | debian/patches/debianize_makefile | 8 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 3 insertions, 9 deletions
diff --git a/debian/patches/Use-debian-binary-name-rst2html b/debian/patches/Use-debian-binary-name-rst2html index 90165e3..e3a74d5 100644 --- a/debian/patches/Use-debian-binary-name-rst2html +++ b/debian/patches/Use-debian-binary-name-rst2html @@ -6,12 +6,9 @@ Subject: Use debian binary name rst2html filters/html-converters/rst2html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/filters/html-converters/rst2html b/filters/html-converters/rst2html -index c51f5be..a1ba574 100755 --- a/filters/html-converters/rst2html +++ b/filters/html-converters/rst2html @@ -1,2 +1,2 @@ #!/bin/bash -exec rst2html.py --template <(echo -e "%(stylesheet)s\n%(body_pre_docinfo)s\n%(docinfo)s\n%(body)s") +exec rst2html --template <(echo -e "%(stylesheet)s\n%(body_pre_docinfo)s\n%(docinfo)s\n%(body)s") - diff --git a/debian/patches/debianize_makefile b/debian/patches/debianize_makefile index 26b8a6c..9ce235e 100644 --- a/debian/patches/debianize_makefile +++ b/debian/patches/debianize_makefile @@ -1,8 +1,6 @@ -Index: upstream/Makefile -=================================================================== ---- upstream.orig/Makefile -+++ upstream/Makefile -@@ -2,11 +2,11 @@ all:: +--- a/Makefile ++++ b/Makefile +@@ -2,11 +2,11 @@ CGIT_VERSION = v0.12 CGIT_SCRIPT_NAME = cgit.cgi diff --git a/debian/patches/series b/debian/patches/series index f7a2e72..f208344 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,7 +3,6 @@ # This is manually managed by users with dquilt (quilt(1) wrapper) etc. # Also this may be updated by dpkg-source(1) when making a package. debianize_makefile -hardening assume-highlight-version-3-in-filter-script add-highlighting-rules-to-cgit.css Use-debian-binary-name-rst2html |