Thomas Lamprecht
82fdafa01e
bump version to 5.3.18-1
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-02-05 11:49:42 +01:00
Thomas Lamprecht
22f2d89162
bump version to 5.3.13-3
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-01-31 13:41:16 +01:00
Thomas Lamprecht
bc70610eee
bump version to 5.3.13-2
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-01-24 09:49:59 +01:00
Thomas Lamprecht
8106a5e4a8
bump version to 5.3.13-1
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-12-05 07:18:30 +01:00
Thomas Lamprecht
8028e2a26b
d/control: record lz4 build dependency
...
Since Ubuntu Eoan the kernel compression was changed from GZIP to
LZ4, due to slightly faster load times vs. a 25% size increase
trade-off (e.g. 5.0 had ~ 8, this one has ~ 12 MB; *but* the initrd
stays roughly the same size, and that one is 5 times bigger anyway)
If we want to keep that is in the stars, but for now correctly
document the build-dependency to LZ4.
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-11-14 15:23:23 +01:00
Thomas Lamprecht
0b28899e57
bump version to 5.3.10-1
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-11-14 10:43:35 +01:00
Thomas Lamprecht
b481f89770
disable alsa snd pcspkr module
...
The PC speaker (beeper) can only be managed by one module, and there
are two which could do so. The very basic INPUT_PCSPKR, and the more
advanced SND_PCSP which allows it to be used as primitive ALSA
soundcard, which for Proxmox Server projects, and all modern
workstations is not much of use.
As they both were aliased to the "pcspkr" module name, and used the
same internal driver name (being a replacment of the other), one
would get the following error message when both are loaded:
"Error: Driver 'pcspkr' is already registered, aborting..."
in the kernel log. This happens as by default both are tried to get
loaded. We do not want the more complex ALSA one, so disable that.
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-11-12 15:31:10 +01:00
Thomas Lamprecht
eb6667c98c
fix #2448 : compile ISO8859-1 NLS as built-in
...
Allows to mount VFAT devices even if the currently running kernel was
removed before any VFAT, or other FS using the default Native
Language Support module was mounted during the current uptime.
This then could break updating the ESP partitions, which are mounted
with VFAT in a postrm triggered step - so at a time where the current
/lib/modules/... was already removed, and so the NLS could not get
loaded.
While there are a lot of different NLS, our kernel config has:
> CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
So compile that module as built-in.
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-11-05 12:08:29 +01:00
Thomas Lamprecht
bbccfa9d97
bump version to 5.3.7-1
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-10-23 19:00:32 +02:00
Thomas Lamprecht
d21ca1b5f8
bump version to 5.3.1-1
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-10-02 08:59:12 +02:00
Thomas Lamprecht
847a60dd01
update fwlist to 5.3 based kernel
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-10-01 18:57:02 +02:00
Thomas Lamprecht
532c58c01e
bump version to 5.0.21-7
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-09-30 09:12:03 +02:00
Thomas Lamprecht
2ad9e087e8
d/export-patchq: ensure all export patches with same diff-algorithm
...
Se it explicitly to myres, the current (since quite a bit) default of
git, to avoid noise in exports, just because another developer
prefers another algorithm here.
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-09-30 07:29:08 +02:00
Thomas Lamprecht
e92f137375
bump version to 5.0.21-6
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-09-27 17:17:20 +02:00
Thomas Lamprecht
fee072e1ea
bump version to 5.0.21-5
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-09-27 15:58:27 +02:00
Thomas Lamprecht
97f24aae50
bump version to 5.0.21-4
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-09-20 11:55:44 +02:00
Thomas Lamprecht
ef257cb1b2
config: enable CONFIG_HYPERV
...
mostly for the PMG as it could run in a HyperV based hypervisor
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-09-20 11:04:37 +02:00
Thomas Lamprecht
4b576962e5
bump version to 5.0.21-3
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-09-05 13:56:36 +02:00
Thomas Lamprecht
9a85bc6293
bump version to 5.0.21-2
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-08-28 16:00:58 +02:00
Thomas Lamprecht
034edf65bb
bump version to 5.0.21-1
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-08-20 17:19:08 +02:00
Fabian Grünbichler
e8791ba811
bump version to 5.0.18-3
...
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2019-08-08 09:05:43 +02:00
Fabian Grünbichler
72fa067b74
bump version to 5.0.18-2
...
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2019-08-05 10:28:17 +02:00
Fabian Grünbichler
77b2009b13
build: add ZFS 0.8 debhelper build-dependencies
...
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2019-08-05 10:27:56 +02:00
Thomas Lamprecht
65bbbdd0ae
bump version to 5.0.18-1
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-24 16:05:54 +02:00
Fabian Grünbichler
6c6eb8b0dd
fix #327 : downgrade dependency on grub-*
...
from Depends to Recommends, since we now have an alternate bootloader
setup for some scenarios. both our installer and Debian's default setup
still install Grub by default anyway, but this allows removal without
hacks in case such an alternate bootloader is used on the system.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2019-07-11 14:56:42 +02:00
Thomas Lamprecht
d036f79625
bump version to 5.0.15-1
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-03 10:52:17 +02:00
Thomas Lamprecht
4daae19966
bump version to 5.0.12-1
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-06-18 07:44:10 +02:00
Thomas Lamprecht
fdf82cf531
bump version to 5.0.1-2
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-05-25 18:54:06 +02:00
Stoiko Ivanov
1de1353133
adapt debian/rules to ZFS 0.8 structure
...
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2019-05-24 14:59:47 +02:00
Thomas Lamprecht
2135c72329
remove gcc check completely, we have build dependencies for that
...
RETPOLINE is now for sure included, further as this is build through
buildpackage the build dependencies are checked
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-05-22 15:42:57 +02:00
Thomas Lamprecht
b8e09c3c69
support gcc 8.3 from buster
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-05-22 15:42:57 +02:00
Thomas Lamprecht
3f2c044fbf
bump version to 5.0.8-1
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-05-22 15:42:57 +02:00
Thomas Lamprecht
d6d2efea0c
replace obsoleted 'silentoldconfig' kernel make target with 'syncconfig'
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-05-22 15:42:57 +02:00
Thomas Lamprecht
d7b1c00b9d
find-firmware: check for 5.0 versioned directory
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-05-22 15:42:57 +02:00
Thomas Lamprecht
1e51973430
use in tree igb and e1000 module for now
...
the current OOT are not compatible with 5.0 and we want to obsolete
them anyway sooner or later
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-05-22 15:42:57 +02:00
Thomas Lamprecht
a06fbd44c7
bump version to 4.15.18-40
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-05-21 20:43:47 +02:00
Thomas Lamprecht
afc295f5e9
bump version to 4.15.18-39
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-05-15 08:57:38 +02:00
Thomas Lamprecht
8ba6ec4ad4
bump version to 4.15.18-38
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-04-30 13:52:32 +02:00
Thomas Lamprecht
90eff7b943
bump version to 4.15.18-37
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-04-13 22:00:24 +02:00
Thomas Lamprecht
a4ea6fb33c
bump version to 4.15.18-36
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-04-11 13:06:49 +02:00
Thomas Lamprecht
61f33dc8f2
bump version to 4.15.18-35
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-03-13 08:40:24 +01:00
Thomas Lamprecht
9bd09ca97a
bump version to 4.15.18-34
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-02-25 15:31:07 +01:00
Thomas Lamprecht
c47b16cb68
bump version to 4.15.18-33
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-02-06 11:43:04 +01:00
Thomas Lamprecht
4adf30b011
bump version to 4.15.18-32
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-01-19 12:11:14 +01:00
Thomas Lamprecht
da7def12fd
bump version to 4.15.18-31
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-01-14 14:00:25 +01:00
Stoiko Ivanov
3db86f1084
bump version to 4.15.18-30
...
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2018-11-15 13:33:28 +01:00
Thomas Lamprecht
89a09f9102
bump version to 4.15.18-29
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2018-11-12 16:01:40 +01:00
Thomas Lamprecht
645ef9e161
bump version to 4.15.18-28
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2018-10-31 16:28:06 +01:00
Fabian Grünbichler
03f37cb2bb
d/control: update build-depends
...
with the help of "dpkg-checkdep" to mimic the current build-environment
asciidoc-base: used by perf man pages
automake: used by ZFS/SPL (among other things)
cpio: used in debian/rules
debhelper: used in debian/rules
kmod: used in debian/rules (depmod)
libdw-dev,libelf-dev: used for unwinder
libnuma-dev: used by perf
libslang2-dev: used by perf tui
python-minimal: used by perf
zlib1g-dev: used by perf
thank you Thomas for additional review and extensive discussions
regarding what to include (or not ;))!
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Reviewed-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2018-10-12 10:41:58 +02:00
Thomas Lamprecht
b8885eda75
bump version to 4.15.18-27
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2018-10-10 14:23:25 +02:00
Fabian Grünbichler
9929833ca3
d/control: add missing build dependency
...
libpve-common-perl is used by debian/scripts/abi-generate
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2018-10-05 14:10:05 +02:00
Thomas Lamprecht
3f14e60dfb
bump version to 4.15.18-26
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2018-10-04 11:38:16 +02:00
Thomas Lamprecht
70b29d94c2
bump version to 4.15.18-25
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2018-10-03 15:42:30 +02:00
Thomas Lamprecht
83848cd1db
bump version to 4.15.18-24
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2018-09-17 11:46:43 +02:00
Thomas Lamprecht
8cfff66691
bump version to Ubuntu-4.15.0-34.37
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2018-08-30 13:05:06 +02:00
Thomas Lamprecht
2b76f08c16
bump version to 4.15.18-22
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2018-08-24 11:13:18 +02:00
Thomas Lamprecht
0fbf7de6c8
bump version to 4.15.18-21
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2018-08-23 11:50:21 +02:00
Stoiko Ivanov
1bffa5165f
bump version to 4.15.18-20
...
and bump ABI/KREL
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2018-08-16 13:21:59 +02:00
Dietmar Maurer
b6fe45e6d5
bump version to 4.15.18-19
2018-08-13 07:51:40 +02:00
Stoiko Ivanov
80a7ba6436
bump version to 4.15.18-18
...
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2018-08-08 12:10:37 +02:00
Thomas Lamprecht
eea72d300f
bump version to 4.15.18-17
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2018-07-30 12:55:38 +02:00
Thomas Lamprecht
64fc80e3b7
bump version to 4.15.18-16
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2018-07-23 15:59:51 +02:00
Thomas Lamprecht
75af7c34e3
bump version to 4.15.18-15
2018-07-04 15:44:15 +02:00
Thomas Lamprecht
b5e86998ea
use intree NIC driver for 10G IXGBE drivers
...
no problems had been reported with it, in contrary to igb and e1000e
so use the newer and better supported in tree driver.
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2018-07-04 15:42:14 +02:00
Thomas Lamprecht
a6ee60dcae
bsys: export-patchqueue: do not print signature
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2018-07-04 11:50:30 +02:00
Thomas Lamprecht
93a8ca28fc
bump version to 4.15.17-14
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2018-06-27 17:48:40 +02:00
Thomas Lamprecht
d069b13f84
bump version to 4.15-13
2018-06-18 17:18:35 +02:00
Thomas Lamprecht
4379131c79
bump version to 4.15-12
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2018-06-08 12:01:57 +02:00
Thomas Lamprecht
515973635b
renenable out-of-tree intel ethernet driver (e1000e, igb, ixgbe)
...
There where just to much issues with the 4.15 in tree drivers for our
users [1]. The updated igb and ixgbe drivers are compatible with
4.15, the e1000e driver needed to be ported to the new internal
kernel timer API, which is pretty straight forward.
[1]: https://forum.proxmox.com/threads/4-15-based-test-kernel-for-pve-5-x-available.42097/page-5
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2018-06-08 11:58:18 +02:00
Thomas Lamprecht
73cf4c7faf
d/control: automatically replace linux tools maj.min version
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2018-05-30 08:25:19 +02:00
Stoiko Ivanov
875f9e81f4
d/rules: don't remove perf.1 manpage
...
the one in linux-base refers to the versioned one
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2018-05-30 08:24:21 +02:00
Stoiko Ivanov
86c0946a20
d/rules: add version to perf man pages
...
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2018-05-30 08:24:16 +02:00
Stoiko Ivanov
5fd5ec0e77
refactor variable names and remove hardcoded major.minor version
...
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2018-05-30 08:24:13 +02:00
Thomas Lamprecht
a74fe23cf8
buildsys: abi-generate: add usage output
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2018-05-25 15:08:13 +02:00
Thomas Lamprecht
cd69f5e8ed
bump version to 4.15-10
2018-05-23 13:16:05 +02:00
Fabian Grünbichler
7361c770af
bump version to 4.15-9
2018-05-09 13:32:39 +02:00
Fabian Grünbichler
d72363003b
build: refactor header build
...
to also include tools and scripts like objtool, which are now needed for
external module building
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2018-05-09 13:12:07 +02:00
Thomas Lamprecht
9552bb6dee
bump version to 4.15-8
2018-05-04 13:14:39 +02:00
Fabian Grünbichler
7cbdd0b90d
d/rules: check for accidental perf linkage
...
with libraries that are not GPL-2-only compatible, fix previously typoed
variable, and add build-dep on libiberty-dev for CPLUS demangling.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2018-04-25 13:27:39 +02:00
Fabian Grünbichler
29917645ac
d/rules: install perf man pages
...
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2018-04-25 07:20:24 +02:00
Fabian Grünbichler
7f6fc591c9
d/rules: don't strip headers package
...
we don't want to debug the contained helper binaries ;)
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2018-04-25 07:20:24 +02:00
Fabian Grünbichler
7a315510b5
d/rules: reformat header collection
...
for better readability and to reduce future churn
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2018-04-25 07:20:24 +02:00
Thomas Lamprecht
ff2994e82d
d/control: add some missing build dependencies
...
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
and wrap-and-sort them
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2018-04-24 12:01:10 +02:00
Fabian Grünbichler
c8a6fd7804
debian/scripts: add import-upstream-tag
...
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2018-04-24 09:09:16 +02:00
Fabian Grünbichler
319569e4be
debian/scripts: add patchqueue scripts
...
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2018-04-24 09:09:16 +02:00
Fabian Grünbichler
679a836a3a
bump version to 4.15-7, bump ABI to 4.15.17-1-pve
...
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2018-04-20 14:55:21 +02:00
Fabian Grünbichler
f060990aa5
bump version to 4.15-6
2018-04-09 12:25:32 +02:00
Fabian Grünbichler
4afcfa3a6f
bump version to 4.15-5, bump ABI to 4.15.15-1-pve
...
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2018-04-04 15:43:07 +02:00
Fabian Grünbichler
4794f3cd69
bump version to 4.15.10-4
2018-03-28 15:47:55 +02:00
Fabian Grünbichler
498bdfe5e5
bump version to 4.15.10-3
2018-03-28 11:07:58 +02:00
Fabian Grünbichler
330d1c9ea1
bump version to 4.15-2, bump ABI to 4.15.10-1-pve
...
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2018-03-22 11:12:48 +01:00
Fabian Grünbichler
4062c10346
scripts/abi-check: don't fail after ABI bump
...
this allows automatically running abi-check in non-fatal mode if an ABI
bump has just been done.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2018-03-22 11:12:48 +01:00
Fabian Grünbichler
40af2e3b0f
d/scripts/abi-generate: add new helper script
...
and use it in d/rules to generate the checked ABI file.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2018-03-22 11:12:48 +01:00
Fabian Grünbichler
6247b79f32
bump version to 4.15.3-1, bump ABI to 4.15.3-1-pve
...
and include updated fwlist
2018-03-09 15:43:24 +01:00
Fabian Grünbichler
2454b79d7a
switch to in-tree intel drivers
...
as the out-of-tree ones are not compatible with 4.15
2018-03-09 15:28:03 +01:00
Fabian Grünbichler
1e99f45be0
build: replace 4.13 with 4.15
...
as well as artful with bionic, and reset KREL/PKGREL accordingly
2018-03-09 14:47:21 +01:00
Fabian Grünbichler
320c823e91
bump version to 4.13.13-42
2018-03-09 11:57:49 +01:00
Fabian Grünbichler
66aed5b89f
build: remove exported variables
...
in favor of generated rules.d snippet. this allows calling
dpkg-buildpackage in the build directory manually without setting up the
environment to match.
2018-03-09 11:56:22 +01:00
Fabian Grünbichler
e96d2ab3a1
build: move build and packaging to debian/
...
the top-level Makefile now only prepares the build directory by copying
and patching sources and generating the real files from debian/*.in
the actual build and packaging happens in debian/rules
2018-03-09 09:19:58 +01:00
Fabian Grünbichler
812cbfc144
debian/compat: set to 10
2018-03-09 09:19:58 +01:00
Fabian Grünbichler
b9b3ee7810
debian/copyright: whitespace cleanup
2018-03-09 09:19:58 +01:00
Fabian Grünbichler
f3baf3769b
d/control: add source section, cleanup
...
remove variables that are set by dpkg-buildpackage automatically, and
wrap-and-sort the whole thing
2018-03-09 09:19:58 +01:00
Fabian Grünbichler
2d62d8a400
build: move/merge files
...
the control files were merged as appropriate, the rest are plain
renames.
2018-03-09 09:19:58 +01:00