debian/changelog | 3 +++
debian/rules | 19 +++++++++++--------
debian/xdm.insserv | 1 +
debian/xdm.install | 1 +
4 files changed, 16 insertions(+), 8 deletions(-)
New commits:
commit 42f8059d6431fe59c265addd2b911fd2f9cff0da
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Apr 10 16:07:14 2010 +0200
debian/rules: kill gratuitous uses of $(CURDIR).
diff --git a/debian/changelog b/debian/changelog
index 81af5bb..035fe6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ xdm (1:1.1.10-1) UNRELEASED; urgency=low
* debian/rules: delete libtool m4 files on clean.
* Introduce virtual facility x-display-manager for insserv
(closes: #554839). Thanks, Jonas Meurer!
+ * debian/rules: kill gratuitous uses of $(CURDIR).
-- Julien Cristau <jcris...@debian.org> Sat, 10 Apr 2010 03:49:17 +0200
diff --git a/debian/rules b/debian/rules
index 058fb99..3282487 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,21 +85,21 @@ $(STAMP_DIR)/install: $(STAMP_DIR)/build
$(STAMP_DIR)/genscripts
cd $(BUILD_DIR) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
install -m 755 debian/local/Xstartup \
- $(CURDIR)/debian/tmp/etc/X11/xdm/
+ debian/tmp/etc/X11/xdm/
install -m 755 debian/local/Xreset \
- $(CURDIR)/debian/tmp/etc/X11/xdm/
+ debian/tmp/etc/X11/xdm/
install -m 755 debian/local/Xsetup \
- $(CURDIR)/debian/tmp/etc/X11/xdm/
+ debian/tmp/etc/X11/xdm/
install -m 644 debian/local/xdm.options \
- $(CURDIR)/debian/tmp/etc/X11/xdm/
- install -d $(CURDIR)/debian/tmp/usr/share/man/man5
+ debian/tmp/etc/X11/xdm/
+ install -d debian/tmp/usr/share/man/man5
install -m 644 debian/local/xdm.options.5 \
- $(CURDIR)/debian/tmp/usr/share/man/man5/
+ debian/tmp/usr/share/man/man5/
install -m 644 debian/local/debian.xpm \
- $(CURDIR)/debian/tmp/usr/share/X11/xdm/pixmaps/
+ debian/tmp/usr/share/X11/xdm/pixmaps/
install -m 644 debian/local/debianbw.xpm \
- $(CURDIR)/debian/tmp/usr/share/X11/xdm/pixmaps/
+ debian/tmp/usr/share/X11/xdm/pixmaps/
install -d debian/tmp/etc/insserv.conf.d
install -m 644 debian/xdm.insserv \
debian/tmp/etc/insserv.conf.d/xdm
commit c66528455c9c669e1a465dcfc5d0a03b57b72d08
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Apr 10 16:05:36 2010 +0200
Introduce virtual facility x-display-manager for insserv (closes: #554839).
Thanks, Jonas Meurer!
diff --git a/debian/changelog b/debian/changelog
index 8385976..81af5bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ xdm (1:1.1.10-1) UNRELEASED; urgency=low
* Xstartup: use id -u $USER, not id -u, since this script is run as root.
See #118677.
* debian/rules: delete libtool m4 files on clean.
+ * Introduce virtual facility x-display-manager for insserv
+ (closes: #554839). Thanks, Jonas Meurer!
-- Julien Cristau <jcris...@debian.org> Sat, 10 Apr 2010 03:49:17 +0200
diff --git a/debian/rules b/debian/rules
index 4247e52..058fb99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,6 +100,9 @@ $(STAMP_DIR)/install: $(STAMP_DIR)/build
$(STAMP_DIR)/genscripts
$(CURDIR)/debian/tmp/usr/share/X11/xdm/pixmaps/
install -m 644 debian/local/debianbw.xpm \
$(CURDIR)/debian/tmp/usr/share/X11/xdm/pixmaps/
+ install -d debian/tmp/etc/insserv.conf.d
+ install -m 644 debian/xdm.insserv \
+ debian/tmp/etc/insserv.conf.d/xdm
>$@
clean: xsfclean
diff --git a/debian/xdm.insserv b/debian/xdm.insserv
new file mode 100644
index 0000000..0d0087f
--- /dev/null
+++ b/debian/xdm.insserv
@@ -0,0 +1 @@
+$x-display-manager xdm
diff --git a/debian/xdm.install b/debian/xdm.install
index b6b967c..7481ddc 100644
--- a/debian/xdm.install
+++ b/debian/xdm.install
@@ -9,6 +9,7 @@ etc/X11/xdm/Xstartup
etc/X11/xdm/Xwilling
etc/X11/xdm/xdm-config
etc/X11/xdm/xdm.options
+etc/insserv.conf.d/xdm
usr/bin/xdm
usr/lib/X11/xdm/chooser
usr/share/X11/xdm/pixmaps/debianbw.xpm
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1o0bms-0004kw...@alioth.debian.org
