COPYING | 28 +++- ChangeLog | 44 ++++++ Makefile.am | 2 README | 13 +- configure.ac | 31 ---- debian/README.source | 73 +++++++++++ debian/changelog | 36 +++++ debian/control | 10 - debian/rules | 21 +-- debian/xsfbs/repack.sh | 32 +++++ debian/xsfbs/xsfbs.mk | 71 ++++------- debian/xsfbs/xsfbs.sh | 311 ------------------------------------------------- src/Makefile.am | 1 src/xf86PM.c | 79 ++++-------- src/xf86PM.h | 1 15 files changed, 293 insertions(+), 460 deletions(-)
New commits: commit f90e43d657ef046c4bd02114b1e843cb4b8d8086 Author: Cyril Brulebois <[email protected]> Date: Wed Oct 13 01:27:24 2010 +0200 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 807a3c9..93a917d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-input-penmount (1:1.4.1-3) UNRELEASED; urgency=low +xserver-xorg-input-penmount (1:1.4.1-3) experimental; urgency=low * Build against Xserver 1.9.1 rc1. - -- Cyril Brulebois <[email protected]> Wed, 13 Oct 2010 01:26:55 +0200 + -- Cyril Brulebois <[email protected]> Wed, 13 Oct 2010 01:27:19 +0200 xserver-xorg-input-penmount (1:1.4.1-2) unstable; urgency=medium commit 5e28f8a7e18a8a55f045fcc71b74a3ee1bdfa429 Author: Cyril Brulebois <[email protected]> Date: Wed Oct 13 01:27:07 2010 +0200 Build against Xserver 1.9.1 rc1. diff --git a/debian/changelog b/debian/changelog index c147ddd..807a3c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-penmount (1:1.4.1-3) UNRELEASED; urgency=low + + * Build against Xserver 1.9.1 rc1. + + -- Cyril Brulebois <[email protected]> Wed, 13 Oct 2010 01:26:55 +0200 + xserver-xorg-input-penmount (1:1.4.1-2) unstable; urgency=medium * Update xsfbs and use new ${xinpdriver:Depends} substvar. diff --git a/debian/control b/debian/control index fc21659..6c747cd 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected] Build-Depends: debhelper (>= 5), pkg-config, - xserver-xorg-dev (>= 2:1.7.6.901), + xserver-xorg-dev (>= 2:1.9.0.901), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, commit 084bf760ecf488bf747da870064d61953f193b0a Author: Julien Cristau <[email protected]> Date: Sun May 23 23:32:48 2010 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index f3b6adf..c147ddd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-input-penmount (1:1.4.1-2) UNRELEASED; urgency=low +xserver-xorg-input-penmount (1:1.4.1-2) unstable; urgency=medium * Update xsfbs and use new ${xinpdriver:Depends} substvar. - -- Julien Cristau <[email protected]> Sun, 23 May 2010 23:31:59 +0200 + -- Julien Cristau <[email protected]> Sun, 23 May 2010 23:32:38 +0200 xserver-xorg-input-penmount (1:1.4.1-1) unstable; urgency=low commit 34522a19e5f07d390239c801498caa19fc29c554 Author: Julien Cristau <[email protected]> Date: Sun May 23 23:32:20 2010 +0200 Update xsfbs and use new ${xinpdriver:Depends} substvar. diff --git a/debian/changelog b/debian/changelog index 15f90e4..f3b6adf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-penmount (1:1.4.1-2) UNRELEASED; urgency=low + + * Update xsfbs and use new ${xinpdriver:Depends} substvar. + + -- Julien Cristau <[email protected]> Sun, 23 May 2010 23:31:59 +0200 + xserver-xorg-input-penmount (1:1.4.1-1) unstable; urgency=low [ Timo Aaltonen ] diff --git a/debian/control b/debian/control index c193df3..fc21659 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected] Build-Depends: debhelper (>= 5), pkg-config, - xserver-xorg-dev (>= 2:1.7), + xserver-xorg-dev (>= 2:1.7.6.901), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, @@ -20,7 +20,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-penmoun Package: xserver-xorg-input-penmount Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xinpdriver:Depends} Provides: ${xinpdriver:Provides} Replaces: xserver-xorg (<< 6.8.2-35) Description: X.Org X server -- Penmount input driver commit ebeeb59865d35cee6b354ead443d4115c80696c3 Author: Mikhail Gusarov <[email protected]> Date: Fri May 7 18:58:56 2010 +0700 Remove duplicate xorg.fd.o URL and confusing mailing list URL from debian/control diff --git a/debian/control b/debian/control index 84ea8ee..c193df3 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,5 @@ Description: X.Org X server -- Penmount input driver . More information about X.Org can be found at: <URL:http://www.X.org> - <URL:http://xorg.freedesktop.org> - <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> . This package is built from the X.org xf86-input-penmount driver module. commit 81fc271788605b52e85c2d11635a0371fb44605e Author: Cyril Brulebois <[email protected]> Date: Sun May 2 02:14:45 2010 +0200 Add xorg-driver-{video,input} to Provides. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 77c4a39..3c59c20 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) # these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) commit b045afbd8277ad0c44e29d7c45802053c4335ccd Author: Julien Cristau <[email protected]> Date: Fri Apr 16 22:14:46 2010 +0200 Update serverabi rule for xserver 1.7.6.901 Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for drivers. The ${xserver:Depends} variable is deprecated. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 351fea5..77c4a39 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir # debian/*.prerm >$@ -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) +# Compute dependencies for drivers +# +VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) +INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) + +# these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) + ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif .PHONY: serverabi serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' @exit 1 else - echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars + # the following is there for compatibility... echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars endif # vim:set noet ai sts=8 sw=8 tw=0: commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff Author: Julien Cristau <[email protected]> Date: Tue Apr 13 14:06:33 2010 +0200 xsfbs.mk: don't use a directory as a make target The timestamp on the directory gets updated each time a file is added in it, which causes useless rebuilds. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5e16b10..351fea5 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir: .PHONY: prepare stampdir_targets+=prepare prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts +$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts >$@ -.PHONY: log -stampdir_targets+=log -log: $(STAMP_DIR)/log -$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir +.PHONY: logdir +stampdir_targets+=logdir +logdir: $(STAMP_DIR)/logdir +$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir mkdir -p $(STAMP_DIR)/log + >$@ # Apply all patches to the upstream source. .PHONY: patch @@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare # Revert all patches to the upstream source. .PHONY: unpatch -unpatch: $(STAMP_DIR)/log +unpatch: $(STAMP_DIR)/logdir rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if $(QUILT) applied >/dev/null 2>/dev/null; then \ commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186 Author: Cyril Brulebois <[email protected]> Date: Thu Apr 1 20:49:15 2010 +0200 Fix typo. diff --git a/debian/README.source b/debian/README.source index 34ab4bf..b09a1ab 100644 --- a/debian/README.source +++ b/debian/README.source @@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" branch. Otherwise, the upstream sources are manually installed in the Debian git repository. -The .orig.tar.gz upstream source file could be generated this +The .orig.tar.gz upstream source file could be generated using this "upstream-*" branch in the Debian git repository but it is actually copied from upstream tarballs directly. commit 11df7928d7f6a7756626029ef02dd385a02a6c72 Author: Brice Goglin <[email protected]> Date: Thu Mar 4 21:30:49 2010 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 714794e..15f90e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-penmount (1:1.4.1-1) UNRELEASED; urgency=low +xserver-xorg-input-penmount (1:1.4.1-1) unstable; urgency=low [ Timo Aaltonen ] * Bump Standards-Version to 3.8.3. @@ -13,7 +13,7 @@ xserver-xorg-input-penmount (1:1.4.1-1) UNRELEASED; urgency=low * New upstream release. + Fix FTBFS against Xserver 1.7, closes: #569400. - -- Timo Aaltonen <[email protected]> Sat, 05 Dec 2009 01:49:04 +0200 + -- Brice Goglin <[email protected]> Thu, 04 Mar 2010 21:30:38 +0100 xserver-xorg-input-penmount (1:1.4.0-2) unstable; urgency=low commit e59ecc43257dc6a46c50a1ce696272859dc7b810 Author: Brice Goglin <[email protected]> Date: Thu Mar 4 21:26:31 2010 +0100 New upstream release diff --git a/ChangeLog b/ChangeLog index dc92b61..a5040ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,47 @@ +commit 3bc3d1245676f6022fd3db48eb3e7f3b66c7561f +Author: Julien Cristau <[email protected]> +Date: Wed Mar 3 23:41:39 2010 +0100 + + Bump to 1.4.1 + +commit a6fedb3d2fd0288283602fef14f2a0a460b2afef +Author: Julien Cristau <[email protected]> +Date: Wed Mar 3 23:48:33 2010 +0100 + + Don't use obsolete loader functions + +commit 1d6ba7c8c8c7183569f9dc708090f36de8b6bdd6 +Author: Julien Cristau <[email protected]> +Date: Wed Mar 3 23:40:11 2010 +0100 + + Janitorial configure.ac/Makefile.am updates + + Use XORG_DEFAULT_OPTIONS and update ChangeLog rule to work with newer + git. Also set AM_CFLAGS in Makefile.am instead of setting CFLAGS from + configure.ac. + +commit dab0c2742c034750e3e9673167eb20812b679818 +Author: Peter Hutterer <[email protected]> +Date: Fri Jul 17 13:59:43 2009 +1000 + + Cope with XINPUT ABI 7. + + Signed-off-by: Peter Hutterer <[email protected]> + +commit fedbe483260a4bc8e2cc77e7d6a543ba37170448 +Author: Alan Coopersmith <[email protected]> +Date: Mon May 11 20:04:51 2009 -0700 + + Fill in COPYING file, add SubmittingPatches URL to README + +commit b5a8cdbd73939aa62cf3ae08957db67c65e6b51f +Author: Steve Bian <[email protected]> +Date: Sun Jan 18 23:33:52 2009 +1100 + + Added InvertX option + + Signed-off-by: Peter Hutterer <[email protected]> + commit 0536f70861f11192820439d36de951ef106d4e5e Author: Peter Hutterer <[email protected]> Date: Thu Feb 19 16:32:32 2009 +1000 diff --git a/debian/changelog b/debian/changelog index 99d7fd6..714794e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-penmount (1:1.4.0-3) UNRELEASED; urgency=low +xserver-xorg-input-penmount (1:1.4.1-1) UNRELEASED; urgency=low [ Timo Aaltonen ] * Bump Standards-Version to 3.8.3. @@ -9,6 +9,10 @@ xserver-xorg-input-penmount (1:1.4.0-3) UNRELEASED; urgency=low good reason. Thanks, Colin Watson! * Remove myself from Uploaders + [ Brice Goglin ] + * New upstream release. + + Fix FTBFS against Xserver 1.7, closes: #569400. + -- Timo Aaltonen <[email protected]> Sat, 05 Dec 2009 01:49:04 +0200 xserver-xorg-input-penmount (1:1.4.0-2) unstable; urgency=low commit 3bc3d1245676f6022fd3db48eb3e7f3b66c7561f Author: Julien Cristau <[email protected]> Date: Wed Mar 3 23:41:39 2010 +0100 Bump to 1.4.1 diff --git a/configure.ac b/configure.ac index 1377a00..1a68272 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-penmount], - 1.4.0, + 1.4.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-penmount) commit a6fedb3d2fd0288283602fef14f2a0a460b2afef Author: Julien Cristau <[email protected]> Date: Wed Mar 3 23:48:33 2010 +0100 Don't use obsolete loader functions diff --git a/src/xf86PM.c b/src/xf86PM.c index 1e38124..14cbe22 100644 --- a/src/xf86PM.c +++ b/src/xf86PM.c @@ -84,62 +84,12 @@ static XF86ModuleVersionInfo VersionRec = * a tool */ }; - -static const char *reqSymbols[] = { - "AddEnabledDevice", - "ErrorF", - "InitButtonClassDeviceStruct", - "InitProximityClassDeviceStruct", - "InitValuatorAxisStruct", - "InitValuatorClassDeviceStruct", - "InitPtrFeedbackClassDeviceStruct", - "RemoveEnabledDevice", - "Xcalloc", - "Xfree", - "XisbBlockDuration", - "XisbFree", - "XisbNew", - "XisbRead", - "XisbTrace", - "screenInfo", - "xf86AddInputDriver", - "xf86AllocateInput", - "xf86CloseSerial", - "xf86CollectInputOptions", - "xf86ErrorFVerb", - "xf86FindOptionValue", -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 - "xf86GetMotionEvents", -#endif - "xf86GetVerbosity", - "xf86MotionHistoryAllocate", - "xf86NameCmp", - "xf86OpenSerial", - "xf86OptionListCreate", - "xf86OptionListMerge", - "xf86OptionListReport", - "xf86PostButtonEvent", - "xf86PostMotionEvent", - "xf86PostProximityEvent", - "xf86ProcessCommonOptions", - "xf86ScaleAxis", - "xf86SetIntOption", - "xf86SetStrOption", - "xf86XInputSetScreen", -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 - "xf86XInputSetSendCoreEvents", -#endif - NULL -}; - - static pointer PenMountSetupProc( pointer module, pointer options, int *errmaj, int *errmin ) { - xf86LoaderReqSymLists(reqSymbols, NULL); xf86AddInputDriver(&PENMOUNT, module, 0); return (pointer) 1; } commit 1d6ba7c8c8c7183569f9dc708090f36de8b6bdd6 Author: Julien Cristau <[email protected]> Date: Wed Mar 3 23:40:11 2010 +0100 Janitorial configure.ac/Makefile.am updates Use XORG_DEFAULT_OPTIONS and update ChangeLog rule to work with newer git. Also set AM_CFLAGS in Makefile.am instead of setting CFLAGS from configure.ac. diff --git a/Makefile.am b/Makefile.am index 42f8b54..21ae771 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,4 +27,4 @@ EXTRA_DIST = ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) diff --git a/configure.ac b/configure.ac index e32aeea..1377a00 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,10 @@ AC_INIT([xf86-input-penmount], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-penmount) +# Require xorg-macros version >= 1.3.0 for XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) + AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([dist-bzip2]) @@ -41,27 +45,10 @@ AM_CONFIG_HEADER([config.h]) AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_PROG_CC +XORG_DEFAULT_OPTIONS AH_TOP([#include "xorg-server.h"]) -#AC_DEFINE(XFree86LOADER,1,[Stub define for loadable drivers]) -# -#AC_ARG_ENABLE(XINPUT, AS_HELP_STRING([--enable-xinput], -# [Build XInput support (default: yes)]), -# [XINPUT=$enableval],[XINPUT=yes]) -#AM_CONDITIONAL(XINPUT, test "x$XINPUT" = "xyes") -#if test "x$XINPUT" = "xyes" ; then -# AC_DEFINE(XINPUT,1,[Enable XInput support]) -#fi -# -#AC_ARG_ENABLE(XKB, AS_HELP_STRING([--enable-xkb], -# [Build XKB support (default: yes)]), -# [XKB=$enableval],[XKB=yes]) -#AM_CONDITIONAL(XKB, test "x$XKB" = "xyes") -#if test "x$XKB" = "xyes" ; then -# AC_DEFINE(XKB,1,[Enable XKB support]) -#fi - AC_ARG_WITH(xorg-module-dir, AC_HELP_STRING([--with-xorg-module-dir=DIR], [Default xorg module directory [[default=$libdir/xorg/modules]]]), @@ -78,15 +65,9 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES) sdkdir=$(pkg-config --variable=sdkdir xorg-server) -CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' -AC_SUBST([CFLAGS]) - # Checks for libraries. # Checks for header files. AC_HEADER_STDC -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION - AC_OUTPUT([Makefile src/Makefile man/Makefile]) diff --git a/src/Makefile.am b/src/Makefile.am index 2042e32..56ecc23 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,6 +18,7 @@ # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +AM_CFLAGS = $(XORG_CFLAGS) -I$(top_srcdir)/src # this is obnoxious: # -module lets us name the module exactly how we want commit 55229f75f69a7700f88d1a65a6fdb4442f156d6b Author: Julien Cristau <[email protected]> Date: Sat Jan 23 01:46:32 2010 +0100 Remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index 41ba985..99d7fd6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ xserver-xorg-input-penmount (1:1.4.0-3) UNRELEASED; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! + * Remove myself from Uploaders -- Timo Aaltonen <[email protected]> Sat, 05 Dec 2009 01:49:04 +0200 diff --git a/debian/control b/debian/control index bc96c6c..84ea8ee 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-input-penmount Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected]>, Julien Cristau <[email protected]> +Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected]> Build-Depends: debhelper (>= 5), pkg-config, commit 29f3ff7bd6625d89acfba40ad896aa58816c4eb8 Author: Julien Cristau <[email protected]> Date: Sat Jan 16 16:48:45 2010 +0000 Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! diff --git a/debian/changelog b/debian/changelog index cf5909e..41ba985 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ xserver-xorg-input-penmount (1:1.4.0-3) UNRELEASED; urgency=low + [ Timo Aaltonen ] * Bump Standards-Version to 3.8.3. * Build against Xserver 1.7. + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + -- Timo Aaltonen <[email protected]> Sat, 05 Dec 2009 01:49:04 +0200 xserver-xorg-input-penmount (1:1.4.0-2) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 432c068..4e34983 100755 --- a/debian/rules +++ b/debian/rules @@ -35,17 +35,17 @@ confflags += --disable-static configure: autoreconf -vfi -obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure - mkdir -p obj-$(DEB_BUILD_GNU_TYPE) - cd obj-$(DEB_BUILD_GNU_TYPE) && \ +build/config.status: configure + mkdir -p build + cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ CFLAGS="$(CFLAGS)" build: build-stamp -build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status +build-stamp: build/config.status dh_testdir - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + cd build && $(MAKE) >$@ clean: @@ -57,7 +57,7 @@ clean: rm -f */config.cache */config.log */config.status rm -f conftest* */conftest* rm -rf autom4te.cache */autom4te.cache - rm -rf obj-* + rm -rf build rm -f $$(find -name Makefile.in) rm -f compile config.guess config.sub configure depcomp install-sh rm -f ltmain.sh missing aclocal.m4 mkinstalldirs config.h.in @@ -70,7 +70,7 @@ install: build dh_clean -k dh_installdirs - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install # Build architecture-dependent files here. binary-arch: build install serverabi commit c4732976b2e8a0c7bc05590d38be492a445bdea1 Author: Timo Aaltonen <[email protected]> Date: Sat Dec 5 02:09:24 2009 +0200 Build against Xserver 1.7. diff --git a/debian/changelog b/debian/changelog index 1aed591..cf5909e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ xserver-xorg-input-penmount (1:1.4.0-3) UNRELEASED; urgency=low * Bump Standards-Version to 3.8.3. + * Build against Xserver 1.7. - -- Timo Aaltonen <[email protected]> Mon, 30 Nov 2009 15:43:05 +0200 + -- Timo Aaltonen <[email protected]> Sat, 05 Dec 2009 01:49:04 +0200 xserver-xorg-input-penmount (1:1.4.0-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 233acb9..bc96c6c 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected] Build-Depends: debhelper (>= 5), pkg-config, - xserver-xorg-dev (>= 2:1.5.99.901), + xserver-xorg-dev (>= 2:1.7), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, commit 847a7a9311001e00339d9bde482792af2a75bf3d Author: Timo Aaltonen <[email protected]> Date: Mon Nov 30 15:43:24 2009 +0200 Bump Standards-Version to 3.8.3. diff --git a/debian/changelog b/debian/changelog index 270cf02..1aed591 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-penmount (1:1.4.0-3) UNRELEASED; urgency=low + + * Bump Standards-Version to 3.8.3. + + -- Timo Aaltonen <[email protected]> Mon, 30 Nov 2009 15:43:05 +0200 + xserver-xorg-input-penmount (1:1.4.0-2) unstable; urgency=low * Allow parallel builds. diff --git a/debian/control b/debian/control index 1174100..233acb9 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: automake, libtool, xutils-dev -Standards-Version: 3.7.3 +Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-penmount Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-penmount.git commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1 Author: Julien Cristau <[email protected]> Date: Fri Sep 25 16:39:23 2009 +0200 xsfbs.mk: remove more obsolete code We can use plain debconf-updatepo, and don't need to clean the 'imports' directory or shlibs.local. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 82eb45f..5e16b10 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch dh_testdir rm -rf .pc rm -rf $(STAMP_DIR) - rm -rf imports - dh_clean debian/shlibs.local \ - debian/po/pothead - -# Generate the debconf templates POT file header. -debian/po/pothead: debian/po/pothead.in - sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \ - -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@ - -# Update POT and PO files. -.PHONY: updatepo -updatepo: debian/po/pothead - debian/scripts/debconf-updatepo --pot-header=pothead --verbose + dh_clean # 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 9a4314c976e0d22e8d47f5d86163791e407a6ecc Author: Julien Cristau <[email protected]> Date: Fri Sep 25 15:43:28 2009 +0200 xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage These variables aren't set anywhere. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 1f86848..82eb45f 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -176,7 +176,7 @@ cleanscripts: xsfclean: cleanscripts unpatch dh_testdir rm -rf .pc - rm -rf $(STAMP_DIR) $(SOURCE_DIR) + rm -rf $(STAMP_DIR) rm -rf imports dh_clean debian/shlibs.local \ debian/po/pothead @@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ - -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \ <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ rm $$MAINTSCRIPT.tmp; \ fi; \ commit bda208ec00d0b7b3632f57fb27e014684cdf73ba Author: Julien Cristau <[email protected]> Date: Fri Sep 25 15:33:39 2009 +0200 xsfbs.sh: fix typo and remove svn keyword diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 45acd59..813fd8d 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -1,5 +1,3 @@ -# $Id$ - # This is the X Strike Force shell library for X Window System package # maintainer scripts. It serves to define shell functions commonly used by # such packages, and performs some error checking necessary for proper operation @@ -8,7 +6,7 @@ # removal tasks. # If you are reading this within a Debian package maintainer script (e.g., -# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can +# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can # skip past this library by scanning forward in this file to the string # "GOBSTOPPER". commit 5693792171d885769e58dcccc053c08b11acd12a Author: Julien Cristau <[email protected]> Date: Wed Aug 26 18:53:36 2009 +0200 xsfbs.mk: no need for shlibs.local diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index f0f8953..1f86848 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir # debian/*.prerm >$@ -# Generate the shlibs.local file. -debian/shlibs.local: - cat debian/*.shlibs >$@ - SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) commit 1f858adff1ce2687cf542dd9b69b81137412f8a4 Author: Julien Cristau <[email protected]> Date: Wed Aug 26 18:47:09 2009 +0200 xsfbs.sh: remove unused reject_whitespace function diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index b3f4bbe..45acd59 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -93,22 +93,6 @@ reject_nondigits () { done } -reject_whitespace () { - # syntax: reject_whitespace [ operand ] - # - # scan operand (typically a shell variable whose value cannot be trusted) for - # whitespace characters and barf if any are found - if [ -n "$1" ]; then - # does the operand contain any whitespace? - if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then - # can't use die(), because I want to avoid forward references - echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \ - "possibly malicious garbage \"$1\"" >&2 - exit $SHELL_LIB_THROWN_ERROR - fi - fi -} - reject_unlikely_path_chars () { # syntax: reject_unlikely_path_chars [ operand ... ] # commit 0dd71e12416aa7dc60ed68af8127e04609b125f4 Author: Julien Cristau <[email protected]> Date: Wed Aug 26 18:23:53 2009 +0200 xsfbs.sh: remove unused find_culprits function diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 7dbb196..b3f4bbe 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -199,53 +199,6 @@ usage_error () { exit $SHELL_LIB_USAGE_ERROR } -find_culprits () { - local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \ - msg - - reject_whitespace "$1" - message "Searching for overlapping packages..." - dpkg_info_dir=/var/lib/dpkg/info - if [ -d $dpkg_info_dir ]; then - if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then - possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \ - "(xbase-clients|x11-common|xfs|xlibs)") - if [ -n "$possible_culprits" ]; then - smoking_guns=$(grep -l "$1" $possible_culprits || true) - if [ -n "$smoking_guns" ]; then - bad_packages=$(printf "\\n") - for f in $smoking_guns; do - # too bad you can't nest parameter expansion voodoo - p=${f%*.list} # strip off the trailing ".list" - package=${p##*/} # strip off the directories - bad_packages=$(printf "%s\n%s" "$bad_packages" "$package") - done - msg=$(cat <<EOF -The following packages appear to have file overlaps with the X.Org packages; -these packages are either very old, or in violation of Debian Policy. Try -upgrading each of these packages to the latest available version if possible: -for example, with the command "apt-get install". If no newer version of a -package is available, you will have to remove it; for example, with the command -"apt-get remove". If even the latest available version of the package has -this file overlap, please file a bug against that package with the Debian Bug -Tracking System. You may want to refer the package maintainer to section 12.8 -of the Debian Policy manual. -EOF -) - message "$msg" - message "The overlapping packages are: $bad_packages" - else - message "no overlaps found." - fi - fi - else - message "cannot search; no matches for $dpkg_info_dir/*.list." - fi - else - message "cannot search; $dpkg_info_dir does not exist." - fi -} - font_update () { # run $UPDATECMDS in $FONTDIRS commit b6c6eceec66066ebac16c85cc75bfa8a4f6cf58a Author: Julien Cristau <[email protected]> Date: Wed Aug 26 18:23:06 2009 +0200 xsfbs.sh: remove unused maplink function diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index f869274..7dbb196 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -199,37 +199,6 @@ usage_error () { exit $SHELL_LIB_USAGE_ERROR } - -maplink () { - # returns what symlink should point to; i.e., what the "sane" answer is - # Keep this in sync with the debian/*.links files. - # This is only needed for symlinks to directories. - # - # XXX: Most of these look wrong in the X11R7 world and need to be fixed. - # If we've stopped using this function, fixing it might enable us to re-enable - # it again and catch more errors. - case "$1" in - /etc/X11/xkb/compiled) echo /var/lib/xkb ;; - /etc/X11/xkb/xkbcomp) echo /usr/X11R6/bin/xkbcomp ;; - /usr/X11R6/lib/X11/app-defaults) echo /etc/X11/app-defaults ;; -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
