Muehlenhoff has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331873 )
Change subject: Fix debian's lintian test ...................................................................... Fix debian's lintian test Change-Id: Ia7fd00f104d58bd9ff79a2705b822ce91fbd8b2a --- M debian/control M debian/copyright M debian/gerrit.init M debian/rules A debian/source/format 5 files changed, 44 insertions(+), 32 deletions(-) Approvals: Muehlenhoff: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/control b/debian/control index 1f49004..19bb127 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,13 @@ Section: net Priority: extra Maintainer: Chad Horohoe <c...@wikimedia.org> -Build-Depends: debhelper (>= 4) -Standards-Version: 1.0 +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.8 Package: gerrit Depends: openjdk-8-jre Recommends: libmysql-java Suggests: openjdk-8-jdk Architecture: all -Description: Gerrit code review system +Description: This is a code review system + Gerrit is a fork of Rietveld, another code review tool. diff --git a/debian/copyright b/debian/copyright index 2ac4b38..5246713 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,23 +1,28 @@ -This package was debianized by Ryan Lane <rl...@wikimedia.org> on -Tue, 1 May 2012 19:07:30 +0000. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Name: Gerrit +Maintainer: Chad Horohoe <c...@wikimedia.org> +Source: https://www.gerritcodereview.com +Comment: + This package was debianized by Ryan Lane <rl...@wikimedia.org> on + Tue, 1 May 2012 19:07:30 +0000. + . + It was downloaded from http://code.google.com/p/gerrit/downloads/detail?name=gerrit-2.3.war&can=2&q= -It was downloaded from http://code.google.com/p/gerrit/downloads/detail?name=gerrit-2.3.war&can=2&q= +Copyright: 2012-2017 +License: GPL-2+ -Upstream Author(s): +Files: * +Copyright: 2012-2017 Ryan Lane <rl...@wikimedia.org> +License: Apache-2.0 - +Files: debian/* +Copyright: 2012-2017 Ryan Lane <rl...@wikimedia.org> +License: GPL-2+ -Copyright: +License: Apache-2.0 + On Debian systems, the full text of the Apache-2.0 license + can be found in the file '/usr/share/common-licenses/Apache-2.0' - Copyright (C) 2012 - -License: - - Apache License v2 - -The Debian packaging is: - - Copyright (C) 2012 Ryan Lane <rl...@wikimedia.org> - -and is licensed under the GPL version 2, -see `/usr/share/common-licenses/GPL-2'. +License: GPL-2+ + On Debian systems, the full text of the GPL version 2 + can be found in the file '/usr/share/common-licenses/GPL-2' diff --git a/debian/gerrit.init b/debian/gerrit.init index 7e6f943..cb96ae8 100755 --- a/debian/gerrit.init +++ b/debian/gerrit.init @@ -500,13 +500,19 @@ $GERRIT_SH start $* ;; + force-reload) + # This will not work, please use restart instead. + # Fixes debian lintian test. + echo "Please use restart instead" + ;; + supervise) # # Under control of daemontools supervise monitor which # handles restarts and shutdowns via the svc program. # exec "$RUN_EXEC" $RUN_Arg1 "$RUN_Arg2" $RUN_Arg3 $RUN_ARGS - ;; + ;; run|daemon) echo "Running Gerrit Code Review:" diff --git a/debian/rules b/debian/rules index 8d6bd51..16817c4 100755 --- a/debian/rules +++ b/debian/rules @@ -9,10 +9,6 @@ # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 - - - - configure: configure-stamp configure-stamp: dh_testdir @@ -23,13 +19,13 @@ build: build-stamp -build-stamp: configure-stamp +build-stamp: configure-stamp dh_testdir # Add here commands to compile the package. touch $@ -clean: +clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp @@ -37,12 +33,12 @@ # Add here commands to clean up after the build process. rm -rf build - dh_clean + dh_clean install: build dh_testdir dh_testroot - #dh_prep + #dh_prep dh_installdirs # Build architecture-independent files here. @@ -55,8 +51,8 @@ binary-arch: install dh_testdir dh_testroot -# dh_installchangelogs -# dh_installdocs + dh_installchangelogs + dh_installdocs # dh_installexamples dh_install # dh_installmenu @@ -84,3 +80,6 @@ binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure + +get-orig-source: + uscan --download-current-version --force-download --rename diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- To view, visit https://gerrit.wikimedia.org/r/331873 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia7fd00f104d58bd9ff79a2705b822ce91fbd8b2a Gerrit-PatchSet: 44 Gerrit-Project: operations/debs/gerrit Gerrit-Branch: master Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com> Gerrit-Reviewer: Chad <ch...@wikimedia.org> Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org> Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com> Gerrit-Reviewer: Ryan Lane <r...@ryandlane.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
