Git log: commit 96e713edf60949e016e64907c231887a0124da2d
Merge: 6c656fdf 862c8cc7
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue Dec 1 17:36:09 2020 +0100
Merge branch 'master' into contrib
commit 6c656fdfbc0be9d19223b6f5e1bf05affa570638
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Oct 28 13:04:06 2020 +0100
Note files which are installed by main hwloc and not contrib hwloc
commit e880ce340552448d6644099ce3045e837d57847d
Merge: e33042cd 0dc25043
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Oct 28 12:48:54 2020 +0100
Merge branch 'master' into contrib
commit e33042cdaa7530972f28fe8e3fe84147e0730555
Merge: d38768e2 6d83abf8
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu Oct 1 00:59:46 2020 +0200
Merge branch 'master' into contrib
commit d38768e2852a86526df3f960ec207e773f4b22ad
Merge: 18d7e78a 6b11a713
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu Oct 1 00:52:56 2020 +0200
Merge branch 'master' into contrib
commit 18d7e78a8f3f86249baa509c24cc40f5b1dfcd42
Merge: e8e173f8 d84f239e
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu Oct 1 00:51:51 2020 +0200
Merge tag 'debian/2.2.0+dfsg-4' into contrib
hwloc Debian release 2.2.0+dfsg-4
commit e8e173f857dca94593a6c4a406ff968d1a07c8b5
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Fri Jul 24 13:52:31 2020 +0200
control: Drop Build-Depends-Indep
since this doesn't build the arch:all doc package.
commit 88b5ae827d2c8a379d7a708c0242e0caf2725a82
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu Jul 23 22:28:01 2020 +0200
control: Make libhwloc-contrib-plugins arch:any
commit db7bdac5b713fc735f92387b1224000c211b7b78
Merge: d30c9499 2605bd81
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu Jul 23 22:27:07 2020 +0200
Merge branch 'master' into contrib
commit d30c9499aa3c624966161da55e322c2b1ffb7a66
Merge: 93e8fc1f 0bf0803c
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Mar 30 22:03:27 2020 +0200
Merge tag 'debian/2.2.0+dfsg-1' into contrib
hwloc Debian release 2.2.0+dfsg-1
commit 93e8fc1f1c1c0e98fabfb727c642662ade190fb0
Merge: d77b6194 1059fb25
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Jan 1 15:04:35 2020 +0100
Merge branch 'master' into contrib
commit d77b619467e7c98f3b2b937b0e4e983561a86964
Merge: 5a1209c5 da45ce1a
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Jan 1 15:00:57 2020 +0100
Merge branch 'master' into contrib
commit 5a1209c5df4fd0a585bcf93e8b1c292f7a7eec6e
Merge: 7ab49f40 067cfdaf
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Dec 9 22:53:04 2019 +0100
Merge branch 'master' into contrib
commit 7ab49f4037ddffa47ccf1242c171f7d8c356dc14
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Dec 9 22:48:20 2019 +0100
control: Reduce build-dep divergence from main
commit fd6e950a8892fe0af47ea1e93a667fc939d1ead9
Author: Andreas Beckmann <anbe@debian.org>
Date: Mon Dec 9 22:44:41 2019 +0100
control: hwloc-contrib can be built on ppc64el, too
(Closes: #946482)
* control: Drop libcuda1 build-dep.
commit 980b590972c367cd01a2c7931a238c26d7b9a69d
Merge: f5fbe55f fdbedc39
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Dec 9 22:43:38 2019 +0100
Merge branch 'master' into contrib
commit f5fbe55f8634531d29c8887ea696dd83cf142103
Merge: f6f444c8 d183c757
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Dec 9 22:41:59 2019 +0100
Merge branch 'master' into contrib
commit f6f444c8a1f1174d2079d887023fc47a46372219
Merge: 99dadc9a d396913f
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue Nov 26 16:04:45 2019 +0100
Merge branch 'experimental-contrib' into contrib
commit 99dadc9a6b7a36071faffd6f7a434c4c3e8f8a4b
Merge: 40fdd234 f0f89cf2
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue Nov 26 14:57:07 2019 +0100
Merge branch 'contrib' into contrib-2
commit 40fdd2340e70b2acfe20721f6f4be3d656ff4e82
Merge: b8a654c0 0aea7e82
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue Nov 26 14:56:20 2019 +0100
Merge branch 'master' into contrib-2
commit b8a654c02351181a1f29a77489e091a0ba508f7a
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Sep 7 17:00:32 2019 +0200
source/lintian-overrides: Silence warning
commit f0f89cf29baecf6459b95698b3801affbaebbb59
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Sep 7 17:00:32 2019 +0200
source/lintian-overrides: Silence warning
commit d2d6b55854f28c7cfe4415969fc61240b2067455
Merge: a7dc503b 0ce8fcb6
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Jul 24 17:42:34 2019 +0200
Merge branch 'master' into contrib
commit d9a3887badacc51fc2ee54e12e5c20f9eba53c8f
Merge: b46abb84 c9a7f139
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Jun 10 22:46:25 2019 +0200
Merge branch 'master-2' into contrib-2
commit a7dc503b7966c8a796e2752a4a0553f4107db4ac
Merge: 7f8d5a14 518f0936
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Feb 9 00:47:22 2019 +0100
Merge branch 'master' into contrib
commit b46abb84b10307d89a4644285a7e65184d9f7521
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jan 19 20:52:32 2019 +0100
Fix libhwloc5 -> libhwloc15 so bump.
commit d9030ec9e7ed614992e16798d28ee335269efd70
Merge: 46a83451 7f8d5a14
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jan 19 20:44:04 2019 +0100
Merge branch 'contrib' into contrib-2
commit 7f8d5a140127f1daaf68f1ddea98543cc9f0ede9
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun Jan 13 12:34:03 2019 +0100
control: Add libcuda1 dependency, not brought by nvidia-cuda-dev any more.
commit bcd22fec3a341091fa275a329e55799fa6c946a6
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue Jan 8 23:57:12 2019 +0100
Fix source to contrib branch
commit 267ff44f555ea2057fd00b5496e0228abcbe2fe3
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Dec 15 10:53:28 2018 +0100
Drop autopkgtests in contrib package
commit 3eacdd1334edf4293af9ae113cd3fcf9db05b0ab
Merge: f9f333fe 0fbccd87
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Fri Dec 14 17:41:05 2018 +0100
Merge branch 'master' into contrib
commit f9f333febdd2e67d3e60c581672ef37669eaaaa9
Merge: 1ca32bf4 54661620
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Sep 5 16:14:47 2018 +0200
Merge branch 'master' into contrib
commit 1ca32bf4fd766d2f9692e389b1eccaf11db68069
Merge: fc1ceb5f f8efe95b
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun Jun 17 16:28:22 2018 +0200
Merge branch 'master' into contrib
commit fc1ceb5ffcb3f1b288c53f813c9ed73aaba47ad6
Merge: 7cdda540 86b47069
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu Apr 5 14:27:56 2018 +0200
Merge commit '86b470696298987741cf837a7ccab26397879e48' into contrib
commit 7cdda540111df41f6855a2f8d583517075ae62fd
Merge: 377f2bb5 9e62fc6f
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Fri Jan 19 09:47:28 2018 +0100
Merge branch 'master' into contrib
commit 377f2bb537d764097239254c37de25d778bcf284
Merge: e0e299ac f5f8cc55
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Sep 6 18:26:39 2017 +0200
Merge branch 'master' into contrib
commit e0e299acdee412935d767b2f0d1e2d0452b0ce0f
Merge: 1602a6ba d36f8ff6
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Sep 6 18:19:31 2017 +0200
Merge branch 'master' into contrib
commit 1602a6baa2cf6866fddd5b83938e7651d89d2330
Merge: 9b8f6e48 71c22a62
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Sep 6 17:47:15 2017 +0200
Merge branch 'master' into contrib
commit 9b8f6e486a4709ee643977d72f4ccd15857622e2
Merge: 278f46ed f699771d
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Sep 6 17:45:10 2017 +0200
Merge branch 'master' into contrib
commit 278f46ed38391c8726301d32b9cd4a047eb3b177
Merge: d406075d 23d41088
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Sep 6 17:44:32 2017 +0200
Merge branch 'master' into contrib
commit d396913fa9dfa204a4fe857abd6cd71585bf907c
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu Aug 10 21:42:53 2017 +0200
control: Bump Standards-Version to 4.0.1.
commit f7c09ac606118a2ab6492365b29c6ff49bf5ba24
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu Aug 10 18:50:04 2017 +0200
control: Migrate priority to optional.
commit 52f693dfb736e6b8f2bed2fd87de9d7b1d53d7f7
Merge: e67b3b24 75112682
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Fri Apr 28 16:57:34 2017 +0200
Merge branch 'experimental' into experimental-contrib
commit e67b3b2496da5ad2cf03b1df56f304baba1d58f5
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Fri Feb 24 00:20:27 2017 +0100
hwloc-contrib.lintian-overrides: Add
commit 4eec9fc2cc806dfd2f2038c580c63d1c689bc561
Merge: d406075d f8db5e1f
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Fri Feb 24 00:14:44 2017 +0100
Merge branch 'experimental' into experimental-contrib
commit d406075d07f818aac7c80580120e0db15ce4fcd0
Merge: b9b14373 79962eaa
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Fri Feb 24 00:14:13 2017 +0100
Merge branch 'master' into contrib
commit b9b143734f1be441cac65fd3217b4391502b5faa
Merge: 6b6abc95 07e0f901
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Nov 21 11:20:56 2016 +0100
Merge branch 'master' into contrib
commit 6b6abc95ae775702bbfb1401965a029bbee75f7d
Merge: c307349b 71702764
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Aug 29 10:15:57 2016 +0200
Merge branch 'master' into contrib
commit c307349b2ec5dc977e3c7e5ec45e535abf32c588
Merge: d3e5981e f77ddd90
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Apr 27 18:57:07 2016 +0200
Merge branch 'master' into contrib
commit d3e5981e06ba53f7d020050a3ebf3c8a0bb80c7a
Merge: a23e7cd9 406e1932
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Apr 27 18:52:27 2016 +0200
Merge branch 'master' into contrib
commit a23e7cd93a9d2362212234497ac508893651c7da
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Apr 27 18:23:36 2016 +0200
rules: Make dh_auto_install in debian/tmp
so dh_install can still work.
commit 83927a8421f15884f664818108fc9da39d211353
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Apr 27 18:05:21 2016 +0200
control: Restrict to amd64, only architecture supported by nvidia
commit 78711fdb655019cd624f5cc3b1a6233bd557dbf5
Merge: c3c63a55 8bc26db6
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Apr 27 18:02:14 2016 +0200
Merge branch 'master' into contrib
commit c3c63a55d056205ee34001eba05e3b924bb1db06
Merge: 139fca4a 878399be
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Apr 27 18:01:44 2016 +0200
Merge branch 'master' into contrib
commit 139fca4aaeb34f021c4280a92986976faca4d545
Merge: 220b31c9 5075ea0c
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue Dec 29 18:56:24 2015 +0100
Merge branch 'master' into contrib
commit 220b31c93cf17fa6f013ee5c30d7782b67272f13
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Oct 19 18:36:40 2015 +0200
upload
commit 4438274dc78c7e77e76e3b840111ee83904d3bb2
Merge: 3d387b64 a0a0b654
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Oct 19 18:35:36 2015 +0200
Merge branch 'master' into contrib
commit 3d387b6405ffdd279521866819a8cef7b881fb85
Merge: df7c8908 4f518a18
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Fri Jun 19 14:11:41 2015 +0200
Merge branch 'master' into contrib
Conflicts:
debian/changelog
debian/control
debian/patches/cpuset_ABI
debian/rules
commit df7c8908556d51439cd37c25aa0df004389f0f98
Merge: f45edc4c 74f7931d
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Fri May 1 21:05:19 2015 +0200
Merge branch 'master' into contrib
Conflicts:
debian/changelog
debian/control
commit f45edc4cc8d825c75bb2e2ba5312c6930d06bb80
Merge: 0d0e425a 3d17437c
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Oct 8 14:38:02 2014 +0200
Merge branch 'master' into contrib
Conflicts:
debian/changelog
debian/control
debian/libhwloc-doc.docs
debian/patches/series
commit 0d0e425ab0a63b8ca08d9a610695175825603d8f
Merge: bc36039a c9bd8d71
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Fri Aug 29 22:07:10 2014 +0200
Merge branch 'master' into contrib
Conflicts:
debian/changelog
commit bc36039a1fda5883b0f61a3193cc9f6b2af2cb16
Merge: 81ade3ee 2aeb577c
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Fri Aug 22 00:11:08 2014 +0200
Merge branch 'master' into contrib
Conflicts:
debian/changelog
debian/control
debian/hwloc.install
debian/patches/series
commit 81ade3ee09e139097a21b0982bac33cd7acf89e4
Merge: 24548ae2 b4b6e688
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Mar 26 12:45:21 2014 +0100
Merge branch 'upstream' into contrib
commit 24548ae25d105face422e41c9757743a859ebb8c
Merge: a03f7a20 90f097ce
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue Feb 4 18:17:02 2014 +0100
Merge branch 'master' into contrib
Conflicts:
debian/changelog
commit a03f7a205fada0bca8bdfb8ebeddca4c728295c0
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue Nov 19 14:33:12 2013 +0100
Fix Section according to ftpmaster override
commit 8f961c11b6a107be071f9f50f217d58006c07944
Merge: 9f7d6408 dd9abc12
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue Nov 19 14:06:27 2013 +0100
Merge branch 'master' into contrib
Conflicts:
debian/changelog
debian/control
debian/patches/cpuset_ABI
commit 9f7d6408fa42943b573c1836a772dc3d31eca00c
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu Oct 3 17:25:47 2013 +0200
Contrib branch