[Pkg-cgit-commits] [pkg-cgit] 03/04: Drop patches applied upstream

Peter Colberg peter at colberg.org
Wed Nov 23 17:04:50 UTC 2016 

This is an automated email from the git hooks/post-receive script.

pc-guest pushed a commit to branch master
in repository pkg-cgit.

commit 49c04c5fbb055526f8511eab74606c2e5ef31ffb
Author: Peter Colberg <peter at colberg.org>
Date:   Wed Nov 23 07:43:57 2016 -0500

    Drop patches applied upstream
---
 .../add-highlighting-rules-to-cgit.css.patch       |  2 +-
 debian/patches/debianize-makefile.patch            | 12 ++--------
 debian/patches/fix-spelling-in-man-page.patch      | 25 -------------------
 debian/patches/fix-spelling-of-occurred.patch      | 28 ----------------------
 debian/patches/link-with-ldl-on-gnu-kfreebsd.patch | 18 --------------
 debian/patches/series                              |  4 ----
 debian/patches/use-python3-in-md2html.patch        | 10 --------
 7 files changed, 3 insertions(+), 96 deletions(-)

diff --git a/debian/patches/add-highlighting-rules-to-cgit.css.patch b/debian/patches/add-highlighting-rules-to-cgit.css.patch
index 60d609c..9b10efa 100644
--- a/debian/patches/add-highlighting-rules-to-cgit.css.patch
+++ b/debian/patches/add-highlighting-rules-to-cgit.css.patch
@@ -5,7 +5,7 @@ Last-Update: 2013-05-29
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/cgit.css
 +++ b/cgit.css
-@@ -815,3 +815,20 @@
+@@ -850,3 +850,20 @@
  div#cgit table.ssdiff td.space div {
  	min-height: 3em;
  }
diff --git a/debian/patches/debianize-makefile.patch b/debian/patches/debianize-makefile.patch
index dc31a1b..d585a07 100644
--- a/debian/patches/debianize-makefile.patch
+++ b/debian/patches/debianize-makefile.patch
@@ -5,17 +5,9 @@ Last-Update: 2014-07-20
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/Makefile
 +++ b/Makefile
-@@ -2,11 +2,11 @@
- 
- CGIT_VERSION = v1.0
- CGIT_SCRIPT_NAME = cgit.cgi
+@@ -5 +5 @@
 -CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 +CGIT_SCRIPT_PATH = /usr/share/cgit
- CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
- CGIT_CONFIG = /etc/cgitrc
- CACHE_ROOT = /var/cache/cgit
+@@ -9 +9 @@
 -prefix = /usr/local
 +prefix = /usr
- libdir = $(prefix)/lib
- filterdir = $(libdir)/cgit/filters
- docdir = $(prefix)/share/doc/cgit
diff --git a/debian/patches/fix-spelling-in-man-page.patch b/debian/patches/fix-spelling-in-man-page.patch
deleted file mode 100644
index 908a3df..0000000
--- a/debian/patches/fix-spelling-in-man-page.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix spelling in man page
-Author: Peter Colberg <peter at colberg.org>
-Forwarded: https://lists.zx2c4.com/pipermail/cgit/2016-June/003093.html
-Last-Update: 2016-06-10
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/cgitrc.5.txt
-+++ b/cgitrc.5.txt
-@@ -676,14 +676,14 @@
- 	expected on standard output.
- 
- email filter::
--	This filter is given two parameters: the email address of the relevent
-+	This filter is given two parameters: the email address of the relevant
- 	author and a string indicating the originating page. The filter will
- 	then receive the text string to format on standard input and is
- 	expected to write to standard output the formatted text to be included
- 	in the page.
- 
- owner filter::
--	This filter is given no arguments.  The owner text is avilable on
-+	This filter is given no arguments.  The owner text is available on
- 	standard input and the filter is expected to write to standard
- 	output.  The output is included in the Owner column.
- 
diff --git a/debian/patches/fix-spelling-of-occurred.patch b/debian/patches/fix-spelling-of-occurred.patch
deleted file mode 100644
index 50bfefc..0000000
--- a/debian/patches/fix-spelling-of-occurred.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Fix spelling of "occurred"
-Author: Peter Colberg <peter at colberg.org>
-Forwarded: https://marc.info/?l=git&m=146556912105322&w=2
-Last-Update: 2016-06-10
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/git/config.c
-+++ b/git/config.c
-@@ -1274,7 +1274,7 @@
- 		 * something went really wrong and we should stop
- 		 * immediately.
- 		 */
--		die(_("unknown error occured while reading the configuration files"));
-+		die(_("unknown error occurred while reading the configuration files"));
- }
- 
- static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)
---- a/git/refs.h
-+++ b/git/refs.h
-@@ -345,7 +345,7 @@
-  *     msg -- a message describing the change (for the reflog).
-  *
-  *     err -- a strbuf for receiving a description of any error that
-- *         might have occured.
-+ *         might have occurred.
-  *
-  * The functions make internal copies of refname and msg, so the
-  * caller retains ownership of these parameters.
diff --git a/debian/patches/link-with-ldl-on-gnu-kfreebsd.patch b/debian/patches/link-with-ldl-on-gnu-kfreebsd.patch
deleted file mode 100644
index 5e5f5f5..0000000
--- a/debian/patches/link-with-ldl-on-gnu-kfreebsd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Link with -ldl on GNU/kFreeBSD
- GNU/kFreeBSD uses the FreeBSD kernel with the GNU C library.
-Author: Peter Colberg <peter at colberg.org>
-Forwarded: https://lists.zx2c4.com/pipermail/cgit/2016-June/003099.html
-Last-Update: 2016-06-19
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/cgit.mk
-+++ b/cgit.mk
-@@ -54,7 +54,7 @@
- endif
- 
- # Add -ldl to linker flags on non-BSD systems.
--ifeq ($(findstring BSD,$(uname_S)),)
-+ifeq (,$(filter $(uname_S),DragonFly FreeBSD NetBSD OpenBSD))
- 	CGIT_LIBS += -ldl
- endif
- 
diff --git a/debian/patches/series b/debian/patches/series
index 7034bd0..abf4fa9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,8 +7,4 @@ add-hardening.patch
 assume-highlight-version-3-in-filter-script.patch
 add-highlighting-rules-to-cgit.css.patch
 use-debian-binary-name-rst2html.patch
-fix-spelling-in-man-page.patch
-fix-spelling-of-occurred.patch
-use-python3-in-md2html.patch
-link-with-ldl-on-gnu-kfreebsd.patch
 syntax-highlighting.patch
diff --git a/debian/patches/use-python3-in-md2html.patch b/debian/patches/use-python3-in-md2html.patch
deleted file mode 100644
index fdf5905..0000000
--- a/debian/patches/use-python3-in-md2html.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Description: Use python3 in md2html
-Author: Peter Colberg <peter at colberg.org>
-Last-Update: 2016-06-19
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/filters/html-converters/md2html
-+++ b/filters/html-converters/md2html
-@@ -1 +1 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cgit/pkg-cgit.git

More information about the Pkg-cgit-commits mailing list