[Pkg-cgit-commits] [pkg-cgit] 03/18: Update patch headers to conform to DEP-3

Peter Colberg peter at colberg.org
Thu Jun 16 01:59:54 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 571079b62c947ed55bd1ee17e938340947fa388b
Author: Peter Colberg <peter at colberg.org>
Date:   Fri Jun 10 07:19:28 2016 -0400

    Update patch headers to conform to DEP-3
---
 debian/patches/add-hardening.patch                          | 13 +++++++++++++
 ...to-cgit.css => add-highlighting-rules-to-cgit.css.patch} | 13 +++++--------
 ...pt => assume-highlight-version-3-in-filter-script.patch} | 11 ++++-------
 .../{debianize_makefile => debianize-makefile.patch}        |  7 ++++++-
 debian/patches/hardening                                    | 13 -------------
 debian/patches/series                                       |  8 ++++----
 ...-name-rst2html => use-debian-binary-name-rst2html.patch} | 11 ++++-------
 7 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/debian/patches/add-hardening.patch b/debian/patches/add-hardening.patch
new file mode 100644
index 0000000..11b324d
--- /dev/null
+++ b/debian/patches/add-hardening.patch
@@ -0,0 +1,13 @@
+Description: Add hardening
+Author: Alexander Wirt <formorer at debian.org>
+Last-Update: 2014-08-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- /dev/null
++++ b/cgit.conf
+@@ -0,0 +1,5 @@
++CC = gcc
++CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
++CFLAGS := -Wall $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
++CGIT_CFLAGS := -Wall $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
++LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
diff --git a/debian/patches/add-highlighting-rules-to-cgit.css b/debian/patches/add-highlighting-rules-to-cgit.css.patch
similarity index 79%
rename from debian/patches/add-highlighting-rules-to-cgit.css
rename to debian/patches/add-highlighting-rules-to-cgit.css.patch
index 087e035..60d609c 100644
--- a/debian/patches/add-highlighting-rules-to-cgit.css
+++ b/debian/patches/add-highlighting-rules-to-cgit.css.patch
@@ -1,14 +1,11 @@
-From: =?UTF-8?q?Stefan=20B=C3=BChler?= <stbuehler at web.de>
-Date: Wed, 29 May 2013 11:23:53 +0200
-Subject: add highlighting rules to cgit.css
-
+Description: add highlighting rules to cgit.css
+Author: Stefan Bühler <stbuehler at web.de>
+Last-Update: 2013-05-29
 ---
- cgit.css |   17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/cgit.css
 +++ b/cgit.css
-@@ -809,3 +809,20 @@
+@@ -815,3 +815,20 @@
  div#cgit table.ssdiff td.space div {
  	min-height: 3em;
  }
diff --git a/debian/patches/assume-highlight-version-3-in-filter-script b/debian/patches/assume-highlight-version-3-in-filter-script.patch
similarity index 64%
rename from debian/patches/assume-highlight-version-3-in-filter-script
rename to debian/patches/assume-highlight-version-3-in-filter-script.patch
index 4f0e4b1..4eaaee7 100644
--- a/debian/patches/assume-highlight-version-3-in-filter-script
+++ b/debian/patches/assume-highlight-version-3-in-filter-script.patch
@@ -1,11 +1,8 @@
-From: =?UTF-8?q?Stefan=20B=C3=BChler?= <stbuehler at web.de>
-Date: Fri, 10 May 2013 09:53:00 +0200
-Subject: assume highlight version 3 in filter script
-
+Description: assume highlight version 3 in filter script
+Author: Stefan Bühler <stbuehler at web.de>
+Last-Update: 2013-05-10
 ---
- filters/syntax-highlighting.sh |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/filters/syntax-highlighting.sh
 +++ b/filters/syntax-highlighting.sh
 @@ -115,7 +115,7 @@
diff --git a/debian/patches/debianize_makefile b/debian/patches/debianize-makefile.patch
similarity index 66%
rename from debian/patches/debianize_makefile
rename to debian/patches/debianize-makefile.patch
index 9ce235e..dc31a1b 100644
--- a/debian/patches/debianize_makefile
+++ b/debian/patches/debianize-makefile.patch
@@ -1,8 +1,13 @@
+Description: debianize makefile
+Author: Alexander Wirt <formorer at debian.org>
+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 = v0.12
+ CGIT_VERSION = v1.0
  CGIT_SCRIPT_NAME = cgit.cgi
 -CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 +CGIT_SCRIPT_PATH = /usr/share/cgit
diff --git a/debian/patches/hardening b/debian/patches/hardening
deleted file mode 100644
index da26ced..0000000
--- a/debian/patches/hardening
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Add hardening
- Add hardening to cgit.
-Author: Alexander Wirt <formorer at debian.org>
-
---- /dev/null
-+++ cgit-0.10.2.git2.0.1/cgit.conf
-@@ -0,0 +1,6 @@
-+CC =gcc
-+CPPFLAGS :=$(shell dpkg-buildflags --get CPPFLAGS)
-+CFLAGS :=-Wall $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
-+CGIT_CFLAGS :=-Wall $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
-+LDFLAGS :=$(shell dpkg-buildflags --get LDFLAGS)
-+
diff --git a/debian/patches/series b/debian/patches/series
index f208344..cf00ccd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,7 @@
 # are applied to the upstream source in the order listed below.
 # 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
-assume-highlight-version-3-in-filter-script
-add-highlighting-rules-to-cgit.css
-Use-debian-binary-name-rst2html
+debianize-makefile.patch
+assume-highlight-version-3-in-filter-script.patch
+add-highlighting-rules-to-cgit.css.patch
+use-debian-binary-name-rst2html.patch
diff --git a/debian/patches/Use-debian-binary-name-rst2html b/debian/patches/use-debian-binary-name-rst2html.patch
similarity index 57%
rename from debian/patches/Use-debian-binary-name-rst2html
rename to debian/patches/use-debian-binary-name-rst2html.patch
index e3a74d5..c4f991c 100644
--- a/debian/patches/Use-debian-binary-name-rst2html
+++ b/debian/patches/use-debian-binary-name-rst2html.patch
@@ -1,11 +1,8 @@
-From: =?UTF-8?q?Stefan=20B=C3=BChler?= <stbuehler at web.de>
-Date: Wed, 29 May 2013 14:34:15 +0200
-Subject: Use debian binary name rst2html
-
+Description: Use debian binary name rst2html
+Author: Stefan Bühler <stbuehler at web.de>
+Last-Update: 2013-05-29
 ---
- filters/html-converters/rst2html |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/filters/html-converters/rst2html
 +++ b/filters/html-converters/rst2html
 @@ -1,2 +1,2 @@

-- 
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