Skip to content

Commit aa3f5de

Browse files
benschermelJohnSully
authored andcommitted
adding dh_installsystemd
1 parent 9f7890c commit aa3f5de

File tree

5 files changed

+13
-10
lines changed

5 files changed

+13
-10
lines changed

pkg/deb/deb-buildsource.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ elif [ "$distributor" == "Ubuntu" ]; then
1919
fi
2020
codename=$(lsb_release --codename --short)
2121
date=$(date +%a," "%d" "%b" "%Y" "%T)
22-
pkg_name=keydb-$version$distname
22+
pkg_name=keydb-$majorv:$version$distname
2323

2424
# create build tree
2525
cd ../../../
@@ -30,7 +30,7 @@ cp -r debian $pkg_name/tmp
3030
cp master_changelog $pkg_name/tmp/debian/changelog
3131
mv ../../../keydb_$version.orig.tar.gz ./$pkg_name
3232
cd $pkg_name/tmp
33-
changelog_str="keydb ($version-$build$distname) $codename; urgency=medium\n\n * $version $changelog_comments \n\n -- Ben Schermel <[email protected]> $date +0000\n\n"
33+
changelog_str="keydb ($majorv:$version-$build$distname) $codename; urgency=medium\n\n * $version $changelog_comments \n\n -- Ben Schermel <[email protected]> $date +0000\n\n"
3434
if [ $# -eq 0 ]; then
3535
sed -i "1s/^/$changelog_str\n/" debian/changelog
3636
elif [ $# -eq 1 ] && [ "$1" != "None" ]; then
@@ -44,7 +44,11 @@ debuild -S -sa
4444
cd ../
4545

4646
# create pbuilder chrooted environment and build the deb package
47-
sudo pbuilder create --distribution $codename
47+
if [ "$codename" == "xenial" ]; then
48+
sudo pbuilder create --distribution $codename --othermirror "deb http://archive.ubuntu.com/ubuntu $codename universe multiverse"
49+
else
50+
sudo pbuilder create --distribution $codename
51+
fi
4852
sudo pbuilder --update
4953
sudo pbuilder --build *.dsc
5054

pkg/deb/debian/bin/generate-systemd-service-files

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ do
7878
#
7979
# $ systemctl start ${BINARY}@myname.service
8080
# $ keydb-cli -s /var/run/${NAME}-myname/${BINARY}.sock info | grep config_file
81-
#
82-
# -- Chris Lamb <[email protected]> Mon, 09 Oct 2017 22:17:24 +0100
8381
EOF
8482
fi
8583

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
debian/keydb-pro-sentinel.1
1+
debian/keydb-sentinel.1

pkg/deb/debian/keydb-server.manpages

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
debian/keydb-pro-server.1
1+
debian/keydb-server.1

pkg/deb/debian/rules

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@ endif
1818

1919
override_dh_auto_install:
2020
debian/bin/generate-systemd-service-files
21+
dh_installsystemd --restart-after-upgrade
2122

2223
override_dh_auto_test:
2324
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
2425
# Avoid race conditions in upstream testsuite.
25-
# ./runtest --clients 1 || true
26-
# ./runtest-cluster || true
27-
# ./runtest-sentinel || true
26+
./runtest || true
27+
./runtest-cluster || true
28+
./runtest-sentinel || true
2829
endif
2930

3031
override_dh_auto_clean:

0 commit comments

Comments
 (0)