← Back to branch summary

~ubuntu-branches/ubuntu/quantal/xdm/quantal

« back to all changes in this revision

Viewing changes to debian/xsfbs/xsfbs.mk

  • Committer: Bazaar Package Importer
  • Author(s): Julien Cristau
  • Date: 2010-04-19 20:55:56 UTC
  • mfrom: (1.1.9 upstream) (9.2.1 sid)
  • mto: This revision was merged to the branch mainline in revision 12.
  • Revision ID: james.westby@ubuntu.com-20100419205556-9tgxo1rdu2c7vy8y
Tags: 1:1.1.10-1
http://bugs.debian.org/372114
http://bugs.debian.org/525596
http://bugs.debian.org/554839
http://bugs.debian.org/444483
http://bugs.debian.org/510085
* New upstream release.
  - don't delete the pid file from child xdm processes, closes: #372114
  - clear the "Login incorrect" message properly on next login,
    closes: #525596.  Thanks, Martin Dickopp!
  - fix xdmcp with net.ipv6.bindv6only=1
* Patches merged upstream:
  - 02_xdm_zombie_no_error.diff
  - 15_xdm_openfiles.diff
  - 90_xdm_write_dummy_auth.diff
  - 91_xdm_saveserverauth_logging.diff
  - log_sourcing_better.diff
  - selinux_support.diff
  - storepid_rewrite.diff
* 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!
* debian/rules: kill gratuitous uses of $(CURDIR).
* debian/xdm.pam: @include common-* after pam_env and friends, so that we
  still set env vars if e.g. common-auth contains a 'sufficient' module
  (closes: #444483).
* debian/xdm.init: add Short-Description (closes: #510085).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/xsfbs/xsfbs.mk
110
110
.PHONY: prepare
111
111
stampdir_targets+=prepare
112
112
prepare: $(STAMP_DIR)/prepare
113
 
$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
 
113
$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts
114
114
        >$@
115
115
 
116
 
.PHONY: log
117
 
stampdir_targets+=log
118
 
log: $(STAMP_DIR)/log
119
 
$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
 
116
.PHONY: logdir
 
117
stampdir_targets+=logdir
 
118
logdir: $(STAMP_DIR)/logdir
 
119
$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir
120
120
        mkdir -p $(STAMP_DIR)/log
 
121
        >$@
121
122
 
122
123
# Apply all patches to the upstream source.
123
124
.PHONY: patch
145
146
 
146
147
# Revert all patches to the upstream source.
147
148
.PHONY: unpatch
148
 
unpatch: $(STAMP_DIR)/log
 
149
unpatch: $(STAMP_DIR)/logdir
149
150
        rm -f $(STAMP_DIR)/patch
150
151
        @echo -n "Unapplying patches..."; \
151
152
        if $(QUILT) applied >/dev/null 2>/dev/null; then \
252
253
        #                                    debian/*.prerm
253
254
        >$@
254
255
 
255
 
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
 
256
# Compute dependencies for drivers
 
257
#
 
258
VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
 
259
INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null)
 
260
 
 
261
# these two can be removed post-squeeze
256
262
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
257
263
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
258
 
SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
259
264
VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
260
265
INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
 
266
 
261
267
ifeq ($(PACKAGE),)
262
268
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
263
269
endif
264
270
 
265
271
.PHONY: serverabi
266
272
serverabi: install
267
 
ifeq ($(SERVERMINVERS),)
268
 
        @echo error: xserver-xorg-dev needs to be installed
 
273
ifeq ($(VIDEODEP),)
 
274
        @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed'
269
275
        @exit 1
270
276
else
271
 
        echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
 
277
        echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars
 
278
        echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars
 
279
        # the following is there for compatibility...
272
280
        echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
273
281
        echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
 
282
        echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars
274
283
endif
275
284
 
276
285
# vim:set noet ai sts=8 sw=8 tw=0: