--- xserver-xorg-input-joystick-1.6.3.orig/ChangeLog +++ xserver-xorg-input-joystick-1.6.3/ChangeLog @@ -770,7 +770,7 @@ Merge branch 'scancodes' Conflicts: - configure.ac + configure.ac commit 1fa414dd6f32d68378bc9d571c439a603c2e7888 Author: Sascha Hlusiak @@ -1197,8 +1197,8 @@ Merge branch 'input-properties' Conflicts: - src/jstk.h - src/jstk_key.c + src/jstk.h + src/jstk_key.c commit a1b87df15dd2ad2a5593fed198b32053be5825cc Author: Sascha Hlusiak --- xserver-xorg-input-joystick-1.6.3.orig/autogen.sh +++ xserver-xorg-input-joystick-1.6.3/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" --- xserver-xorg-input-joystick-1.6.3.orig/debian/README.source +++ xserver-xorg-input-joystick-1.6.3/debian/README.source @@ -0,0 +1,49 @@ +------------------------------------------------------ +Quick Guide To Patching This Package For The Impatient +------------------------------------------------------ + +1. Make sure you have quilt installed +2. Unpack the package as usual with "dpkg-source -x" +3. Run the "patch" target in debian/rules +4. Create a new patch with "quilt new" (see quilt(1)) +5. Edit all the files you want to include in the patch with "quilt edit" + (see quilt(1)). +6. Write the patch with "quilt refresh" (see quilt(1)) +7. Run the "clean" target in debian/rules + +Alternatively, instead of using quilt directly, you can drop the patch in to +debian/patches and add the name of the patch to debian/patches/series. + +------------------------------------ +Guide To The X Strike Force Packages +------------------------------------ + +The X Strike Force team maintains X packages in git repositories on +git.debian.org in the pkg-xorg subdirectory. Most upstream packages +are actually maintained in git repositories as well, so they often +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 using this +"upstream-*" branch in the Debian git repository but it is actually +copied from upstream tarballs directly. + +Due to X.org being highly modular, packaging all X.org applications +as their own independent packages would have created too many Debian +packages. For this reason, some X.org applications have been grouped +into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, +x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. +Most packages, including the X.org server itself and all libraries +and drivers are, however maintained independently. + +The Debian packaging is added by creating the "debian-*" git branch +which contains the aforementioned "upstream-*" branch plus the debian/ +repository files. +When a patch has to be applied to the Debian package, two solutions +are involved: +* If the patch is available in one of the upstream branches, it + may be git'cherry-picked into the Debian repository. In this + case, it appears directly in the .diff.gz. +* Otherwise, the patch is added to debian/patches/ which is managed + with quilt as documented in /usr/share/doc/quilt/README.source. --- xserver-xorg-input-joystick-1.6.3.orig/debian/changelog +++ xserver-xorg-input-joystick-1.6.3/debian/changelog @@ -0,0 +1,327 @@ +xserver-xorg-input-joystick (1:1.6.3-1.1) unstable; urgency=medium + + * Non maintainer upload by the Reproducible Builds team. + * No source change upload to rebuild on buildd with .buildinfo files. + + -- Holger Levsen Tue, 14 Jun 2022 15:31:39 +0200 + +xserver-xorg-input-joystick (1:1.6.3-1) unstable; urgency=medium + + * New upstream release. + - support-new-api.diff: dropped, upstream + + -- Timo Aaltonen Fri, 18 Nov 2016 12:46:49 +0200 + +xserver-xorg-input-joystick (1:1.6.2-2) unstable; urgency=medium + + * support-new-api.diff: Fix build with xserver 1.19. + * Use https URLs in Vcs-* control fields. + * Use https URL in watch file. + * Bump Standards-Version to 3.9.8. + * control: Remove Drew and Cyril from uploaders. + + -- Timo Aaltonen Thu, 17 Nov 2016 16:34:47 +0200 + +xserver-xorg-input-joystick (1:1.6.2-1) unstable; urgency=low + + [ Michele Cane ] + * New upstream release. + * Update dependencies. + * Bump Standards-Version to 3.9.4, no changes needed. + + [ Julien Cristau ] + * Disable silent build rules. + + -- Julien Cristau Thu, 05 Sep 2013 20:13:35 +0200 + +xserver-xorg-input-joystick (1:1.6.1-1) unstable; urgency=low + + * New upstream release. + + -- Cyril Brulebois Tue, 20 Mar 2012 21:51:40 +0100 + +xserver-xorg-input-joystick (1:1.6.0-2) unstable; urgency=high + + [ Julien Cristau ] + * Use kfreebsd-any wildcard for libusbhid build-dep (closes: #634707). + + [ Cyril Brulebois ] + * Add patch to deal with the uncoordinated freebsd-libs transition, + thanks to Steven Chamberlain (Closes: #660395): + - 0001-Fix-includes-for-kfreebsd.diff + * Set urgency to “high” for the RC bug fix. + + -- Cyril Brulebois Sun, 19 Feb 2012 16:04:42 +0000 + +xserver-xorg-input-joystick (1:1.6.0-1) unstable; urgency=low + + [ Julien Cristau ] + * New upstream release: + - Compatible with xorg-server 1.10 (Closes: #624973, #628410). + + [ Cyril Brulebois ] + * Bump Standards-Version to 3.9.2 (no changes). + + -- Cyril Brulebois Thu, 30 Jun 2011 01:15:32 +0200 + +xserver-xorg-input-joystick (1:1.5.0-7) unstable; urgency=low + + * Switch to dh: + - Use debhelper 8. + - Use dh-autoreconf. + - Bump xserver-xorg-dev build-dep for dh_xsf_substvars and xsf + debhelper sequence. + - Specify usr/share/man in .install, remove .manpages accordingly. + * Remove xsfbs accordingly. + * Remove long obsolete Replaces. + * Update Uploaders list. Thanks, David & Brice! + * Wrap Depends/Provides. + * Bump Standards-Version to 3.9.1 (no changes needed). + + -- Cyril Brulebois Sat, 05 Feb 2011 14:38:39 +0100 + +xserver-xorg-input-joystick (1:1.5.0-6) experimental; urgency=low + + * Merge xsfbs to get unversioned Provides. + + -- Cyril Brulebois Sat, 16 Oct 2010 13:38:52 +0200 + +xserver-xorg-input-joystick (1:1.5.0-5) experimental; urgency=low + + * Build against Xserver 1.9.1 rc1. + + -- Cyril Brulebois Wed, 13 Oct 2010 01:30:57 +0200 + +xserver-xorg-input-joystick (1:1.5.0-4) unstable; urgency=low + + [ Julien Cristau ] + * Bump xserver-xorg-dev build-dep, move 10-joystick.conf to + 50-joystick.conf, and install it in /usr/share/X11/xorg.conf.d. + * Use new xsfbs and ${xinpdriver:Depends} variable. + + [ Cyril Brulebois ] + * Add myself to Uploaders. + * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). + + -- Cyril Brulebois Sat, 17 Apr 2010 21:55:28 +0200 + +xserver-xorg-input-joystick (1:1.5.0-3) unstable; urgency=low + + * Install 10-joystick.conf. (LP: #546933) + * Don't install the udev rule anymore, nor depend on udev. + + -- Timo Aaltonen Tue, 30 Mar 2010 21:48:57 +0300 + +xserver-xorg-input-joystick (1:1.5.0-2) unstable; urgency=low + + [ Timo Aaltonen ] + * Install a udev rules file to autoload the driver. + * Run udevadm trigger on postinst, and depend on udev [linux-any]. + * Add xserver-xorg-input-joystick-dev for the header and .pc files. + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + + [ Robert Hooker ] + * Correct xserver-xorg-input-joystick-dev package name. + * Build xserver-xorg-input-joystick-dev on arch: all. + * Fix udev rules install. + + -- Brice Goglin Mon, 22 Feb 2010 19:41:10 +0100 + +xserver-xorg-input-joystick (1:1.5.0-1) experimental; urgency=low + + [ Timo Aaltonen ] + * New upstream release. + * Bump Standards-Version to 3.8.3. + * Build against Xserver 1.7. + + [ Julien Cristau ] + * Build-depend on libusbhid-dev on kfreebsd. + + [ Cyril Brulebois ] + * Upload to experimental. + + -- Cyril Brulebois Sat, 05 Dec 2009 22:56:05 +0100 + +xserver-xorg-input-joystick (1:1.4.1-1) unstable; urgency=low + + * New upstream release. + + -- Brice Goglin Wed, 15 Apr 2009 13:16:37 +0200 + +xserver-xorg-input-joystick (1:1.4.0-1) unstable; urgency=low + + * Run autoreconf on build. + * Allow parallel builds. + * New upstream release. + * Build against xserver 1.6. + * Use Vcs-* instead of XS-Vcs-*. + + -- Julien Cristau Thu, 09 Apr 2009 16:12:48 +0100 + +xserver-xorg-input-joystick (1:1.3.2-1) unstable; urgency=low + + * New upstream release. + * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from + /usr/bin/Xorg and other modules, and that's not a bug, so we want + dpkg-shlibdeps to shut up about symbols it can't find. + + Build-depend on dpkg-dev >= 1.14.17. + + -- Brice Goglin Sat, 17 May 2008 12:09:11 +0200 + +xserver-xorg-input-joystick (1:1.3.1-1) unstable; urgency=low + + * New upstream release. + * Build-depend on x11proto-kb-dev, thanks Aaron M. Ucko, + closes: #448770. + + -- Brice Goglin Sat, 08 Dec 2007 12:35:12 +0100 + +xserver-xorg-input-joystick (1:1.3.0-2) unstable; urgency=low + + * Update upstream ChangeLog. + + -- Drew Parsons Mon, 29 Oct 2007 00:38:35 +1100 + +xserver-xorg-input-joystick (1:1.3.0-1) unstable; urgency=low + + * New upstream version. This is upstream version (git tag) + xf86-input-joystick-1.3.0-1, with the header fix. + + -- Drew Parsons Mon, 29 Oct 2007 00:24:09 +1100 + +xserver-xorg-input-joystick (1:1.2.3-3) unstable; urgency=low + + * Upload to unstable + + -- David Nusinow Sun, 16 Sep 2007 15:13:37 -0400 + +xserver-xorg-input-joystick (1:1.2.3-2) experimental; urgency=low + + * Build against xserver 1.4. + * Remove Branden from uploaders with his permission. He's always welcome back. + * Add upstream URL to debian/copyright. + + -- Brice Goglin Wed, 12 Sep 2007 19:19:05 +0200 + +xserver-xorg-input-joystick (1:1.2.3-1) unstable; urgency=low + + * New upstream release. + * Add myself to uploaders. + * Remove Fabio from uploaders with his permission. He's always welcome back. + + -- Brice Goglin Thu, 16 Aug 2007 17:48:57 +0200 + +xserver-xorg-input-joystick (1:1.2.1-2) unstable; urgency=low + + [ Brice Goglin ] + * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902. + (needed to let xsfbs get access to serverminver) + * Build-Depends: quilt, needed to apply patches. + * Generate Provides: line automatically. + + [ Drew Parsons ] + * Exclude man pages from dh_install (they are installed by dh_installman) + + -- Drew Parsons Sun, 22 Apr 2007 19:40:02 +1000 + +xserver-xorg-input-joystick (1:1.2.1-1) unstable; urgency=low + + [ Brice Goglin ] + * New upstream release. + * Install the upstream changelog. + * Add XS-Vcs-*. + * Add a link to www.X.org and a reference to the xf86-input-joystick + module in the long description. + + -- Drew Parsons Sun, 22 Apr 2007 18:46:37 +1000 + +xserver-xorg-input-joystick (1:1.1.1-1) experimental; urgency=low + + [ Julien Cristau ] + * Add link to xserver-xorg-core bug script, so that bugreports contain + the user's config and log files. + * Generate the dependency on xserver-xorg-core automatically. + + [ Drew Parsons ] + * New upstream version (X11R7.2+). + - driver now loads successfully. Closes: #412287. + - uses XI_PRIVATE rather than PRIVATE. Closes: #392232. + + -- Drew Parsons Mon, 19 Mar 2007 23:41:20 +1100 + +xserver-xorg-input-joystick (1:1.1.0-1) unstable; urgency=low + + [ Andres Salomon ] + * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; + idempotency fix. + * Run dh_install w/ --list-missing. + + [ Drew Parsons ] + * New upstream version (X11R7.1). + * Standards version 3.7.2. + * [Build-] Depends: xserver-xorg (>= 2:1.1.1-1). + * Use debhelper 5. + * Use dh_installman to install man pages. + * Exclude joystick_drv.la from dh_install. + + -- Drew Parsons Wed, 11 Oct 2006 00:22:42 +1000 + +xserver-xorg-input-joystick (1:1.0.0.5-2) unstable; urgency=low + + * Upload to modular + + -- David Nusinow Sun, 26 Mar 2006 20:25:05 -0500 + +xserver-xorg-input-joystick (1:1.0.0.5-1) experimental; urgency=low + + * First upload to Debian + * Change source package, package, and provides names to denote the + type of driver and that they are for xserver-xorg + + -- David Nusinow Thu, 19 Jan 2006 20:42:09 -0500 + +xserver-xorg-input-joystick (1:1.0.0.5-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Add provides on xserver-xorg-input. + + -- Daniel Stone Wed, 4 Jan 2006 19:43:22 +1100 + +xserver-xorg-input-joystick (1:1.0.0.4-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 19 Dec 2005 08:56:28 +1100 + +xserver-xorg-input-joystick (1:1.0.0.3-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 12 Dec 2005 13:38:38 +1100 + +xserver-xorg-input-joystick (1:1.0.0.2-0ubuntu2) dapper; urgency=low + + * Add missing Build-Depends (x11proto-core-dev, x11proto-randr-dev). + + -- Daniel Stone Mon, 5 Dec 2005 12:48:35 +1100 + +xserver-xorg-input-joystick (1:1.0.0.2-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 22 Nov 2005 13:21:49 +1100 + +xserver-xorg-input-joystick (1:1.0.0.1-1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 25 Oct 2005 16:53:56 +1000 + +xserver-xorg-input-joystick (1:1.0.0-1) breezy; urgency=low + + * First xserver-xorg-input-joystick release. + + -- Daniel Stone Wed, 6 Jul 2005 15:48:17 +1000 --- xserver-xorg-input-joystick-1.6.3.orig/debian/compat +++ xserver-xorg-input-joystick-1.6.3/debian/compat @@ -0,0 +1 @@ +8 --- xserver-xorg-input-joystick-1.6.3.orig/debian/control +++ xserver-xorg-input-joystick-1.6.3/debian/control @@ -0,0 +1,51 @@ +Source: xserver-xorg-input-joystick +Section: x11 +Priority: optional +Maintainer: Debian X Strike Force +Build-Depends: + debhelper (>= 8), + dh-autoreconf, + quilt, + pkg-config, + xutils-dev, + xserver-xorg-dev (>= 2:1.9.99.2), + x11proto-input-dev, + x11proto-core-dev, + x11proto-randr-dev, + x11proto-kb-dev, + libusbhid-dev [kfreebsd-any], +Standards-Version: 3.9.8 +Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick.git + +Package: xserver-xorg-input-joystick +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xinpdriver:Depends}, +Provides: + ${xinpdriver:Provides} +Description: X.Org X server -- joystick input driver + This package provides the driver for joysticks. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xf86-input-joystick driver module. + +Package: xserver-xorg-input-joystick-dev +Section: libdevel +Architecture: all +Depends: + ${shlibs:Depends}, + ${misc:Depends}, +Description: X.Org X server -- joystick input driver (development headers) + This package provides the development headers for the joystick input + driver found in xserver-xorg-input-joystick. Non-developers likely have + little use for this package. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xf86-input-joystick driver module. --- xserver-xorg-input-joystick-1.6.3.orig/debian/copyright +++ xserver-xorg-input-joystick-1.6.3/debian/copyright @@ -0,0 +1,22 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + +Copyright 1995-1999 by Frederic Lepied, France. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Frederic Lepied not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Frederic Lepied makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +FREDERIC LEPIED DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL FREDERIC LEPIED BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. --- xserver-xorg-input-joystick-1.6.3.orig/debian/local/50-joystick.conf +++ xserver-xorg-input-joystick-1.6.3/debian/local/50-joystick.conf @@ -0,0 +1,6 @@ +Section "InputClass" + Identifier "joystick catchall" + MatchIsJoystick "on" + MatchDevicePath "/dev/input/event*" + Driver "joystick" +EndSection --- xserver-xorg-input-joystick-1.6.3.orig/debian/patches/0001-Fix-includes-for-kfreebsd.diff +++ xserver-xorg-input-joystick-1.6.3/debian/patches/0001-Fix-includes-for-kfreebsd.diff @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -98,6 +98,7 @@ + AC_CHECK_HEADERS([dev/usb/usb.h]) + AC_CHECK_HEADERS([usbhid.h dev/usb/usbhid.h],, [bsd_backend=no], + [[#if HAVE_DEV_USB_USB_H ++#include + #include + #endif + ]]) --- xserver-xorg-input-joystick-1.6.3.orig/debian/patches/series +++ xserver-xorg-input-joystick-1.6.3/debian/patches/series @@ -0,0 +1 @@ +0001-Fix-includes-for-kfreebsd.diff --- xserver-xorg-input-joystick-1.6.3.orig/debian/rules +++ xserver-xorg-input-joystick-1.6.3/debian/rules @@ -0,0 +1,25 @@ +#!/usr/bin/make -f + +override_dh_auto_configure: + dh_auto_configure -- --disable-silent-rules + +# Install in debian/tmp to retain control through dh_install: +override_dh_auto_install: + dh_auto_install --destdir=debian/tmp + +# Kill *.la files, and forget no-one: +override_dh_install: + # Usual steps: + find debian/tmp -name '*.la' -delete + dh_install --fail-missing + # Local configuration: + dh_install -pxserver-xorg-input-joystick \ + debian/local/50-joystick.conf \ + `pkg-config --variable=sysconfigdir xorg-server` + +# That's a plugin, use appropriate warning level: +override_dh_shlibdeps: + dh_shlibdeps -- --warnings=6 + +%: + dh $@ --with quilt,autoreconf,xsf --builddirectory=build/ --- xserver-xorg-input-joystick-1.6.3.orig/debian/watch +++ xserver-xorg-input-joystick-1.6.3/debian/watch @@ -0,0 +1,3 @@ +#git=git://anongit.freedesktop.org/xorg/driver/xf86-input-joystick +version=3 +https://xorg.freedesktop.org/releases/individual/driver/ xf86-input-joystick-(.*)\.tar\.gz --- xserver-xorg-input-joystick-1.6.3.orig/debian/xserver-xorg-input-joystick-dev.install +++ xserver-xorg-input-joystick-1.6.3/debian/xserver-xorg-input-joystick-dev.install @@ -0,0 +1,2 @@ +usr/include/xorg/* +usr/lib/pkgconfig/xorg-joystick.pc --- xserver-xorg-input-joystick-1.6.3.orig/debian/xserver-xorg-input-joystick.install +++ xserver-xorg-input-joystick-1.6.3/debian/xserver-xorg-input-joystick.install @@ -0,0 +1,2 @@ +usr/lib/xorg/modules/input/*.so +usr/share/man --- xserver-xorg-input-joystick-1.6.3.orig/debian/xserver-xorg-input-joystick.links +++ xserver-xorg-input-joystick-1.6.3/debian/xserver-xorg-input-joystick.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-input-joystick/script