new versionHEADmaster

sync debian folder with latest debian release

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

7 files changed, 12 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index a42ef6a..46a39bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cgit (0.12.0.git2.7.2-1~bpo80+1) jessie-add; urgency=medium
+
+  * new version directly from master branch
+  * synced debian folder with latest debian package
+
+ -- Wolfgang Wiedmeyer <debian@fossencdi.org>  Tue, 15 Mar 2016 21:04:44 +0100
+
 cgit (0.12.0.git2.7.0-1) jessie-add; urgency=medium
 
   * upstream version from master
diff --git a/debian/control b/debian/control
index a045a91..397cb31 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: asciidoc,
                tidy,
                unzip,
                xmlto
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Homepage: http://git.zx2c4.com/cgit/
 
 Package: cgit
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
diff --git a/debian/rules b/debian/rules
index a40954e..e19a8d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 # see ENVIRONMENT in dpkg-buildflags(1)
 # package maintainers to append CFLAGS
-export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+export DEB_CFLAGS_MAINT_APPEND  = -Wall
 # package maintainers to append LDFLAGS
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 0b80211..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,3 +0,0 @@
-#### Uncomment to active options. See dpkg-source(1)
-#abort-on-upstream-changes
-#unapply-patches