[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/driver/xserver-xorg-video-neomagic][debian-unstable] 20 commits: configure: Drop AM_MAINTAINER_MODE

Title: GitLab

Andreas Boll pushed to branch debian-unstable at X Strike Force / driver / xserver-xorg-video-neomagic

Commits:

12 changed files:

Changes:

  • ChangeLog
    1 
    +commit 754031be27385154d39b65f8d703279f841b2c31
    2 
    +Author: Kevin Brace <kevinbrace@gmx.com>
    3 
    +Date:   Mon Dec 24 18:48:32 2018 -0600
    4 
    +
    5 
    +    Version bumped to 1.3.0
    6 
    +
    7 
    +    Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
    8 
    +
    9 
    +commit 188c1b8d2b5b488bc5bee632dbff7cf98634f979
    10 
    +Author: Kevin Brace <kevinbrace@gmx.com>
    11 
    +Date:   Sat Dec 22 15:53:03 2018 -0600
    12 
    +
    13 
    +    Suppress unused function compilation warning
    14 
    +
    15 
    +    Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
    16 
    +
    17 
    +commit 0b1df1d5f706b309e9d6fbd8e253b42979c045c8
    18 
    +Author: Kevin Brace <kevinbrace@gmx.com>
    19 
    +Date:   Sat Dec 22 15:48:24 2018 -0600
    20 
    +
    21 
    +    Eliminate unused variable compilation warning
    22 
    +
    23 
    +    Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
    24 
    +
    25 
    +commit f30dde6f9665b0ea687b55a5ad667fc01e17141a
    26 
    +Author: Alan Coopersmith <alan.coopersmith@oracle.com>
    27 
    +Date:   Sun Nov 25 14:33:22 2018 -0800
    28 
    +
    29 
    +    Update configure.ac bug URL for gitlab migration
    30 
    +
    31 
    +    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    32 
    +
    33 
    +commit 81b8ea1cb8aa8bc07e57ad885b4ba2957c90da6a
    34 
    +Author: Mihail Konev <k.mvc@ya.ru>
    35 
    +Date:   Thu Jan 26 14:00:22 2017 +1000
    36 
    +
    37 
    +    autogen: add default patch prefix
    38 
    +
    39 
    +    Signed-off-by: Mihail Konev <k.mvc@ya.ru>
    40 
    +
    41 
    +commit 8f9e23c2454650268b94af5b0b0d3c49ae90a205
    42 
    +Author: Emil Velikov <emil.l.velikov@gmail.com>
    43 
    +Date:   Mon Mar 9 12:00:52 2015 +0000
    44 
    +
    45 
    +    autogen.sh: use quoted string variables
    46 
    +
    47 
    +    Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
    48 
    +    fall-outs, when they contain space.
    49 
    +
    50 
    +    Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
    51 
    +    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
    52 
    +    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    53 
    +
    54 
    +commit dab4b6caa89a699ae47d765cd609d5a54dc58da1
    55 
    +Author: Peter Hutterer <peter.hutterer@who-t.net>
    56 
    +Date:   Tue Jan 24 10:32:07 2017 +1000
    57 
    +
    58 
    +    autogen.sh: use exec instead of waiting for configure to finish
    59 
    +
    60 
    +    Syncs the invocation of configure with the one from the server.
    61 
    +
    62 
    +    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    63 
    +    Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
    64 
    +
    65 
    +commit 26a5c0f33d9209a59aa7bbe23a65cb6b01589841
    66 
    +Author: Alan Coopersmith <alan.coopersmith@oracle.com>
    67 
    +Date:   Sun Jun 1 21:03:14 2014 -0700
    68 
    +
    69 
    +    autogen.sh: Honor NOCONFIGURE=1
    70 
    +
    71 
    +    See http://people.gnome.org/~walters/docs/build-api.txt
    72 
    +
    73 
    +    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    74 
    +
    75 
    +commit e3951f7124a0c5e91cd2d558b71c55bebd778eed
    76 
    +Author: Alan Coopersmith <alan.coopersmith@oracle.com>
    77 
    +Date:   Sun Jun 1 21:03:13 2014 -0700
    78 
    +
    79 
    +    configure: Drop AM_MAINTAINER_MODE
    80 
    +
    81 
    +    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    82 
    +
    1 83 
     commit f0a61bc00011b0497edc79cf6fa11ae88a227df9
    2 84 
     Author: Julien Cristau <jcristau@debian.org>
    3 85 
     Date:   Fri May 8 11:48:52 2015 +0200

  • autogen.sh
    1 1 
     #! /bin/sh
    2 2
    3 
    -srcdir=`dirname $0`
    3 
    +srcdir=`dirname "$0"`
    4 4 
     test -z "$srcdir" && srcdir=.
    5 5
    6 6 
     ORIGDIR=`pwd`
    7 
    -cd $srcdir
    7 
    +cd "$srcdir"
    8 8
    9 9 
     autoreconf -v --install || exit 1
    10 
    -cd $ORIGDIR || exit $?
    10 
    +cd "$ORIGDIR" || exit $?
    11 11
    12 
    -$srcdir/configure --enable-maintainer-mode "$@"
    12 
    +git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
    13 
    +    git config --local format.subjectPrefix "PATCH xf86-video-neomagic"
    14 
    +
    15 
    +if test -z "$NOCONFIGURE"; then
    16 
    +    exec "$srcdir"/configure "$@"
    17 
    +fi

  • configure.ac
    ... ... @@ -23,8 +23,8 @@
    23 23 
     # Initialize Autoconf
    24 24 
     AC_PREREQ([2.60])
    25 25 
     AC_INIT([xf86-video-neomagic],
    26 
    -        [1.2.9],
    27 
    -        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/Neomagic],
    26 
    +        [1.3.0],
    27 
    +        [https://gitlab.freedesktop.org/xorg/driver/xf86-video-neomagic/issues],
    28 28 
             [xf86-video-neomagic])
    29 29 
     AC_CONFIG_SRCDIR([Makefile.am])
    30 30 
     AC_CONFIG_HEADERS([config.h])
    ... ... @@ -32,7 +32,6 @@ AC_CONFIG_AUX_DIR(.)
    32 32
    33 33 
     # Initialize Automake
    34 34 
     AM_INIT_AUTOMAKE([foreign dist-bzip2])
    35 
    -AM_MAINTAINER_MODE
    36 35
    37 36 
     # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
    38 37 
     m4_ifndef([XORG_MACROS_VERSION],

  • debian/changelog
    1 
    +xserver-xorg-video-neomagic (1:1.3.0-1) unstable; urgency=medium
    2 
    +
    3 
    +  * New upstream release.
    4 
    +  * signing-key.asc: Add PGP key from Kevin Brace.
    5 
    +  * Update Vcs-* URLs to point to salsa.debian.org.
    6 
    +  * Build-depend on x11proto-dev.
    7 
    +  * Bump debhelper compat to 11.
    8 
    +  * Set source format to 1.0.
    9 
    +  * Move URL from description to Homepage field.
    10 
    +  * Switch URLs to https.
    11 
    +  * Bump standards version to 4.3.0.
    12 
    +
    13 
    + -- Andreas Boll <aboll@debian.org>  Thu, 07 Feb 2019 23:01:06 +0100
    14 
    +
    1 15 
     xserver-xorg-video-neomagic (1:1.2.9-1) unstable; urgency=medium
    2 16
    3 17 
       * New upstream release.

  • debian/compat
    1 
    -9
    1 
    +11

  • debian/control
    ... ... @@ -3,22 +3,16 @@ Section: x11
    3 3 
     Priority: optional
    4 4 
     Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
    5 5 
     Build-Depends:
    6 
    - debhelper (>= 9),
    7 
    - dh-autoreconf,
    6 
    + debhelper (>= 11),
    8 7 
      quilt,
    9 8 
      pkg-config,
    10 9 
      xserver-xorg-dev (>= 2:1.9.4),
    11 
    - x11proto-video-dev,
    12 
    - x11proto-xf86dga-dev,
    13 
    - x11proto-core-dev,
    14 
    - x11proto-fonts-dev,
    15 
    - x11proto-randr-dev,
    16 
    - x11proto-render-dev,
    17 
    - x11proto-xext-dev,
    10 
    + x11proto-dev,
    18 11 
      xutils-dev (>= 1:7.5+4),
    19 
    -Standards-Version: 3.9.3
    20 
    -Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-neomagic
    21 
    -Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-neomagic.git
    12 
    +Standards-Version: 4.3.0
    13 
    +Homepage: https://www.x.org
    14 
    +Vcs-Git: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-neomagic.git
    15 
    +Vcs-Browser: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-neomagic
    22 16
    23 17 
     Package: xserver-xorg-video-neomagic
    24 18 
     Architecture: any
    ... ... @@ -32,7 +26,4 @@ Description: X.Org X server -- Neomagic display driver
    32 26 
      This package provides the driver for Neomagic MagicGraph chipsets, which are
    33 27 
      commonly found in laptops.
    34 28 
      .
    35 
    - More information about X.Org can be found at:
    36 
    - <URL:http://www.X.org>
    37 
    - .
    38 29 
      This package is built from the X.org xf86-video-neomagic driver module.

  • debian/copyright
    1 1 
     This package was downloaded from
    2 
    -http://xorg.freedesktop.org/releases/individual/driver/
    2 
    +https://xorg.freedesktop.org/releases/individual/driver/
    3 3
    4 4 
     Copyright 1998, 1999 by Precision Insight, Inc., Cedar Park, Texas.
    5 5

  • debian/rules
    ... ... @@ -2,7 +2,6 @@
    2 2
    3 3 
     override_dh_auto_configure:
    4 4 
     	dh_auto_configure -- \
    5 
    -		--disable-silent-rules \
    6 5 
     		--libdir=\$${exec_prefix}/lib
    7 6
    8 7 
     # Install in debian/tmp to retain control through dh_install:
    ... ... @@ -19,4 +18,4 @@ override_dh_shlibdeps:
    19 18 
     	dh_shlibdeps -- --warnings=6
    20 19
    21 20 
     %:
    22 
    -	dh $@ --with quilt,autoreconf,xsf --builddirectory=build/
    21 
    +	dh $@ --with quilt,xsf --builddirectory=build/

  • debian/source/format
    1 
    +1.0

  • debian/upstream/signing-key.asc
    ... ... @@ -62,3 +62,32 @@ gksZFyWOfV82jHBeu+O0xJNU/9xvZsJF4TORrRWRO1o1gkF7x/oBk7yilh+mSq1P
    62 62 
     DNOWZJQhmuWMtbOUL2WMkKRPDwJrcbwpt3bc6aZCeAH1SSRLEe9Y+2uLeneTMA==
    63 63 
     =+xMJ
    64 64 
     -----END PGP PUBLIC KEY BLOCK-----
    65 
    +-----BEGIN PGP PUBLIC KEY BLOCK-----
    66 
    +
    67 
    +mQENBFauvlQBCACpsdM1X3cxMypf3/LFnTYcqI78H/ENvl/OkdLgTAPSmUbPFtQ0
    68 
    +VvAjJUEh1QoKmOhfpJow2pjBZSs8CJIyOxauYlYOhvH3QAkFM2RXse6vbm/ej2zn
    69 
    +ufZT2OgKuPC5cKIOMR55g08NTg0K26FF4OJuVc9DeLGSsOMHeR/qwbSQJBGEge6j
    70 
    +mjVmhsPr16eqw396xTL31oU0MSP607iEpvmlT6dN3eXOvMpzcEj07EhzaZLKf0g0
    71 
    +rAHMAsithi5N+axMmTq7GudwEo2WwaRTiCTJUWJ7sxO4Ix41G+ccPMIiGwWWNJ9T
    72 
    +KEy77Kpf3CY2oNdZNnu+axT8yq0Vi6uXtOWlABEBAAG0IEtldmluIEJyYWNlIDxr
    73 
    +ZXZpbmJyYWNlQGdteC5jb20+iQE4BBMBAgAiBQJWrr5UAhsDBgsJCAcDAgYVCAIJ
    74 
    +CgsEFgIDAQIeAQIXgAAKCRDJInhBeL/9sDcyCACYUMmaI0wxbyiuiNjl9m7tiNHO
    75 
    +H4fbITrqBf3Kmpp7Dv0eQ/k+ux6d0t7R1ajbcat5WO28evhvuVnfZB6dDCFOmWqx
    76 
    +9mtmNeZJknQAHiYhNrGWb0g1GQyYN/+RACT3CYv/vqzKJnd39RZcaebBtajjzteh
    77 
    +MYVU/AI62rcYAgOpc68KO+r9WJCj8df2waXXTLAAo6jZbaW9jp0G/5Hzs+IFPdG+
    78 
    +MzKgw3ttBCFkTIMGec0Ds0NILoLs6+3+D7pbZSiNf423BB0LgLRMqgd/CxUN/hRB
    79 
    +XNQx3ntVywelSFPCHt64+Ty4GQ3ch6mO98QLO/bb04Byjo7WndSXeAdi77q3uQEN
    80 
    +BFauvlQBCADM2i7oCJr6RJ5M9k5rkmz/J78VXfwm8T0XdW5KXUTQIM6V5gcPf/tp
    81 
    +G6QwpYBjTVIbVvJoNlu8sP7acVleRZClZTNF1qtK84d4+g2EQxMHvx/MePDxmLCQ
    82 
    +y70+7kjw3R0latruTElnPN2e6TbVoGWQB/9kDquSyfmCVwwMiw3PP0nHpXZzJI28
    83 
    +hnQu7m7Z1e6ihd2N5IC7t3w7EZnGYNsQV00yhfxD6LxMq2JppzgfIBCO1pMAn1da
    84 
    +2EtG2KAVa5CVKbJRz7ex+0srX1tYgAsu+01JF1KM+yR/GNJPV9IZZUSjVklW8N5m
    85 
    +VqGxX7/Ywyau+KfaPRsNbk+O46D2F76lABEBAAGJAR8EGAECAAkFAlauvlQCGwwA
    86 
    +CgkQySJ4QXi//bDwBAf/S/jp5fMx+hlvzZ4gdbBRY6qtfh2BNphsGEv7QTAdsKrN
    87 
    +L5i+CoAlweSPmG23/JRFgUUbSpDW8pbJ9lk/Nk8r9l+o3yLfJ0GDfrSWV/b4RseI
    88 
    +zGpxYis7rW124R+PrTZqDodvzKLnR75uZKPpnp5uJXrSSQC/8hJYq3KNRkjFqjEc
    89 
    +TLAAIHRhWJ7+1YQe9hzJQhUEaaPfKTPmtErNKqLv4SGdbDZImnqZiwL+mmR1XsfJ
    90 
    +d48Wis410CnRbb2O4q3RhuTNSYWjatrv7Oi8bJONAMCEwuOKH+GinMr6zui4U8rx
    91 
    +0CXyaCO/nSalaCLyMrk7lo6BOk2KGgkCbvRG4yNBMQ==
    92 
    +=jPLP
    93 
    +-----END PGP PUBLIC KEY BLOCK-----

  • debian/watch
    1 1 
     #git=git://anongit.freedesktop.org/xorg/driver/xf86-video-neomagic
    2 2 
     version=3
    3 3 
     opts="pgpsigurlmangle=s/$/.sig/" \
    4 
    -http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-neomagic-(.*)\.tar\.gz
    4 
    +https://xorg.freedesktop.org/releases/individual/driver/ xf86-video-neomagic-(.*)\.tar\.gz

  • src/neo_driver.c
    ... ... @@ -118,7 +118,9 @@ static ModeStatus NEOValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode,
    118 118 
                                    Bool verbose, int flags);
    119 119
    120 120 
     /* Internally used functions */
    121 
    +#ifdef HAVE_ISA
    121 122 
     static int      neoFindIsaDevice(GDevPtr dev);
    123 
    +#endif
    122 124 
     static Bool     neoModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
    123 125 
     static void     neoSave(ScrnInfoPtr pScrn);
    124 126 
     static void     neoRestore(ScrnInfoPtr pScrn, vgaRegPtr VgaReg,
    ... ... @@ -1954,7 +1956,6 @@ static Bool
    1954 1956 
     neoMapMem(ScrnInfoPtr pScrn)
    1955 1957 
     {
    1956 1958 
         NEOPtr nPtr = NEOPTR(pScrn);
    1957 
    -    vgaHWPtr hwp = VGAHWPTR(pScrn);
    1958 1959
    1959 1960 
         if (!nPtr->noMMIO) {
    1960 1961 
             if (nPtr->pEnt->location.type == BUS_PCI){

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: