[MediaWiki-commits] [Gerrit] operations...tools-manifest[master]: Generate man page for collector-runner

2017-02-06 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/336057 )

Change subject: Generate man page for collector-runner
..


Generate man page for collector-runner

Bug: T156651
Change-Id: I1df500f9101448f68e1558bd0eff0843e31ac377
---
M debian/changelog
M debian/control
M debian/rules
3 files changed, 19 insertions(+), 2 deletions(-)

Approvals:
  Tim Landscheidt: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/debian/changelog b/debian/changelog
index 41571ed..4b2122f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@
 
   * Correct weekday in changelog entry
   * Add extended description to control
+  * Generate man page for collector-runner
 
- -- Tim Landscheidt   Sun, 05 Feb 2017 06:20:38 +
+ -- Tim Landscheidt   Sun, 05 Feb 2017 06:33:23 +
 
 tools-manifest (0.10) trusty; urgency=low
 
diff --git a/debian/control b/debian/control
index ecbeea5..5f46fe6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@
 Maintainer: Yuvi Panda 
 Section: python
 Priority: optional
-Build-Depends: python3-setuptools, python3-all, debhelper (>= 9)
+Build-Depends: debhelper (>= 9), help2man, python3-setuptools,
+ python3-all
 Standards-Version: 3.9.5
 
 Package: tools-manifest
diff --git a/debian/rules b/debian/rules
index 7c58135..05287db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,22 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/pkg-info.mk
+
 %:
dh $@ --with python3 --buildsystem=pybuild
 
+collector-runner.1:
+   PYTHONPATH=${CURDIR} help2man --no-info \
+   --version-string="${DEB_VERSION}" -o $@ \
+   -n 'collect manifests and perform operations on them'   \
+   $(CURDIR)/debian/tools-manifest/usr/bin/collector-runner
+
+override_dh_installman: collector-runner.1
+   dh_installman collector-runner.1
+
+override_dh_clean:
+   rm -f collector-runner.1
+   dh_clean
+
 override_dh_installinit:
dh_installinit --name=webservicemonitor

-- 
To view, visit https://gerrit.wikimedia.org/r/336057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1df500f9101448f68e1558bd0eff0843e31ac377
Gerrit-PatchSet: 7
Gerrit-Project: operations/software/tools-manifest
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Tim Landscheidt 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...tools-manifest[master]: Generate man page for collector-runner

2017-02-04 Thread Tim Landscheidt (Code Review) 
Tim Landscheidt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/336057 )

Change subject: Generate man page for collector-runner
..

Generate man page for collector-runner

Bug: T156651
Change-Id: I1df500f9101448f68e1558bd0eff0843e31ac377
---
M debian/changelog
M debian/control
M debian/rules
3 files changed, 19 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/tools-manifest 
refs/changes/57/336057/1

diff --git a/debian/changelog b/debian/changelog
index 41571ed..4b2122f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@
 
   * Correct weekday in changelog entry
   * Add extended description to control
+  * Generate man page for collector-runner
 
- -- Tim Landscheidt   Sun, 05 Feb 2017 06:20:38 +
+ -- Tim Landscheidt   Sun, 05 Feb 2017 06:33:23 +
 
 tools-manifest (0.10) trusty; urgency=low
 
diff --git a/debian/control b/debian/control
index 256cc26..0e92b15 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@
 Maintainer: Yuvi Panda 
 Section: python
 Priority: optional
-Build-Depends: python3-setuptools, python3-all, debhelper (>= 9)
+Build-Depends: debhelper (>= 9), help2man, python3-setuptools,
+ python3-all
 Standards-Version: 3.9.5
 
 Package: tools-manifest
diff --git a/debian/rules b/debian/rules
index 7c58135..371c0c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,22 @@
 #!/usr/bin/make -f
 
+DEB_VERSION=$(shell dpkg-parsechangelog | sed -rne \
+'s,^Version: ([^-]+).*,\1,p')
+
 %:
dh $@ --with python3 --buildsystem=pybuild
 
+collector-runner.1:
+   PYTHONPATH=${CURDIR} help2man --no-info \
+   --version-string="${DEB_VERSION}" -o $@ \
+   $(CURDIR)/debian/tools-manifest/usr/bin/collector-runner
+
+override_dh_installman: collector-runner.1
+   dh_installman collector-runner.1
+
+clean:
+   rm -f collector-runner.1
+   dh $@ --with python3 --buildsystem=pybuild
+
 override_dh_installinit:
dh_installinit --name=webservicemonitor

-- 
To view, visit https://gerrit.wikimedia.org/r/336057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1df500f9101448f68e1558bd0eff0843e31ac377
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/tools-manifest
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits