Skip to content

Commit f341586

Browse files
ubergeek42thijskh
authored andcommitted
Fix rules for domjudge 8.0
There's no more country flag readme, and the systemd unit file location has been fixed upstream to install in the correct location automatically.
1 parent 604cb84 commit f341586

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

debian/rules

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ clean:
4949
$(MAKE) distclean
5050
# Because the build process overwrites the docs in the tarball,
5151
# we remove everything so a second build does not fail. Missing
52-
# files are acceptable to dpkg-bp (but triggers warnings)
52+
# files are acceptable to dpkg-bp (but triggers warnings)
5353
rm -rf doc/manual/build/
5454
dh_clean
5555

@@ -71,7 +71,7 @@ install: build
7171

7272
# clean up docs
7373
cd $(DJDC)/usr/share/doc/domjudge-doc && \
74-
rm COPYING* README.md README.country_flags ChangeLog
74+
rm COPYING* README.md ChangeLog
7575

7676
# This must be shipped in domjudge-common
7777
rm $(DJDS)/etc/domjudge/genrestapicredentials \
@@ -100,9 +100,6 @@ install: build
100100
chgrp www-data $(DJDS)/var/log/domjudge/domserver $(DJDS)/var/cache/domjudge
101101
chmod 0770 $(DJDS)/var/log/domjudge/domserver $(DJDS)/var/cache/domjudge
102102

103-
# Fix correct systemd unit file location for Debian systems
104-
mv $(DJJH)/usr/lib/systemd/system $(DJJH)/lib/systemd/
105-
106103
# Fixup sudoers file to match our assumptions for user/chroot location
107104
sed -i 's#^root #domjudge #;s# root\\:# domjudge\\:#' $(DJJH)/etc/domjudge/sudoers-domjudge
108105
sed -i 's#/\*/proc#/var/lib/domjudge/chroot*/proc#' $(DJJH)/etc/domjudge/sudoers-domjudge

0 commit comments

Comments
 (0)