debian/changelog | 10 +- debian/local/dexconf | 12 --- debian/rules | 7 + debian/x11-common.manpages | 1 debian/xserver-xorg.manpages | 1 debian/xserver-xorg.postinst.in | 5 - debian/xserver-xorg.templates | 18 ---- debian/xsfbs/xsfbs-autoreconf.mk | 150 --------------------------------------- debian/xsfbs/xsfbs.mk | 80 -------------------- 9 files changed, 15 insertions(+), 269 deletions(-)
New commits: commit 29fbea0762b52a823a286a3ea3a8e2a30b638453 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sat May 10 21:49:48 2008 +0200 Also move the dexconf manpage from x11-common to xserver-xorg. diff --git a/debian/changelog b/debian/changelog index c430c88..f90f677 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,7 +28,7 @@ xorg (1:7.3+11) UNRELEASED; urgency=low This should prevent remote nss lookups and timeouts in some environments. Closes: #407788. * Add Kurdish debconf translation from Erdal Ronahi (closes: #477492). - * Move dexconf from x11-common to xserver-xorg. + * Move dexconf and its manpage from x11-common to xserver-xorg. * Remove pre-dependency on x11-common from xserver-xorg. * Drop the xlibs-data and xlibs-static-dev transitional packages. These were kept around for the sarge->etch upgrade, so it's past time they went diff --git a/debian/x11-common.manpages b/debian/x11-common.manpages index 5e6aced..707f2c4 100644 --- a/debian/x11-common.manpages +++ b/debian/x11-common.manpages @@ -1,4 +1,3 @@ -debian/local/dexconf.1 debian/local/Xwrapper.config.5 debian/local/Xsession.5 debian/local/Xsession.options.5 diff --git a/debian/xserver-xorg.manpages b/debian/xserver-xorg.manpages new file mode 100644 index 0000000..9df885d --- /dev/null +++ b/debian/xserver-xorg.manpages @@ -0,0 +1 @@ +debian/local/dexconf.1 commit 94e76fc9cd31cc3888d8a5c9c6c1051b3ab183b3 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sat May 10 21:42:01 2008 +0200 Run dh_installman in binary-indep as well, as x11-common is now built there. diff --git a/debian/changelog b/debian/changelog index 119425a..c430c88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,8 @@ xorg (1:7.3+11) UNRELEASED; urgency=low don't ask about it and don't add the corresponding option in the generated xorg.conf. The option is on by default, and the only thing we used to do in dexconf is to explicitly enable it anyway. + * Run dh_installman in binary-indep as well, as x11-common is now built + there. [ Christian Perrier ] * Debconf translations: diff --git a/debian/rules b/debian/rules index 91a85a5..2bc22d5 100755 --- a/debian/rules +++ b/debian/rules @@ -94,6 +94,7 @@ binary-indep: build install dh_installdocs dh_installchangelogs dh_installinit -px11-common -u'start 70 S .' + dh_installman dh_link dh_compress dh_fixperms commit 7680630bec4e7a7098aa47c8b1c9cc591483d9f1 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sat May 10 21:40:08 2008 +0200 Handle x11-common in binary-indep instead of binary-arch x11-common is now arch:all, so the special handling for it in debian/rules needs to be done in -indep. diff --git a/debian/rules b/debian/rules index 28c4755..91a85a5 100755 --- a/debian/rules +++ b/debian/rules @@ -93,9 +93,12 @@ binary-indep: build install dh_installdirs dh_installdocs dh_installchangelogs + dh_installinit -px11-common -u'start 70 S .' dh_link dh_compress dh_fixperms + chown root:root debian/x11-common/etc/X11/Xsession + chmod 755 debian/x11-common/etc/X11/Xsession dh_installdeb dh_gencontrol -- -VF:XServer-Xorg-Detect-Depends=$(XSERVER_XORG_DETECT_DEPENDS) dh_md5sums @@ -111,14 +114,11 @@ binary-arch: build install dh_installdirs dh_installdocs dh_installman - dh_installinit -px11-common -u'start 70 S .' dh_installchangelogs dh_link dh_strip dh_compress dh_fixperms - chown root:root debian/x11-common/etc/X11/Xsession - chmod 755 debian/x11-common/etc/X11/Xsession chown root:root debian/xserver-xorg/usr/bin/X chmod ug+s debian/xserver-xorg/usr/bin/X dh_installdeb commit 9015e492693df06051980dffcd1ac598a6869a91 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sat May 10 21:38:12 2008 +0200 Remove all traces of the emulate3buttons stuff dexconf, xserver-xorg.postinst: the emulate3buttons question is gone, don't ask about it and don't add the corresponding option in the generated xorg.conf. The option is on by default, and the only thing we used to do in dexconf is to explicitly enable it anyway. diff --git a/debian/changelog b/debian/changelog index f932937..119425a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,10 @@ xorg (1:7.3+11) UNRELEASED; urgency=low away (closes: #477547, #477550). * xserver-xorg-video-newport is mips-only, don't depend on it on other architectures. + * dexconf, xserver-xorg.postinst: the emulate3buttons question is gone, + don't ask about it and don't add the corresponding option in the generated + xorg.conf. The option is on by default, and the only thing we used to do + in dexconf is to explicitly enable it anyway. [ Christian Perrier ] * Debconf translations: diff --git a/debian/local/dexconf b/debian/local/dexconf index fae07a5..9f2f258 100644 --- a/debian/local/dexconf +++ b/debian/local/dexconf @@ -208,23 +208,13 @@ printf "EndSection\n" >&4 ### MOUSE / INPUTDEVICE -DO_EMULATE3BUTTONS= - -fetch xserver-$SERVER/config/inputdevice/mouse/emulate3buttons -if [ "$RET" = "true" ]; then - DO_EMULATE3BUTTONS=true -fi - exec 4>"$DEXCONFTMPDIR/InputDeviceMouse" cat >&4 <<SECTION Section "InputDevice" Identifier "Configured Mouse" Driver "mouse" +EndSection SECTION -if [ -n "$DO_EMULATE3BUTTONS" ]; then - printf "\tOption\t\t\"Emulate3Buttons\"\t\"true\"\n" >&4 -fi -printf "EndSection\n" >&4 ### DEVICE diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in index 7627176..2ce2a06 100644 --- a/debian/xserver-xorg.postinst.in +++ b/debian/xserver-xorg.postinst.in @@ -862,10 +862,6 @@ MAY_BE_NULL=yes auto_answer validate_string_db_input "$(priority_ceil low)" xser MAY_BE_NULL=yes auto_answer validate_string_db_input "$(priority_ceil $PRIORITY)" xserver-xorg/config/inputdevice/keyboard/options "$XKBOPTIONS" - -auto_answer db_input "$(priority_ceil low)" xserver-xorg/config/inputdevice/mouse/emulate3buttons true || debug_report_status "db_input $(priority_ceil low) xserver-xorg/config/inputdevice/mouse/emulate3buttons" "$?" -db_go - # files and dri sections if [ -e "$CONFIG_AUX_DIR/.migrateconfig" ]; then AUTODETECT_VIDEO="yes" @@ -912,6 +908,7 @@ if [ -n "$UPGRADE" ] && dpkg --compare-versions "$2" le "1:7.3+5"; then "xserver-xorg/config/display/default_depth" \ "xserver-xorg/config/inputdevice/mouse/port" \ "xserver-xorg/config/inputdevice/mouse/protocol" \ + "xserver-xorg/config/inputdevice/mouse/emulate3buttons" \ "xserver-xorg/config/modules" \ "xserver-xorg/config/monitor/default-identifier" \ "xserver-xorg/config/monitor/identifier" \ commit c8e5683332e2614a67abdf04b48c9cfefac3bc24 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sat May 10 21:16:30 2008 +0200 Revert "* Re-add accidentally removed emulate3buttons question. This should prevent" The Emulate3Buttons option is on by default, so there's no point asking if we're only going to explicitely enable it anyway. This reverts commit 2187535f5d8c9641fc4f9099ba18b774551a1735. diff --git a/debian/changelog b/debian/changelog index d4142a4..f932937 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,6 @@ xorg (1:7.3+11) UNRELEASED; urgency=low [ David Nusinow ] * Add radeonhd to the -video-all depends - * Re-add accidentally removed emulate3buttons question. This should prevent - the install from choking when it gets to this point. [ Brice Goglin ] * Remove $named from the Should-Start/Stop LSB dependency info of the diff --git a/debian/xserver-xorg.templates b/debian/xserver-xorg.templates index 049d772..550f7f7 100644 --- a/debian/xserver-xorg.templates +++ b/debian/xserver-xorg.templates @@ -181,21 +181,3 @@ _Description: Autodetect keyboard layout? . Choose this option if you want the keyboard layout to be redetected. Do not choose it if you want to keep your current layout. - -Template: xserver-xorg/config/inputdevice/mouse/emulate3buttons -Type: boolean -Default: true -_Description: Emulate 3 button mouse? - Most programs in the X Window System expect the mouse to have 3 buttons - (left, right, and middle). Mice with only 2 buttons can emulate the presence - of a middle button by treating simultaneous clicks or drags of the left and - right buttons as middle button events. - . - This option may also be used on mice with 3 or more buttons; the middle - button will continue to work normally. - . - Note that mouse buttons in excess of five (counting a scroll wheel as two - buttons, one each for "up" and "down", and a third if the wheel "clicks") are - not yet supported with this configuration tool. - - commit c87ea43906787791a87a659c0a9d6312945ffb32 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sun Apr 13 03:12:18 2008 +0200 Remove xsfbs-autoreconf.mk It has never been used, and that doesn't look likely to change. diff --git a/debian/xsfbs/xsfbs-autoreconf.mk b/debian/xsfbs/xsfbs-autoreconf.mk deleted file mode 100644 index dce8fc8..0000000 --- a/debian/xsfbs/xsfbs-autoreconf.mk +++ /dev/null @@ -1,150 +0,0 @@ -#!/usr/bin/make -f -# $Id$ - -# Automagical conversion of autoreconf results into quilt patches. - -# Copyright 2006 Eugene Konev -# -# Licensed under the GNU General Public License, version 2. See the file -# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>. - -# The idea behind this is storing changes produced by autoreconf as a -# separate patch on quilt stack (on top of stack actually). -# The only usable target here is 'autoreconf`. Other targets are not -# supposed to be called directly. DO NOT invoke them, unless you know what -# you are doing. -# The autoreconf target will check if files with names in $(RECONF_CHECKFILES) -# were changed during patching (from upstream version or from previously -# autoreconfed version) and call actual autoreconfing if they were. -# The actual autoreconfing target (doautoreconf) WILL FAIL after -# calling autoreconf and pushing changes into quilt stack by design. It -# should never be invoked by automatic build process. -# The proposed use is adding autoreconf into clean's prerequisites before -# xsfclean like: -# - clean: xsfclean -# + clean: autoreconf xsfclean -# This will ensure it is called when you build package with dpkg-buildpackage. - -# This dir will be used for producing diff of autoreconfed tree -RECONF_DIR := xsfautoreconf - -# This files will be checked for changes -RECONF_CHECKFILES += configure.ac Makefile.am - -# This files will not be hardlinked but copied -RECONF_NOLINKFILES += aclocal.m4 - -# This files/dirs will be pruned after autoreconf run -RECONF_PRUNEFILES += autom4te.cache config.h.in~ aclocal.m4~ - -# Internal target. Never invoke directly. -stampdir_target+=check.md5sum -$(STAMP_DIR)/check.md5sum: - dh_testdir - $(MAKE) -f debian/rules prepare - for F in $(RECONF_CHECKFILES); do \ - find . -wholename ./$(STAMP_DIR) -prune -o -name $$F -print | \ - LC_ALL=C sort | xargs --no-run-if-empty md5sum >>$@; \ - done - -# Internal target. Never invoke directly. -$(STAMP_DIR)/clean.md5sum: - dh_testdir - $(MAKE) -f debian/rules unpatch - rm -f $(STAMP_DIR)/check.md5sum - $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum - mv $(STAMP_DIR)/check.md5sum $@ - -# Internal target. Never invoke directly. -debian/patches/patched.md5sum: - dh_testdir - [ -f $(STAMP_DIR)/clean.md5sum ] || \ - $(MAKE) -f debian/rules $(STAMP_DIR)/clean.md5sum - - $(MAKE) -f debian/rules patch - rm -f $(STAMP_DIR)/check.md5sum - $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum - if ! diff $(STAMP_DIR)/clean.md5sum \ - $(STAMP_DIR)/check.md5sum > /dev/null; then \ - $(MAKE) -f debian/rules doautoreconf; \ - else \ - mv $(STAMP_DIR)/check.md5sum $@; \ - fi - -# Internal target. Never invoke directly. -,PHONY: doautoreconf -doautoreconf: patch - quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1 || true - if quilt applied | grep ^autoreconf.diff$$ > /dev/null; then \ - quilt pop -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \ - quilt rename -p autoreconf.diff autoreconf-old.diff \ - >>$(STAMP_DIR)/log/autoreconf 2>&1; \ - quilt delete autoreconf-old.diff >>$(STAMP_DIR)/log/autoreconf 2>&1; \ - quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \ - fi - - if [ -e $(RECONF_DIR) ]; then \ - echo "ERROR: $(RECONF_DIR) already exists. Cleanup by hand"; \ - exit 1; \ - fi - - mkdir -p $(RECONF_DIR)/before - find . -maxdepth 1 -mindepth 1 ! -wholename ./$(RECONF_DIR) \ - -a ! -wholename ./debian -a ! -wholename ./patches \ - -a ! -wholename ./.pc -a ! -wholename ./$(STAMP_DIR) | \ - xargs -i{} cp -al {} $(RECONF_DIR)/before/ - - for F in $(RECONF_PRUNEFILES); do \ - find $(RECONF_DIR)/before -name $$F -print | \ - xargs --no-run-if-empty rm -r; \ - done - - cp -al $(RECONF_DIR)/before $(RECONF_DIR)/after - - for F in $(RECONF_NOLINKFILES); do \ - find . -wholename ./$(RECONF_DIR) -prune -o -wholename ./debian \ - -prune -o -wholename ./$(STAMP_DIR) -prune -o -name $$F \ - -print | \ - xargs --no-run-if-empty -i{} cp --remove-destination {} \ - $(RECONF_DIR)/after/{}; \ - done - - cd $(RECONF_DIR)/after && autoreconf -v --install && \ - for F in $(RECONF_PRUNEFILES); do \ - find . -name $$F -print | \ - xargs --no-run-if-empty rm -r; \ - done - - cd $(RECONF_DIR) && diff -Nru before after > autoreconf.diff || true - - quilt import $(RECONF_DIR)/autoreconf.diff \ - >>$(STAMP_DIR)/log/autoreconf 2>&1 - - mv $(STAMP_DIR)/check.md5sum debian/patches/patched.md5sum - - rm -r $(RECONF_DIR) && rm -f patches/autoreconf-old.diff - - @echo - @echo "****************************************************************" - @echo " This target is made to fail INTENTIONALLY. It should NEVER " - @echo " be invoked during automatic builds. " - @echo - @echo " This target was invoked because you added/removed/changed " - @echo " patches which modify either configure.ac or Makefile.am and, " - @echo " thus, require autoreconf run. And all autoreconfing should " - @echo " happen before uploading. " - @echo - @echo " (See also debian/xsfbs/xsfbs-autoreconf.mk) " - @echo - @echo " If you see this message, autoreconfing actually SUCCEEDED, " - @echo " and your build should finish successfully, when rerun. " - @echo "****************************************************************" - @echo - exit 1; - -.PHONY: autoreconf -autoreconf: debian/patches/patched.md5sum patch $(STAMP_DIR)/check.md5sum - if ! diff $(STAMP_DIR)/check.md5sum \ - debian/patches/patched.md5sum > /dev/null; then \ - $(MAKE) -f debian/rules doautoreconf; \ - fi diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 51fa145..6582a42 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -307,6 +307,4 @@ else echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars endif -include debian/xsfbs/xsfbs-autoreconf.mk - # vim:set noet ai sts=8 sw=8 tw=0: commit bef8b301bf7649b4156bef2dc26ebf9f7f9244ad Author: Julien Cristau <[EMAIL PROTECTED]> Date: Fri Mar 21 11:53:16 2008 +0100 xsfbs.mk: make 'serverabi' depend on 'install' See bug#471193, thanks to Bernhard R. Link <[EMAIL PROTECTED]> diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 4822173..51fa145 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -297,7 +297,7 @@ PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif .PHONY: serverabi -serverabi: +serverabi: install ifeq ($(SERVERMINVERS),) @echo error: xserver-xorg-dev needs to be installed @exit 1 commit 844199da71f29556be3436fa0fead2f0cc0bfc1b Author: David Nusinow <[EMAIL PROTECTED]> Date: Tue Jan 8 20:18:49 2008 -0500 Kill the manifest code. It served its purpose for the monolith and is now dead. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index b8f7afd..4822173 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -196,7 +196,6 @@ xsfclean: cleanscripts unpatch rm -rf $(STAMP_DIR) $(SOURCE_DIR) rm -rf imports dh_clean debian/shlibs.local \ - debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new \ debian/po/pothead # Generate the debconf templates POT file header. @@ -209,58 +208,6 @@ debian/po/pothead: debian/po/pothead.in updatepo: debian/po/pothead debian/scripts/debconf-updatepo --pot-header=pothead --verbose -# Use the MANIFEST files to determine whether we're shipping everything we -# expect to ship, and not shipping anything we don't expect to ship. -.PHONY: check-manifest -stampdir_targets+=check-manifest -check-manifest: $(STAMP_DIR)/check-manifest -$(STAMP_DIR)/check-manifest: $(STAMP_DIR)/install - # Compare manifests. - (cd debian/tmp && find -type f | LC_ALL=C sort | cut -c3-) \ - >debian/MANIFEST.$(ARCH).new - # Construct MANIFEST files from MANIFEST.$(ARCH).in and - # MANIFEST.$(ARCH).all or MANIFEST.all. - if expr "$(findstring -DBuildFonts=NO,$(IMAKE_DEFINES))" \ - : "-DBuildFonts=NO" >/dev/null 2>&1; then \ - LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in >debian/MANIFEST.$(ARCH); \ - else \ - if [ -e debian/MANIFEST.$(ARCH).all ]; then \ - LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH).all >debian/MANIFEST.$(ARCH); \ - else \ - LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all >debian/MANIFEST.$(ARCH); \ - fi; \ - fi - # Confirm that the installed file list has not changed. - if [ -e debian/MANIFEST.$(ARCH) ]; then \ - if ! cmp -s debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new; then \ - diff -U 0 debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new || DIFFSTATUS=$$?; \ - case $${DIFFSTATUS:-0} in \ - 0) ;; \ - 1) if [ -n "$$IGNORE_MANIFEST_CHANGES" ]; then \ - echo 'MANIFEST check failed; ignoring problem because \$$IGNORE_MANIFEST_CHANGES set' >&2; \ - echo 'Please ensure that the package maintainer has an up-to-date version of the' >&2; \ - echo 'MANIFEST.$(ARCH).in file.' >&2; \ - else \ - echo 'MANIFEST check failed; please see debian/README' >&2; \ - exit 1; \ - fi; \ - ;; \ - *) echo "diff reported unexpected exit status $$DIFFSTATUS when performing MANIFEST check" >&2; \ - exit 1; \ - ;; \ - esac; \ - fi; \ - fi - >$@ - -# Because we build (and install) different files depending on whether or not -# any architecture-independent packages are being created, the list of files we -# expect to see will differ; see the discussion of the "build" target above. -.PHONY: check-manifest-arch check-manifest-indep -check-manifest-arch: IMAKE_DEFINES+= -DBuildSpecsDocs=NO -DBuildFonts=NO -DInstallHardcopyDocs=NO -check-manifest-arch: check-manifest -check-manifest-indep: check-manifest - # Remove files from the upstream source tree that we don't need, or which have # licensing problems. It must be run before creating the .orig.tar.gz. # commit 331c032528ba1faebef1d8eaa56db47f533f0426 Author: David Nusinow <[EMAIL PROTECTED]> Date: Sat Sep 22 23:49:11 2007 -0400 Remove make-orig-tar-gz target This target wasn't kept up to date and was totally broken for the git world. The way we use git has made this target pretty well impossible to use in any form, so it's been supersceded by a script that is currently located at http://people.debian.org/~dnusinow/xsf_scripts/git-make-orig-tar-gz diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index bfca7bb..b8f7afd 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -272,29 +272,6 @@ prune-upstream-tree: dh_testdir grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf -# Change to what should be the correct directory, ensure it is, and if -# so, create the .orig.tar.gz file. Exclude the debian directory and its -# contents, and any .svn directories and their contents (so that we can safely -# build an .orig.tar.gz from SVN checkout, not just an export). -# -# Note: This rule is for Debian package maintainers' convenience, and is not -# needed for conventional build scenarios. -# -# This rule *IS* the recommended method for creating a new .orig.tar.gz file, -# for the rare situations when one is needed. -.PHONY: make-orig-tar-gz -make-orig-tar-gz: clean prune-upstream-tree - ( cd .. \ - && if [ $(shell basename $(CURDIR)) != $(SOURCE_NAME)-$(NO_EPOCH_VER) ]; then \ - echo "Our current working directory has the wrong name. Renaming..." >&2; \ - mv $(CURDIR) $(SOURCE_NAME)-$(NO_EPOCH_VER); \ - fi; \ - tar --exclude=debian --exclude=debian/* \ - --exclude=.svn --exclude=.svn/* \ - -cf - $(SOURCE_NAME)-$(NO_EPOCH_VER) \ - | gzip -9 >$(SOURCE_NAME)_$(NO_EPOCH_VER).orig.tar.gz; \ - ) - # Verify that there are no offsets or fuzz in the patches we apply. # # Note: This rule is for Debian package maintainers' convenience, and is not -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]