summaryrefslogtreecommitdiffstats
path: root/merge.cc (unfollow)
Commit message (Collapse)AuthorFilesLines
2017-01-07Using consistent email address for all downstream work.Daniel Baumann4-34/+34
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2017-01-02Moving debian specific patches to subdirectory within patches directory.Daniel Baumann2-1/+1
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
2017-01-01Updating year in copyright information for 2017.Daniel Baumann1-1/+1
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
2016-12-10Releasing debian version 1.18-4.debian/1.18-4debian-stretchDaniel Baumann1-0/+9
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
2016-12-10Sorting alternatives handling in rules.Daniel Baumann1-3/+4
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
2016-12-10Updating upstream signing key.Daniel Baumann1-1/+0
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
2016-12-06Making maintainer scripts executable in source tree.Daniel Baumann2-0/+0
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
2016-10-15Releasing debian version 1.18-3.debian/1.18-3Daniel Baumann1-0/+7
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
2016-09-15Updating debhelper build-depends for version 10.Daniel Baumann1-1/+1
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
2016-07-03Releasing debian version 1.18-2.debian/1.18-2Daniel Baumann1-0/+11
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
2016-07-03Updating vcs fields.Daniel Baumann1-2/+2
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
2016-07-03Adding gpg verification to watch file.Daniel Baumann2-2/+29
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>