[med-svn] r13349 - in trunk/packages/qrisk2/trunk/debian: . patches source
Thorsten Alteholz
alteholz at alioth.debian.org
Thu Apr 18 17:36:11 UTC 2013
Author: alteholz
Date: 2013-04-18 17:36:11 +0000 (Thu, 18 Apr 2013)
New Revision: 13349
Added:
trunk/packages/qrisk2/trunk/debian/Q68_qrisk2_2012_1_0_commandLine.1
trunk/packages/qrisk2/trunk/debian/Q68_qrisk2_2012_1_0_qriskAge.1
trunk/packages/qrisk2/trunk/debian/Q68_qrisk2_2012_1_1_commandLine.1
trunk/packages/qrisk2/trunk/debian/Q68_qrisk2_2012_1_1_qriskAge.1
trunk/packages/qrisk2/trunk/debian/get-orig-source
trunk/packages/qrisk2/trunk/debian/patches/
trunk/packages/qrisk2/trunk/debian/patches/hardening-flags.patch
trunk/packages/qrisk2/trunk/debian/patches/series
trunk/packages/qrisk2/trunk/debian/qrisk2.install
trunk/packages/qrisk2/trunk/debian/qrisk2.lintian-overrides
trunk/packages/qrisk2/trunk/debian/qrisk2.manpages
trunk/packages/qrisk2/trunk/debian/source/
trunk/packages/qrisk2/trunk/debian/source/format
trunk/packages/qrisk2/trunk/debian/watch
Modified:
trunk/packages/qrisk2/trunk/debian/
trunk/packages/qrisk2/trunk/debian/changelog
trunk/packages/qrisk2/trunk/debian/control
trunk/packages/qrisk2/trunk/debian/copyright
trunk/packages/qrisk2/trunk/debian/rules
Log:
initial version of qrisk2
Property changes on: trunk/packages/qrisk2/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: trunk/packages/qrisk2/trunk/debian/Q68_qrisk2_2012_1_0_commandLine.1
===================================================================
--- trunk/packages/qrisk2/trunk/debian/Q68_qrisk2_2012_1_0_commandLine.1 (rev 0)
+++ trunk/packages/qrisk2/trunk/debian/Q68_qrisk2_2012_1_0_commandLine.1 2013-04-18 17:36:11 UTC (rev 13349)
@@ -0,0 +1,65 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.41.2.
+.TH Q68_QRISK2_2012_1_0_COMMANDLINE "1" "April 2013" "Q68_qrisk2_2012_1_0_commandLine * Copyright 2012 ClinRisk Ltd." "User Commands"
+.SH NAME
+Q68_qrisk2_2012_1_0_commandLine \- female version of 2012 risk analysis
+.SS "Usage:"
+.IP
+Q68_qrisk2_2012_1_0_commandLine age b_AF b_ra b_renal b_treatedhyp b_type2 bmi ethrisk fh_cvd rati sbp smoke_cat surv town
+.TP
+\fBage\fR age of person (30..84)
+.TP
+\fBb_AF\fR Atrial fibrillation (0..1)
+.TP
+\fBb_ra\fR Rheumatoid arthritis (0..1)
+.TP
+\fBb_renal\fR
+.TP
+\fBb_treatedhyp\fR On blood pressure treatment (0..1)
+.TP
+\fBb_type2\fR Diabetic (0..1)
+.TP
+\fBbmi\fR Body Mass Index (20..40)
+.TP
+\fBethrisk\fR Ethnicity
+.IP
+\fB1\fR white or not stated
+.IP
+\fB2\fR Indian
+.IP
+\fB3\fR Pakistani
+.IP
+\fB4\fR Bangladeshi
+.IP
+\fB5\fR Other Asian
+.IP
+\fB6\fR Black Caribbean
+.IP
+\fB7\fR Black African
+.IP
+\fB8\fR Chinese
+.IP
+\fB9\fR Other ethnic group
+.TP
+\fBfh_cvd\fR
+.TP
+\fBrati\fR Cholesterol/HDL ratio (1..12)
+.TP
+\fBsbp\fR Systolic blood pressure (mmHg) (70..210)
+.TP
+\fBsmoke_cat\fR Smoking status (0..4)
+.IP
+\fB0\fR non smoker
+.IP
+\fB1\fR ex smoker
+.IP
+\fB2\fR light smoker (<10)
+.IP
+\fB3\fR moderate smoker (10..19)
+.IP
+\fB4\fR heavy smoker >=20
+.TP
+\fBsurv\fR
+.TP
+\fBtown\fR UK postcode
+
+.IP
Added: trunk/packages/qrisk2/trunk/debian/Q68_qrisk2_2012_1_0_qriskAge.1
===================================================================
--- trunk/packages/qrisk2/trunk/debian/Q68_qrisk2_2012_1_0_qriskAge.1 (rev 0)
+++ trunk/packages/qrisk2/trunk/debian/Q68_qrisk2_2012_1_0_qriskAge.1 2013-04-18 17:36:11 UTC (rev 13349)
@@ -0,0 +1,65 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.41.2.
+.TH Q68_QRISK2_2012_1_0_QRISKAGE "1" "April 2013" "Q68_qrisk2_2012_1_0_qriskAge * Copyright 2012 ClinRisk Ltd." "User Commands"
+.SH NAME
+Q68_qrisk2_2012_1_0_qriskAge \- female version of 2012 risk age
+.SS "Usage:"
+.IP
+Q68_qrisk2_2012_1_0_qriskAge age b_AF b_ra b_renal b_treatedhyp b_type2 bmi ethrisk fh_cvd rati sbp smoke_cat surv town
+.TP
+\fBage\fR age of person (30..84)
+.TP
+\fBb_AF\fR Atrial fibrillation (0..1)
+.TP
+\fBb_ra\fR Rheumatoid arthritis (0..1)
+.TP
+\fBb_renal\fR
+.TP
+\fBb_treatedhyp\fR On blood pressure treatment (0..1)
+.TP
+\fBb_type2\fR Diabetic (0..1)
+.TP
+\fBbmi\fR Body Mass Index (20..40)
+.TP
+\fBethrisk\fR Ethnicity
+.IP
+\fB1\fR white or not stated
+.IP
+\fB2\fR Indian
+.IP
+\fB3\fR Pakistani
+.IP
+\fB4\fR Bangladeshi
+.IP
+\fB5\fR Other Asian
+.IP
+\fB6\fR Black Caribbean
+.IP
+\fB7\fR Black African
+.IP
+\fB8\fR Chinese
+.IP
+\fB9\fR Other ethnic group
+.TP
+\fBfh_cvd\fR
+.TP
+\fBrati\fR Cholesterol/HDL ratio (1..12)
+.TP
+\fBsbp\fR Systolic blood pressure (mmHg) (70..210)
+.TP
+\fBsmoke_cat\fR Smoking status (0..4)
+.IP
+\fB0\fR non smoker
+.IP
+\fB1\fR ex smoker
+.IP
+\fB2\fR light smoker (<10)
+.IP
+\fB3\fR moderate smoker (10..19)
+.IP
+\fB4\fR heavy smoker >=20
+.TP
+\fBsurv\fR
+.TP
+\fBtown\fR UK postcode
+
+.IP
Added: trunk/packages/qrisk2/trunk/debian/Q68_qrisk2_2012_1_1_commandLine.1
===================================================================
--- trunk/packages/qrisk2/trunk/debian/Q68_qrisk2_2012_1_1_commandLine.1 (rev 0)
+++ trunk/packages/qrisk2/trunk/debian/Q68_qrisk2_2012_1_1_commandLine.1 2013-04-18 17:36:11 UTC (rev 13349)
@@ -0,0 +1,65 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.41.2.
+.TH Q68_QRISK2_2012_1_1_COMMANDLINE "1" "April 2013" "Q68_qrisk2_2012_1_1_commandLine * Copyright 2012 ClinRisk Ltd." "User Commands"
+.SH NAME
+Q68_qrisk2_2012_1_1_commandLine \- male version of 2012 risk analysis
+.SS "Usage:"
+.IP
+Q68_qrisk2_2012_1_1_commandLine age b_AF b_ra b_renal b_treatedhyp b_type2 bmi ethrisk fh_cvd rati sbp smoke_cat surv town
+.TP
+\fBage\fR age of person (30..84)
+.TP
+\fBb_AF\fR Atrial fibrillation (0..1)
+.TP
+\fBb_ra\fR Rheumatoid arthritis (0..1)
+.TP
+\fBb_renal\fR
+.TP
+\fBb_treatedhyp\fR On blood pressure treatment (0..1)
+.TP
+\fBb_type2\fR Diabetic (0..1)
+.TP
+\fBbmi\fR Body Mass Index (20..40)
+.TP
+\fBethrisk\fR Ethnicity
+.IP
+\fB1\fR white or not stated
+.IP
+\fB2\fR Indian
+.IP
+\fB3\fR Pakistani
+.IP
+\fB4\fR Bangladeshi
+.IP
+\fB5\fR Other Asian
+.IP
+\fB6\fR Black Caribbean
+.IP
+\fB7\fR Black African
+.IP
+\fB8\fR Chinese
+.IP
+\fB9\fR Other ethnic group
+.TP
+\fBfh_cvd\fR
+.TP
+\fBrati\fR Cholesterol/HDL ratio (1..12)
+.TP
+\fBsbp\fR Systolic blood pressure (mmHg) (70..210)
+.TP
+\fBsmoke_cat\fR Smoking status (0..4)
+.IP
+\fB0\fR non smoker
+.IP
+\fB1\fR ex smoker
+.IP
+\fB2\fR light smoker (<10)
+.IP
+\fB3\fR moderate smoker (10..19)
+.IP
+\fB4\fR heavy smoker >=20
+.TP
+\fBsurv\fR
+.TP
+\fBtown\fR UK postcode
+
+.IP
Added: trunk/packages/qrisk2/trunk/debian/Q68_qrisk2_2012_1_1_qriskAge.1
===================================================================
--- trunk/packages/qrisk2/trunk/debian/Q68_qrisk2_2012_1_1_qriskAge.1 (rev 0)
+++ trunk/packages/qrisk2/trunk/debian/Q68_qrisk2_2012_1_1_qriskAge.1 2013-04-18 17:36:11 UTC (rev 13349)
@@ -0,0 +1,65 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.41.2.
+.TH Q68_QRISK2_2012_1_1_QRISKAGE "1" "April 2013" "Q68_qrisk2_2012_1_1_qriskAge * Copyright 2012 ClinRisk Ltd." "User Commands"
+.SH NAME
+Q68_qrisk2_2012_1_1_qriskAge \- male version of 2012 risk age
+.SS "Usage:"
+.IP
+Q68_qrisk2_2012_1_1_qriskAge age b_AF b_ra b_renal b_treatedhyp b_type2 bmi ethrisk fh_cvd rati sbp smoke_cat surv town
+.TP
+\fBage\fR age of person (30..84)
+.TP
+\fBb_AF\fR Atrial fibrillation (0..1)
+.TP
+\fBb_ra\fR Rheumatoid arthritis (0..1)
+.TP
+\fBb_renal\fR
+.TP
+\fBb_treatedhyp\fR On blood pressure treatment (0..1)
+.TP
+\fBb_type2\fR Diabetic (0..1)
+.TP
+\fBbmi\fR Body Mass Index (20..40)
+.TP
+\fBethrisk\fR Ethnicity
+.IP
+\fB1\fR white or not stated
+.IP
+\fB2\fR Indian
+.IP
+\fB3\fR Pakistani
+.IP
+\fB4\fR Bangladeshi
+.IP
+\fB5\fR Other Asian
+.IP
+\fB6\fR Black Caribbean
+.IP
+\fB7\fR Black African
+.IP
+\fB8\fR Chinese
+.IP
+\fB9\fR Other ethnic group
+.TP
+\fBfh_cvd\fR
+.TP
+\fBrati\fR Cholesterol/HDL ratio (1..12)
+.TP
+\fBsbp\fR Systolic blood pressure (mmHg) (70..210)
+.TP
+\fBsmoke_cat\fR Smoking status (0..4)
+.IP
+\fB0\fR non smoker
+.IP
+\fB1\fR ex smoker
+.IP
+\fB2\fR light smoker (<10)
+.IP
+\fB3\fR moderate smoker (10..19)
+.IP
+\fB4\fR heavy smoker >=20
+.TP
+\fBsurv\fR
+.TP
+\fBtown\fR UK postcode
+
+.IP
Modified: trunk/packages/qrisk2/trunk/debian/changelog
===================================================================
--- trunk/packages/qrisk2/trunk/debian/changelog 2013-04-18 09:56:32 UTC (rev 13348)
+++ trunk/packages/qrisk2/trunk/debian/changelog 2013-04-18 17:36:11 UTC (rev 13349)
@@ -1,5 +1,7 @@
-qrisk2 (0.0.r27-1) unstable; urgency=low
+qrisk2 (0.0.r30-1) unstable; urgency=low
- * Initial release
+ * Initial release (Closes: #705694)
+ Part of packaging has been done by Andreas Tille
- -- Andreas Tille <tille at debian.org> Thu, 07 Jun 2012 13:16:01 +0200
+ -- Thorsten Alteholz <debian at alteholz.de> Thu, 18 Apr 2013 18:00:00 +0200
+
Modified: trunk/packages/qrisk2/trunk/debian/control
===================================================================
--- trunk/packages/qrisk2/trunk/debian/control 2013-04-18 09:56:32 UTC (rev 13348)
+++ trunk/packages/qrisk2/trunk/debian/control 2013-04-18 17:36:11 UTC (rev 13349)
@@ -2,10 +2,11 @@
Section: science
Priority: optional
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-DM-Upload-Allowed: yes
-Uploaders: Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.3
+Uploaders: Andreas Tille <tille at debian.org>,
+ Thorsten Alteholz <debian at alteholz.de>
+Build-Depends: debhelper (>= 9),
+ xutils-dev
+Standards-Version: 3.9.4
Homepage: http://qrisk.org/
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/qrisk2/trunk/
Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/qrisk2/trunk/
Modified: trunk/packages/qrisk2/trunk/debian/copyright
===================================================================
--- trunk/packages/qrisk2/trunk/debian/copyright 2013-04-18 09:56:32 UTC (rev 13348)
+++ trunk/packages/qrisk2/trunk/debian/copyright 2013-04-18 17:36:11 UTC (rev 13349)
@@ -8,4 +8,10 @@
Files: debian/*
Copyright: © 2012 Andreas Tille <tille at debian.org>
+ © 2013 Thorsten Alteholz <debian at alteholz.de>
License: LGPLv3
+
+License: LGPLv3
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License version 3 can be found in "/usr/share/common-licenses/LGPL-3".
+
Added: trunk/packages/qrisk2/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/qrisk2/trunk/debian/get-orig-source (rev 0)
+++ trunk/packages/qrisk2/trunk/debian/get-orig-source 2013-04-18 17:36:11 UTC (rev 13349)
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+PACKAGE=qrisk2
+PACKAGEVERSION=`dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*$/\1/p'`
+declare -i CHANGELOGREVISION=`echo ${PACKAGEVERSION}|awk -F"." '{print $3}'|awk -F"-" '{print $1}'|sed "s/r//g"`
+declare -i SVNREVISION=`svn info http://svn.clinrisk.co.uk/opensource/qrisk2|grep "Revision:"|awk '{print $2}'`
+
+echo "I: package version: ${PACKAGEVERSION}"
+echo "I: version from changelog: ${CHANGELOGREVISION}"
+echo "I: version from repository: ${SVNREVISION}"
+
+FOLDER=${PACKAGE}_${PACKAGEVERSION}
+TARFILE=${FOLDER}.orig.tar.gz
+NEWFOLDER=${PACKAGE}_`echo ${PACKAGEVERSION}|sed "s/${CHANGELOGREVISION}/${SVNREVISION}/g"`
+NEWTARFILE=${NEWFOLDER}.orig.tar.gz
+
+mkdir -p ../tarballs
+cd ../tarballs
+
+CHECKOUT=0
+if [ ! -f $TARFILE ]; then
+ CHECKOUT=1
+ echo "I: orig.tar.gz from version in changelog not available, checkout latest version (${SVNREVISION})"
+fi
+if [ ${SVNREVISION} -gt ${CHANGELOGREVISION} ]; then
+ CHECKOUT=1
+ echo "I: new version in svn available, checkout latest version (${SVNREVISION})"
+fi
+
+if [ "$CHECKOUT" == "1" ]; then
+ if [ -f ${NEWTARFILE} ]; then
+ echo "W: ${NEWTARFILE} already available, delete to force new download"
+ else
+ echo "I: create ${NEWTARFILE}"
+
+ svn co http://svn.clinrisk.co.uk/opensource/qrisk2 ${NEWFOLDER}
+
+
+ GZIP="--best --no-name" tar --exclude-vcs -czf ${NEWTARFILE} ${NEWFOLDER}
+ rm -rf ${NEWFOLDER}
+ fi
+fi
+
Property changes on: trunk/packages/qrisk2/trunk/debian/get-orig-source
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/packages/qrisk2/trunk/debian/patches/hardening-flags.patch
===================================================================
--- trunk/packages/qrisk2/trunk/debian/patches/hardening-flags.patch (rev 0)
+++ trunk/packages/qrisk2/trunk/debian/patches/hardening-flags.patch 2013-04-18 17:36:11 UTC (rev 13349)
@@ -0,0 +1,30 @@
+Description: Allow hardening flags to be used
+Author: Thorsten Alteholz <debian at alteholz.de>
+Index: qrisk2_0.0.r30/Makefile
+===================================================================
+--- qrisk2_0.0.r30.orig/Makefile 2013-04-18 14:55:20.000000000 +0200
++++ qrisk2_0.0.r30/Makefile 2013-04-18 14:55:42.000000000 +0200
+@@ -41,8 +41,8 @@
+
+ # compiler
+ CC = gcc
+-CCFLAGS =
+-LDFLAGS =
++#CCFLAGS =
++#LDFLAGS =
+
+ # library paths
+ LIBS = -Llib -lclinrisk -lm
+@@ -57,10 +57,10 @@
+ $(EXECUTABLES): $(LIB_OUT)
+
+ .c:
+- $(CC) $(INCLUDES) $(LDFLAGS) $< -o $@ $(LIBS)
++ $(CC) $(INCLUDES) $(LDFLAGS) $(CPPFLAGS) $< -o $@ $(LIBS)
+
+ .c.o:
+- $(CC) $(INCLUDES) $(CCFLAGS) -c $< -o $@
++ $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+
+ $(LIB_OUT): $(LIB_OBJ)
+ ar rcs $(LIB_OUT) $(LIB_OBJ)
Added: trunk/packages/qrisk2/trunk/debian/patches/series
===================================================================
--- trunk/packages/qrisk2/trunk/debian/patches/series (rev 0)
+++ trunk/packages/qrisk2/trunk/debian/patches/series 2013-04-18 17:36:11 UTC (rev 13349)
@@ -0,0 +1 @@
+hardening-flags.patch
Added: trunk/packages/qrisk2/trunk/debian/qrisk2.install
===================================================================
--- trunk/packages/qrisk2/trunk/debian/qrisk2.install (rev 0)
+++ trunk/packages/qrisk2/trunk/debian/qrisk2.install 2013-04-18 17:36:11 UTC (rev 13349)
@@ -0,0 +1 @@
+executables/* usr/bin
Added: trunk/packages/qrisk2/trunk/debian/qrisk2.lintian-overrides
===================================================================
--- trunk/packages/qrisk2/trunk/debian/qrisk2.lintian-overrides (rev 0)
+++ trunk/packages/qrisk2/trunk/debian/qrisk2.lintian-overrides 2013-04-18 17:36:11 UTC (rev 13349)
@@ -0,0 +1,4 @@
+# these flags are really used
+qrisk2: hardening-no-fortify-functions usr/bin/Q68_qrisk2_2012_1_0_commandLine
+qrisk2: hardening-no-fortify-functions usr/bin/Q68_qrisk2_2012_1_1_commandLine
+
Added: trunk/packages/qrisk2/trunk/debian/qrisk2.manpages
===================================================================
--- trunk/packages/qrisk2/trunk/debian/qrisk2.manpages (rev 0)
+++ trunk/packages/qrisk2/trunk/debian/qrisk2.manpages 2013-04-18 17:36:11 UTC (rev 13349)
@@ -0,0 +1,4 @@
+debian/Q68_qrisk2_2012_1_0_commandLine.1
+debian/Q68_qrisk2_2012_1_0_qriskAge.1
+debian/Q68_qrisk2_2012_1_1_commandLine.1
+debian/Q68_qrisk2_2012_1_1_qriskAge.1
Modified: trunk/packages/qrisk2/trunk/debian/rules
===================================================================
--- trunk/packages/qrisk2/trunk/debian/rules 2013-04-18 09:56:32 UTC (rev 13348)
+++ trunk/packages/qrisk2/trunk/debian/rules 2013-04-18 17:36:11 UTC (rev 13349)
@@ -4,3 +4,6 @@
%:
dh $@
+
+get-orig-source:
+ ./debian/get-orig-source
Added: trunk/packages/qrisk2/trunk/debian/source/format
===================================================================
--- trunk/packages/qrisk2/trunk/debian/source/format (rev 0)
+++ trunk/packages/qrisk2/trunk/debian/source/format 2013-04-18 17:36:11 UTC (rev 13349)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: trunk/packages/qrisk2/trunk/debian/watch
===================================================================
--- trunk/packages/qrisk2/trunk/debian/watch (rev 0)
+++ trunk/packages/qrisk2/trunk/debian/watch 2013-04-18 17:36:11 UTC (rev 13349)
@@ -0,0 +1 @@
+# upstream does not release tar files, sources are taken from repository
More information about the debian-med-commit
mailing list