[med-svn] [Git][med-team/plink1-9][master] 7 commits: Upstream provides unversioned download thus we need to read the
Andreas Tille (@tille)
gitlab at salsa.debian.org
Thu Feb 3 08:22:27 GMT 2022
Andreas Tille pushed to branch master at Debian Med / plink1.9
Commits:
70da0954 by Andreas Tille at 2022-02-03T09:18:44+01:00
Upstream provides unversioned download thus we need to read the
version out of the source code which is done in debian/get-orig-source
The watch file is deactivated to avoid noise with uscan
- - - - -
04e67a9b by Andreas Tille at 2022-02-03T09:19:13+01:00
New upstream version 1.90~b6.24-211108
- - - - -
c212ad5a by Andreas Tille at 2022-02-03T09:19:16+01:00
Update upstream source from tag 'upstream/1.90_b6.24-211108'
Update to upstream version '1.90~b6.24-211108'
with Debian dir 7521a8d25c1d1e529f1ae397bdf8151bda1e5fdf
- - - - -
ffd51a25 by Andreas Tille at 2022-02-03T09:19:50+01:00
New upstream bugfix release
- - - - -
12ad7998 by Andreas Tille at 2022-02-03T09:20:10+01:00
routine-update: Standards-Version: 4.6.0
- - - - -
96468797 by Andreas Tille at 2022-02-03T09:20:20+01:00
Remove obsolete field Contact from debian/upstream/metadata (already present in machine-readable debian/copyright).
Changes-By: lintian-brush
- - - - -
9f4559cc by Andreas Tille at 2022-02-03T09:21:35+01:00
routine-update: Ready to upload to unstable
- - - - -
8 changed files:
- debian/changelog
- debian/control
- + debian/get-orig-source
- debian/rules
- debian/upstream/metadata
- debian/watch
- plink.c
- plink_data.c
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+plink1.9 (1.90~b6.24-211108-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream bugfix release
+ * Upstream provides unversioned download thus we need to read the
+ version out of the source code which is done in debian/get-orig-source
+ The watch file is deactivated to avoid noise with uscan
+ * Standards-Version: 4.6.0 (routine-update)
+ * Remove obsolete field Contact from debian/upstream/metadata (already present
+ in machine-readable debian/copyright).
+
+ -- Andreas Tille <tille at debian.org> Thu, 03 Feb 2022 09:20:26 +0100
+
plink1.9 (1.90~b6.24-210606-1) unstable; urgency=medium
* New upstream release.
=====================================
debian/control
=====================================
@@ -7,7 +7,7 @@ Build-Depends: debhelper-compat (= 13),
libatlas-base-dev,
liblapack-dev,
zlib1g-dev
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/med-team/plink1-9
Vcs-Git: https://salsa.debian.org/med-team/plink1-9.git
Homepage: https://www.cog-genomics.org/plink/1.9/
=====================================
debian/get-orig-source
=====================================
@@ -0,0 +1,32 @@
+#!/bin/sh -e
+
+# Upstream provides unversioned download thus we need to read the version out of the source code
+
+COMPRESS=xz
+
+NAME=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
+OVERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed 's/\([0-9\.]\+\)-[0-9]\+$/\1/'`
+
+mkdir -p ../tarballs
+cd ../tarballs
+
+wget --quiet -N https://www.cog-genomics.org/static/bin/plink/plink_src.zip
+rm -rf 1.9
+unzip -q plink_src.zip
+cd 1.9
+# grep -A20 'char ver_str\[\]' plink.c | grep -e 'PLINK v1.90b6' -e ' 202[0-9])' | sed '1{N;s/\n//;}'
+plver=$(grep -A10 'char ver_str\[\]' plink.c | grep -e 'PLINK v1.90b6' | sed 's/^[[:space:]]*"PLINK v\([0-9.b]\+\)".*/\1/' | sed 's/b/~b/')
+datever=$(grep -A20 'char ver_str\[\]' plink.c | grep -e ' 202[0-9])' | sed 's/^[[:space:]]*" (\([0-9]\+ .* 20[0-9]\+\))";/\1/')
+datever=$(date "+%y%m%d" --date="${datever}")
+VERSION="$plver-$datever"
+if dpkg --compare-versions $VERSION gt $OVERSION ; then
+ echo "$VERSION is greater than $OVERSION ... create new tarball"
+else
+ exit
+fi
+cd ..
+TARDIR=${NAME}-${VERSION}
+mv 1.9 ${TARDIR}
+
+GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -caf "$NAME"_"$VERSION".orig.tar.${COMPRESS} "${TARDIR}"
+rm -rf ${TARDIR}
=====================================
debian/rules
=====================================
@@ -30,3 +30,7 @@ override_dh_installman:
override_dh_installchangelogs:
dh_installchangelogs debian/upstream.docs/upstream.changelog
+
+# Upstream provides unversioned download thus we need to read the version out of the source code
+get-orig-source:
+ . debian/get-orig-source
=====================================
debian/upstream/metadata
=====================================
@@ -1,4 +1,3 @@
-Contact: Christopher Chang <chrchang at alumni.caltech.edu>
Name: plink1.9
Reference:
- Author: >
=====================================
debian/watch
=====================================
@@ -1,3 +1,8 @@
version=4
-opts="dversionmangle=s/(\d\S*)\-//,repack,compression=xz" \
- https://www.cog-genomics.org/plink/1.9/dev /static/bin/plink(.*)/plink_src\.zip
+opts=dversionmangle=s/.*/0.No-Track/ \
+ https://people.debian.org/~eriberto/ FakeWatchNoUpstreamTrackingForThisPackage-(\d\S+)\.gz
+
+# Upstream provides unversioned download thus we can not create a sensible watch file
+# see debian/get-orig-source for downloading the latest upstream version
+#opts="dversionmangle=s/(\d\S*)\-//,repack,compression=xz" \
+# https://www.cog-genomics.org/plink/1.9/dev /static/bin/plink(.*)/plink_src\.zip
=====================================
plink.c
=====================================
@@ -105,7 +105,7 @@ static const char ver_str[] =
#else
" 32-bit"
#endif
- " (6 Jun 2021)";
+ " (8 Nov 2021)";
static const char ver_str2[] =
// include leading space if day < 10, so character length stays the same
" "
=====================================
plink_data.c
=====================================
@@ -16201,7 +16201,8 @@ int32_t merge_datasets(char* bedname, char* bimname, char* famname, char* outnam
break;
}
}
- if ((mlpos < merge_ct) && (!feof(mergelistfile))) {
+ // feof() is true if mergelistfile was a named pipe.
+ if ((mlpos < merge_ct) || ferror(mergelistfile)) {
goto merge_datasets_ret_READ_FAIL;
}
fclose_null(&mergelistfile);
View it on GitLab: https://salsa.debian.org/med-team/plink1-9/-/compare/04731eb1f50168407cd92e09616eb8c3c7230d55...9f4559cc1719aa6cf92ce800e1831c055f091625
--
View it on GitLab: https://salsa.debian.org/med-team/plink1-9/-/compare/04731eb1f50168407cd92e09616eb8c3c7230d55...9f4559cc1719aa6cf92ce800e1831c055f091625
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220203/a7b78c17/attachment-0001.htm>
More information about the debian-med-commit
mailing list