From: W. Trevor King Date: Mon, 13 Feb 2012 11:42:15 +0000 (-0500) Subject: My patches to comedi-calibrate were accepted upstream. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4b8886407caa39c0933175767fce623133c7336c;p=wtk-overlay.git My patches to comedi-calibrate were accepted upstream. --- diff --git a/ChangeLog b/ChangeLog index 20acfc0..46c0a94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*comedi-calibrate-9999 (27 Jan 2012) + 27 Jan 2012; W. Trevor King comedi-calibrate-9999.ebuild, + -comedi_calibrate.8, + -comedi-calibrate-9999-comedi_soft_calibrate-data-destdir.patch: + - These changes were accepted upstream in commits + 6d465b8a00f144699d4b3b57fef36271696b1697 and + fee0ad8997dda60f4fcd8998a45ae44d85b2fd2a. + *comedi-calibrate-9999 (27 Jan 2012) 27 Jan 2012; W. Trevor King ChangeLog, metadata.xml, comedi-calibrate-9999.ebuild, comedi_calibrate.8, diff --git a/Manifest b/Manifest index b6fe8ce..3495b76 100644 --- a/Manifest +++ b/Manifest @@ -1,5 +1,3 @@ -AUX comedi-calibrate-9999-comedi_soft_calibrate-data-destdir.patch 515 RMD160 dcae09bccde0d5637a738b1bbc16dc7a97d71822 SHA1 6b4dee6c7e265aa328a9346de38bce8610a6a345 SHA256 f57712e52dab67cb7d1f45665ffe27d55ef77b3dcc1280b53a8d2032ea6d2cd7 -AUX comedi_calibrate.8 4900 RMD160 64859e216bc54b4010c227bd3efa9ad9ce2c1d1e SHA1 78a575d045a874ed1bdceddece22049d8637e1ab SHA256 5f96b0e24cd5590197747d64d28e7ec99e724d4ea846f84abb921d4dc4a8fe2f -EBUILD comedi-calibrate-9999.ebuild 1445 RMD160 bd4eedeb1b896b6abf91827ec0931cbe788ac663 SHA1 e7ea6cee135a6a4985bea576623684ca22bd0747 SHA256 8a971324d01f388565c095c2e4ae7f1b7b2bb909d1a49d7f92d1dae5562fb7a1 -MISC ChangeLog 792 RMD160 6e22e5ed7fa1d3ef38fe8d11c420a0240f03e1ca SHA1 b98269489344612e965364e942f93a0b0406b1e9 SHA256 e2b6bbceb9fc1f9c61cda9b0a3324d67e5fa3de3adf6a241e0e06db50a865faa +EBUILD comedi-calibrate-9999.ebuild 1331 RMD160 3d090648919f7d974bbf7c87313b3faf714e0fb3 SHA1 11a963738a40388c4bc10b611a1fc7b4ed73383f SHA256 90a637553087e29c58c031b26680ae8e68164b44e155d44eec9c2b83eaa3d8f7 +MISC ChangeLog 1154 RMD160 c094b6a37cc618fc1a17f408c5e121928da66b58 SHA1 1abe9317510e756d5331294e275d580c157f707d SHA256 41585ad176bae8af5242b5198f9a8110de8c4ddea314d773723f1adaf55f8c8a MISC metadata.xml 247 RMD160 6735f3a5dd2d7a2b70589d1693f35d54291b7147 SHA1 c015969fe50967340dd050a44cb9f8a30b5e34a5 SHA256 9e65060e5f9d0a50d28c7a69d9c27fed6c3037fdd3e420cc276627fde2794f72 diff --git a/comedi-calibrate-9999.ebuild b/comedi-calibrate-9999.ebuild index 1618430..28c3d6c 100644 --- a/comedi-calibrate-9999.ebuild +++ b/comedi-calibrate-9999.ebuild @@ -33,7 +33,6 @@ DEPEND="${RDEPEND} src_prepare() { - epatch "${FILESDIR}/${PN}-9999-comedi_soft_calibrate-data-destdir.patch" if [ "${PV}" == "9999" ] ; then eautoreconf fi @@ -53,7 +52,6 @@ src_install() { emake DESTDIR="${D}" install dodoc README AUTHORS ChangeLog - doman "${FILESDIR}/comedi_calibrate.8" # make the calibration directory available to the comedi group set # up by sci-misc/comedi-headers chgrp comedi "${D}/var/lib/comedi/calibrations" diff --git a/files/comedi-calibrate-9999-comedi_soft_calibrate-data-destdir.patch b/files/comedi-calibrate-9999-comedi_soft_calibrate-data-destdir.patch deleted file mode 100644 index 17d8c64..0000000 --- a/files/comedi-calibrate-9999-comedi_soft_calibrate-data-destdir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/comedi_soft_calibrate/Makefile.am b/comedi_soft_calibrate/Makefile.am -index 1fb877a..9449ca0 100644 ---- a/comedi_soft_calibrate/Makefile.am -+++ b/comedi_soft_calibrate/Makefile.am -@@ -9,7 +9,7 @@ comedi_soft_calibrate_LDADD = ../libcomedi_calibrate/libcomedi_calibrate.a \ - -lcomedi -lboost_program_options -lgsl -lgslcblas -lm - - install-data-local: -- $(INSTALL) -d $(localstatedir)/lib/comedi/calibrations -+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/comedi/calibrations - - EXTRA_DIST = results - diff --git a/files/comedi_calibrate.8 b/files/comedi_calibrate.8 deleted file mode 100644 index b3c1f2f..0000000 --- a/files/comedi_calibrate.8 +++ /dev/null @@ -1,165 +0,0 @@ -.TH comedi_calibrate 8 "" -.SH NAME -\fBcomedi_calibrate\fR - COMEDI calibration utility -.SH SYNOPSIS -\fBcomedi_calibrate\fR [-f /dev/comediN] -.br -.SH DESCRIPTION -\fBcomedi_calibrate\fR is used to autocalibrate \fBcomedi\fR -devices. Some \fBcomedi\fR devices have the ability to -measure internal stable voltage references and control -gains and offsets using programmable DACs. On these devices, -\fBcomedi_calibrate\fR determines the proper values to -feed into the programmable calibration -DACs. These calibration settings are then -saved to a file, which can be fed to comedi_apply_calibration() -and related functions. - -If comedi_calibrate finds an existing calibration file, it -will not perform a new calibration by default. It will -simply read its calibration information from the file. -This behaviour -may be overriden with the -.B \-\-calibrate -option, to force a new calibration to be performed. - -After obtaining the calibration information for the board, -comedi_calibrate will then apply a calibration setting -appropriate for the specified subdevice, channel, and -range (see the -.B \-\-subdevice -, -.B \-\-channel -, and -.B \-\-range -options below). See the comedilib documentation for -comedi_apply_calibration() for more information. - -\fBcomedi_calibrate\fR prints a lot of debugging information -as it runs. - -.SH LIMITATIONS - -\fBcomedi_calibrate\fR only works on boards that it understands. -For boards that are known to have autocalibration ability, -but are not currently supported, \fBcomedi_calibrate\fR will -output basic debugging information that is useful for -the author to add support for your device. Please send this -output to him. - -.SH EXAMPLES - -.TP -.BI comedi_calibrate\ \-\-file\ /dev/comediN -If no default calibration for \fI/dev/comediN\fR already exists, -perform a calibration -and save results to default location. - -.TP -.BI comedi_calibrate\ \-\-calibrate -Perform a calibration, using existing calibration (if it exists) as -starting point. - -.TP -.BI comedi_calibrate\ \-\-reset\ \-\-calibrate -Perform a fresh calibration and save results to default location. - -.TP -.BI comedi_calibrate\ \-\-no\-calibrate\ \-\-subdevice\ subd\ \-\-range\ range\ \-\-save\-file\ cal_file -Apply calibration for subdevice \fIsubd\fR, range \fIrange\fR, using -the settings in the calibration file \fIcal_file\fR. - - -.SH OPTIONS - -\fBcomedi_calibrate\fR recognizes the following options: - -.TP -.BI \-a\ aref ,\ \-\-aref\ aref -Along with \fB--channel\fR, \fB--range\fR -and \fB--subdevice\fR, this specifies which calibration you want comedi_calibrate -leave applied to the board. The default is 0. - -.TP -.B \-\-[no\-]calibrate -Force calibration to be performed (or not). -By default, comedi_calibrate will only perform a new calibration if -no existing calibration file is found (see \fB--save-file\fR). - -.TP -.BI \-c\ channel, \-\-channel\ channel -Along with \fB--subdevice\fR, \fB--range\fR -and \fB--aref\fR, this specifies which calibration you want comedi_calibrate -to leave applied to the board. The default is 0. - -.TP -.B \-\-[no\-]dump -Perform (or not) dump of various information about -state of calibration prior to performing new calibration. - -.TP -.BI \-f\ /dev/comediN, \-\-file\ /dev/comediN -Perform calibration on device \fB/dev/comediN\fR. - -.TP -.B \-\-help -Print help for options then exit. - -.TP -.B \-q, \-\-quiet -Don't generate output to stdout. - -.TP -.BI \-r\ range ,\ \-\-range\ range -Along with \fB--channel\fR, \fB--subdevice\fR -and \fB--aref\fR, this specifies which calibration you want comedi_calibrate -to leave applied to the board. The default is 0. - -.TP -.B \-\-[no\-]reset -Reset (or don't reset) calibration subdevice to -a reasonable starting point before -performing calibration. The default is \fB--no-reset\fR. If -\fB--no-reset\fR is used, the calibration routine will try to use -an existing calibration (see \fB--save-file\fR) as a starting point. -This is useful if -a single calibration -pass is not sufficient, and you wish to perform another calibration -pass starting from the results of the previous pass. - -.TP -.B \-\-[no\-]results -Perform (or not) dump of various information about -state of calibration after performing new calibration. - -.TP -.BI \-S\ file ,\ \-\-save-file\ file -Save calibration information to specified file, -instead of default location. If the file already exists, comedi_calibrate -will also use its contents as a starting point for the calibration pass (see -\fB--no-reset\fR). - -.TP -.BI \-s\ subdevice ,\ \-\-subdevice\ subdevice -Along with \fB--channel\fR, \fB--range\fR -and \fB--aref\fR, this specifies which calibration you want comedi_calibrate -to leave applied to the board. The default is 0. - -.TP -.B \-v, \-\-verbose -Generate more verbose output to stdout, can be specified multiple times - - -.SH SEE ALSO - -\fBcomedi\fR(7) - -.SH VERSION - -0.7.x - -.SH AUTHOR - -David Schleef, - -Frank Mori Hess,