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

[Git][xorg-team/lib/libxss][debian-unstable] 14 commits: Fix typo in man page: XScreenSaverSaverRegister()



Title: GitLab

Julien Cristau pushed to branch debian-unstable at X Strike Force / lib / libxss

Commits:

10 changed files:

Changes:

  • ChangeLog
    1
    +commit 96fffcd9dcaf2ba37ec56aa798677de9ad58ae81
    
    2
    +Author: Adam Jackson <ajax@redhat.com>
    
    3
    +Date:   Thu Jul 5 12:29:44 2018 -0400
    
    4
    +
    
    5
    +    libXScrnSaver 1.2.3
    
    6
    +    
    
    7
    +    Signed-off-by: Adam Jackson <ajax@redhat.com>
    
    8
    +
    
    9
    +commit a16cf8e5018ca78d1b6d282fb1574adec69d2d84
    
    10
    +Author: Mihail Konev <k.mvc@ya.ru>
    
    11
    +Date:   Thu Jan 26 13:52:49 2017 +1000
    
    12
    +
    
    13
    +    autogen: add default patch prefix
    
    14
    +    
    
    15
    +    Signed-off-by: Mihail Konev <k.mvc@ya.ru>
    
    16
    +
    
    17
    +commit a8f59be6586877cae0a763145ca47bac3a0ea4ec
    
    18
    +Author: Emil Velikov <emil.l.velikov@gmail.com>
    
    19
    +Date:   Mon Mar 9 12:00:52 2015 +0000
    
    20
    +
    
    21
    +    autogen.sh: use quoted string variables
    
    22
    +    
    
    23
    +    Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
    
    24
    +    fall-outs, when they contain space.
    
    25
    +    
    
    26
    +    Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
    
    27
    +    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
    
    28
    +    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    
    29
    +
    
    30
    +commit 57ca1c84080b778de2be267c2547b40ceeb09c99
    
    31
    +Author: Peter Hutterer <peter.hutterer@who-t.net>
    
    32
    +Date:   Tue Jan 24 10:32:07 2017 +1000
    
    33
    +
    
    34
    +    autogen.sh: use exec instead of waiting for configure to finish
    
    35
    +    
    
    36
    +    Syncs the invocation of configure with the one from the server.
    
    37
    +    
    
    38
    +    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    
    39
    +    Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
    
    40
    +
    
    41
    +commit 886f8ef984aa29bdc3a0de329af363bb3c8d1a33
    
    42
    +Author: Alan Coopersmith <alan.coopersmith@oracle.com>
    
    43
    +Date:   Sat May 31 21:39:32 2014 -0700
    
    44
    +
    
    45
    +    autogen.sh: Honor NOCONFIGURE=1
    
    46
    +    
    
    47
    +    See http://people.gnome.org/~walters/docs/build-api.txt
    
    48
    +    
    
    49
    +    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    
    50
    +
    
    51
    +commit 53256679068b9e32a76d7840652ae26ec3300704
    
    52
    +Author: Alan Coopersmith <alan.coopersmith@oracle.com>
    
    53
    +Date:   Sat May 31 21:38:41 2014 -0700
    
    54
    +
    
    55
    +    configure: Drop AM_MAINTAINER_MODE
    
    56
    +    
    
    57
    +    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    
    58
    +
    
    59
    +commit 74406e5ea3378a9b633ad0776a4bb34347cf1911
    
    60
    +Author: Alan Coopersmith <alan.coopersmith@oracle.com>
    
    61
    +Date:   Sat Dec 7 19:45:45 2013 -0800
    
    62
    +
    
    63
    +    Copy root field from wire event into root, not window, of Xlib event
    
    64
    +    
    
    65
    +    Fixes cppcheck warning:
    
    66
    +    [src/XScrnSaver.c:104] -> [src/XScrnSaver.c:105]: (performance, inconclusive)
    
    67
    +     Variable 'window' is reassigned a value before the old one has been
    
    68
    +     used if variable is no semaphore variable.
    
    69
    +    
    
    70
    +    Error seems to date back to revision 1.1 in X Consortium RCS,
    
    71
    +    dated 1992-02-13, by "keith"
    
    72
    +    
    
    73
    +    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    
    74
    +    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
    
    75
    +
    
    76
    +commit f388a2ff259ee1c1c6058762e900bb29550e8246
    
    77
    +Author: Daniel Martin <consume.noise@gmail.com>
    
    78
    +Date:   Fri Feb 8 01:36:53 2013 -0800
    
    79
    +
    
    80
    +    Fix typo in man page: XScreenSaverSaverRegister()
    
    81
    +    
    
    82
    +    Signed-off-by: Daniel Martin <consume.noise@gmail.com>
    
    83
    +    Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
    
    84
    +    Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
    
    85
    +
    
    1 86
     commit 0ec072963f5964e09fbf84f4cd7d7ff8a9f3291f
    
    2 87
     Author: Alan Coopersmith <alan.coopersmith@oracle.com>
    
    3 88
     Date:   Wed Mar 7 21:05:41 2012 -0800
    

  • 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 libXScrnSaver"
    
    14
    +
    
    15
    +if test -z "$NOCONFIGURE"; then
    
    16
    +    exec "$srcdir"/configure "$@"
    
    17
    +fi

  • configure.ac
    ... ... @@ -22,14 +22,13 @@
    22 22
     
    
    23 23
     # Initialize Autoconf
    
    24 24
     AC_PREREQ([2.60])
    
    25
    -AC_INIT([libXScrnSaver], [1.2.2],
    
    25
    +AC_INIT([libXScrnSaver], [1.2.3],
    
    26 26
             [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXScrnSaver])
    
    27 27
     AC_CONFIG_SRCDIR([Makefile.am])
    
    28 28
     AC_CONFIG_HEADERS([config.h])
    
    29 29
     
    
    30 30
     # Initialize Automake
    
    31 31
     AM_INIT_AUTOMAKE([foreign dist-bzip2])
    
    32
    -AM_MAINTAINER_MODE
    
    33 32
     
    
    34 33
     # Initialize libtool
    
    35 34
     AC_PROG_LIBTOOL
    

  • debian/changelog
    1
    -libxss (1:1.2.2-2) UNRELEASED; urgency=medium
    
    1
    +libxss (1:1.2.3-1) unstable; urgency=medium
    
    2
    +
    
    3
    +  * Team upload
    
    2 4
     
    
    3 5
       [ Sven Joachim ]
    
    4 6
       * Bump debhelper compat level to 10.
    
    ... ... @@ -12,7 +14,13 @@ libxss (1:1.2.2-2) UNRELEASED; urgency=medium
    12 14
       [ Jakub Wilk ]
    
    13 15
       * Fix git URL in package description (Closes: #888460).
    
    14 16
     
    
    15
    - -- Sven Joachim <svenjoac@gmx.de>  Thu, 18 Jan 2018 17:58:24 +0100
    
    17
    +  [ Julien Cristau ]
    
    18
    +  * Let uscan verify tarball signatures.
    
    19
    +  * Update upstream URLs to use https and gitlab.fdo.
    
    20
    +  * New upstream release
    
    21
    +  * Remove Cyril from Uploaders.
    
    22
    +
    
    23
    + -- Julien Cristau <jcristau@debian.org>  Thu, 06 Sep 2018 14:25:04 +0200
    
    16 24
     
    
    17 25
     libxss (1:1.2.2-1) unstable; urgency=low
    
    18 26
     
    

  • debian/control
    ... ... @@ -2,7 +2,6 @@ Source: libxss
    2 2
     Section: x11
    
    3 3
     Priority: optional
    
    4 4
     Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
    
    5
    -Uploaders: Cyril Brulebois <kibi@debian.org>
    
    6 5
     Build-Depends:
    
    7 6
      debhelper (>= 10),
    
    8 7
      libx11-dev (>= 1:0.99.2),
    
    ... ... @@ -32,10 +31,10 @@ Description: X11 Screen Saver extension library
    32 31
      the running session.
    
    33 32
      .
    
    34 33
      More information about X.Org can be found at:
    
    35
    - <URL:http://www.X.org>
    
    34
    + <URL:https://www.X.org>
    
    36 35
      .
    
    37 36
      This module can be found at
    
    38
    - git://anongit.freedesktop.org/git/xorg/lib/libXScrnSaver
    
    37
    + https://gitlab.freedesktop.org/xorg/lib/libXScrnSaver
    
    39 38
     
    
    40 39
     Package: libxss-dev
    
    41 40
     Section: libdevel
    
    ... ... @@ -62,7 +61,7 @@ Description: X11 Screen Saver extension library (development headers)
    62 61
      libxss1.  Non-developers likely have little use for this package.
    
    63 62
      .
    
    64 63
      More information about X.Org can be found at:
    
    65
    - <URL:http://www.X.org>
    
    64
    + <URL:https://www.X.org>
    
    66 65
      .
    
    67 66
      This module can be found at
    
    68
    - git://anongit.freedesktop.org/git/xorg/lib/libXScrnSaver
    67
    + https://gitlab.freedesktop.org/xorg/lib/libXScrnSaver

  • debian/copyright
    1 1
     This package was downloaded from
    
    2
    -http://xorg.freedesktop.org/releases/individual/lib/
    
    2
    +https://xorg.freedesktop.org/releases/individual/lib/
    
    3 3
     
    
    4 4
     Copyright (c) 1992  X Consortium
    
    5 5
     
    

  • debian/upstream/signing-key.asc
    1
    +-----BEGIN PGP PUBLIC KEY BLOCK-----
    
    2
    +
    
    3
    +mQGNBFnVVFMBDACz5+V0s2/JjDuvutBbI4hAO3Zgb8mlny5nM/YgkCCVe79MsOAe
    
    4
    +5Kn4Gj+lc8LiwJ4fyYPAWx1FIliryYE4RgpnKhipQhZB/UcvImTHQA4tqIavReyo
    
    5
    +H4o5+CbPgRY7XNE2wRWOogWd3WuSeuq/37mu1gORmq3KogzuarjJvffLNL4saA+w
    
    6
    +J37BXWhQ3P+eRiyF0qHaozf+bMenqtWEy0n0IQEg5wUS/zGXVlOX3fNhJeskq93a
    
    7
    +US0bu3axZL4sxOMKxnhRK0XDziFaiMu/DTj4Y0SWDXgK0owkcc7Ow2eAX52Z+zvw
    
    8
    +m9O3nBaQvQV7cUxNwYBmc2WkVts9XBrGT7tZ3HmFAkzB6YyPfdXYT4TpyFLofLVs
    
    9
    +JDvpa8iXkOmy22JUuqJlW36Idpmv/2jNkEfiIbby3wwZtONJOD9xNxCmOiVGA59+
    
    10
    +q+Lgs0aCWzomNx07zMOEeVvLOj9ficZhTqfvhZrkPD4iEOKKIpRRjCyDyMa0HTb7
    
    11
    +XAkDYk/NcZe4kQsAEQEAAbQcQWRhbSBKYWNrc29uIDxhamF4QG53bmsubmV0PokB
    
    12
    +zgQTAQgAOBYhBJle1cimE46wlh8YR0wJ3YPKqlCyBQJZ1VRTAhsDBQsJCAcCBhUI
    
    13
    +CQoLAgQWAgMBAh4BAheAAAoJEEwJ3YPKqlCy6A4L/Ru8dHFdsNKvKtBH9szNgd5d
    
    14
    +qcjEVWzw6YZKRTVpqw30O9uTcfuHzjV5ATIVTPEdXLklQficyCb4mGQLwxL2q5kT
    
    15
    +YMrGteTwBt4pYExo/DYIEZom3f9+75+OgN1PleXQ9pTYo+Ndw18GsnD/sW04HX2I
    
    16
    +IGKY3qUX3qhlxG6zdXsHTTIoCCBXrWepaD/IdA9Nw37tiyaTq2NH/ChcxFN7SuYr
    
    17
    +SWpBkPRhcsxKDju7j+s4KzO9f1QYFB2Vi3TbbYLEJ3BJg6AxVoiVe4B9xfl6KfCa
    
    18
    +EUjFWMqUprWiOjxNAdRUnfBN3UF2O/BxAtgZMk3RwVGG7fAEkfACkws8G5lcraTu
    
    19
    +kHQJBfzdlbbwrQG4020kRRdNihblPHZAWI5PJG5jpdGcqftyD+lRvv4gljHpAg/I
    
    20
    +eMK4rHjGANX3uQvcCelNwKf8TPVIDTB5vYvWmnHtRmEQkIeHhrMRzjhZej+uzNDF
    
    21
    +FpKPZayGn2uyPLv77aZCQmEs1O1EafWz1+IfBWDUmLkBjQRZ1VRTAQwA5E5W/FDK
    
    22
    +wfm+owkPenG0VYoXRfLlrBDvHcewLt04evdygHZZxNdV9Ycpsve9INdEg4nTJHj4
    
    23
    +mf302faUGECtiMKek78mfymzbAXS0kEXc2NoaXtEgFlPhavM4e8PpJ5aAKEsSHnQ
    
    24
    +1HMS2KJ4bPbDNSLpWkT4HBDAzsJHOFNDu0Z6TsyG/bA1VLoj0iMC9jL8xWz1lOBN
    
    25
    +iAhukMkjHOvmeq4BA2ktH5CUh8qwn8iEyw4sps5RcFKanIeru3sg8SVed4w0oCId
    
    26
    +Tw54mSNE3vzGiK9tDk0yhDRq2oFT7ER4r0Cr3ctyAsDPJCwhgVJ2YWAGdHewdfg6
    
    27
    +l1hfsvmO1omjR1SQBSEbw6Ftl6GySd91rsvT9i5+3LiNIpYgYb2L6wNn7cSXc9NF
    
    28
    +RXDWtw07P1mRJiRrBHwX1Brro7h9tvFT751F5yWSDdah5dUaqbl0C3cmXMoM+FLv
    
    29
    +E0dECfuM/mwOvtvlYzL1htdTSLZRb25dddZ6nTlH3sLkVpd9oZRSd7kdABEBAAGJ
    
    30
    +AbYEGAEIACAWIQSZXtXIphOOsJYfGEdMCd2DyqpQsgUCWdVUUwIbDAAKCRBMCd2D
    
    31
    +yqpQsjd+C/sHZFFz3zSLBo1sUIHCGl6P2DYHatEoQTP7R8g1kAHd145pAGrvXzR4
    
    32
    +F6T5SgM8t4a04Ia2SJLaptNXpf1pJXKlEpEaCb/oDhB/eCt8sOilcqSojkEmpe7z
    
    33
    +1xZY/ePNSzbsXDWTOagTM70UdaxgDand1dxMs2q8+Q3y3xZltXcYDmM48a/mRwe7
    
    34
    +rtPK68v3A54ZbcXojNcIMS1JBk+XcuBbmeI0yfGkcqbO2hiP8W81n1mb96jfZ/wj
    
    35
    +QhNzLqI3zxRnFHPiBMLy9tF0odNCRccQ2mbKdV2cfOIF5WKC4lrcyqz3eit2RYdS
    
    36
    +W3PPUqS3x2696I40zI2KoFjRn7YcWJ6T+skZPWW5bHCVcUN57v7270IG2MCA6D6a
    
    37
    +Rto7m6yUbLNgGadDyIjTQladTN1aKYK/QAsxS4y+EhkAPeaQRvZxBhZEocjIAE0B
    
    38
    +D2qzco+dq7IuQHIhXTnGRGEsS0bQdEnpQAoTQMVRo7loR2/XqzCIjkG40JH7Cr/r
    
    39
    +gPSRdLLYOLo=
    
    40
    +=+H4u
    
    41
    +-----END PGP PUBLIC KEY BLOCK-----

  • debian/watch
    1
    -#git=git://anongit.freedesktop.org/xorg/lib/libXScrnSaver
    
    1
    +#git=https://gitlab.freedesktop.org/xorg/lib/libXScrnSaver
    
    2 2
     version=3
    
    3
    +opts=pgpsigurlmangle=s/$/.sig/ \
    
    3 4
     https://xorg.freedesktop.org/releases/individual/lib/ libXScrnSaver-(.*)\.tar\.gz

  • man/Xss.man
    ... ... @@ -87,7 +87,7 @@ XSetWindowAttributes *\fIattributes\fP\^);
    87 87
     void XScreenSaverUnsetAttributes(Display *\fIdpy\fP,
    
    88 88
     Drawable \fIdrawable\fP\^);
    
    89 89
     .HP
    
    90
    -void XScreenSaverSaverRegister(Display *\fIdpy\fP, int \fIscreen\fP,
    
    90
    +void XScreenSaverRegister(Display *\fIdpy\fP, int \fIscreen\fP,
    
    91 91
     XID \fIxid\fP, Atom \fItype\fP\^);
    
    92 92
     .HP
    
    93 93
     Status XScreenSaverUnregister(Display *\fIdpy\fP, int \fIscreen\fP\^);
    

  • src/XScrnSaver.c
    ... ... @@ -102,7 +102,7 @@ static Bool wire_to_event (
    102 102
         	se->send_event = (sevent->type & 0x80) != 0;
    
    103 103
         	se->display = dpy;
    
    104 104
         	se->window = sevent->window;
    
    105
    -    	se->window = sevent->root;
    
    105
    +	se->root = sevent->root;
    
    106 106
         	se->state = sevent->state;
    
    107 107
     	se->kind = sevent->kind;
    
    108 108
     	se->forced = True;
    


  • Reply to: