Commit e1c63959 authored by Jon Severinsson's avatar Jon Severinsson
Browse files

Merge branch 'experimental' into bartholomea

parents 2e146efd 4a58b9c2
systemd (208-5tanglu3) staging; urgency=medium
* Move new manpages from systemd to libsystemd-*-dev as appropriate.
* Remove pre-generated rules and unit files in debian/rules clean target.
-- Jon Severinsson <jon@severinsson.net> Sat, 28 Jun 2014 23:00:00 +0200
systemd (208-5tanglu1) staging; urgency=medium
* Merge from Debian experimental, remaining changes:
......
......@@ -20,4 +20,5 @@ usr/share/man/man3/sd_is_fifo.3
usr/share/man/man3/sd_is_socket.3
usr/share/man/man3/sd_is_socket_inet.3
usr/share/man/man3/sd_is_socket_unix.3
usr/share/man/man3/sd_is_special.3
usr/share/man/man3/sd_is_mq.3
......@@ -29,4 +29,6 @@ usr/share/man/man3/sd_uid_get_sessions.3
usr/share/man/man3/sd_uid_get_seats.3
usr/share/man/man3/sd_seat_get_active.3
usr/share/man/man3/sd_seat_get_sessions.3
usr/share/man/man3/sd_seat_can_graphical.3
usr/share/man/man3/sd_seat_can_multi_session.3
usr/share/man/man3/sd_seat_can_tty.3
......@@ -79,6 +79,12 @@ override_dh_auto_clean:
rm -rf debian/install/
# remove pre-generated man pages so they are rebuilt
rm -f man/*.[13578]
# remove pre-generated rules and unit files so they are rebuilt
rm -f rules/99-systemd.rules \
units/emergency.service \
units/systemd-udevd.service \
units/systemd-udev-settle.service \
units/systemd-udev-trigger.service
# remove Python byte code files
rm -f *.pyc
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment