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

[Git][xorg-team/lib/xcb-util-wm][debian-unstable] 17 commits: Update configure.ac bug URL for gitlab migration

Title: GitLab

Emilio Pozuelo Monfort pushed to branch debian-unstable at X Strike Force / lib / xcb-util-wm

Commits:

  • 82a77443
    by Alan Coopersmith at 2019-02-17T11:41:06-08:00 
    Update configure.ac bug URL for gitlab migration

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 177d933f
    by Alan Coopersmith at 2019-02-17T11:49:45-08:00 
    Update README for gitlab migration

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 1940f418
    by Alexander Gottwald at 2020-09-17T19:14:45+02:00 
    Update .gitmodules for gitlab submodule
  • dbb4df47
    by Alan Coopersmith at 2022-07-20T15:40:21-07:00 
    Build xz tarballs instead of bzip2

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • bac661ed
    by Alan Coopersmith at 2022-07-20T15:40:41-07:00 
    Update m4 to xorg/util/xcb-util-m4@c617eee22ae5c285e79e81

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • fac9e1bc
    by Alan Coopersmith at 2022-07-20T15:41:49-07:00 
    gitlab CI: add a basic build test

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • fbc6bf61
    by Alan Coopersmith at 2022-07-24T14:19:46-07:00 
    configure: Drop AM_MAINTAINER_MODE

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 63400a25
    by Alan Coopersmith at 2022-07-24T14:19:47-07:00 
    autogen.sh: Honor NOCONFIGURE=1

See http://people.gnome.org/~walters/docs/build-api.txt

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • a7cf3ad9
    by Peter Hutterer at 2022-07-24T14:19:47-07:00 
    autogen.sh: use exec instead of waiting for configure to finish

Syncs the invocation of configure with the one from the server.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 80e52c06
    by Emil Velikov at 2022-07-24T14:19:47-07:00 
    autogen.sh: use quoted string variables

Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
fall-outs, when they contain space.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 2c4ec9a6
    by Mihail Konev at 2022-07-24T14:19:50-07:00 
    autogen: add default patch prefix

Signed-off-by: Mihail Konev <k.mvc@ya.ru>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 0c6681e4
    by Alan Coopersmith at 2022-10-18T19:01:07-07:00 
    xcb-util-wm 0.4.2

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • f1b0a135
    by Emilio Pozuelo Monfort at 2024-10-18T11:56:12+02:00 
    Merge branch 'upstream-unstable' into debian-unstable
  • 3811fc77
    by Emilio Pozuelo Monfort at 2024-10-18T11:58:04+02:00 
    New upstream release
  • 5550fc0e
    by Emilio Pozuelo Monfort at 2024-10-18T11:59:56+02:00 
    Update debian/watch to version 4
  • 085be876
    by Emilio Pozuelo Monfort at 2024-10-18T12:16:22+02:00 
    Switch to pkgconf
  • c7b0fe02
    by Emilio Pozuelo Monfort at 2024-10-18T12:19:59+02:00 
    Release to sid

11 changed files:

Changes:

  • .gitlab-ci.yml
    1 
    +# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml:
    2 
    +#
    3 
    +# This CI uses the freedesktop.org ci-templates.
    4 
    +# Please see the ci-templates documentation for details:
    5 
    +# https://freedesktop.pages.freedesktop.org/ci-templates/
    6 
    +
    7 
    +.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
    8 
    +
    9 
    +
    10 
    +include:
    11 
    +  # Arch container builder template
    12 
    +  - project: 'freedesktop/ci-templates'
    13 
    +    ref: *template_sha
    14 
    +    file: '/templates/arch.yml'
    15 
    +  - project: 'freedesktop/ci-templates'
    16 
    +    ref: *template_sha
    17 
    +    file: '/templates/ci-fairy.yml'
    18 
    +  - template: Security/SAST.gitlab-ci.yml
    19 
    +
    20 
    +
    21 
    +stages:
    22 
    +  - prep             # prep work like rebuilding the container images if there is a change
    23 
    +  - build            # for actually building and testing things in a container
    24 
    +  - test
    25 
    +  - deploy
    26 
    +
    27 
    +
    28 
    +variables:
    29 
    +  FDO_UPSTREAM_REPO: 'xorg/lib/libxcb-wm'
    30 
    +  # The tag should be updated each time the list of packages is updated.
    31 
    +  # Changing a tag forces the associated image to be rebuilt.
    32 
    +  # Note: the tag has no meaning, we use a date format purely for readability
    33 
    +  FDO_DISTRIBUTION_TAG:  '2022-07-20.0'
    34 
    +  FDO_DISTRIBUTION_PACKAGES:  'git gcc pkgconf autoconf automake libtool make xorg-util-macros doxygen graphviz xorgproto libxcb'
    35 
    +  GIT_SUBMODULE_STRATEGY: normal
    36 
    +
    37 
    +#
    38 
    +# Verify that commit messages are as expected
    39 
    +#
    40 
    +check-commits:
    41 
    +  extends:
    42 
    +    - .fdo.ci-fairy
    43 
    +  stage: prep
    44 
    +  script:
    45 
    +    - ci-fairy check-commits --junit-xml=results.xml
    46 
    +  except:
    47 
    +    - master@xorg/lib/libxcb-wm
    48 
    +  variables:
    49 
    +    GIT_DEPTH: 100
    50 
    +  artifacts:
    51 
    +    reports:
    52 
    +      junit: results.xml
    53 
    +
    54 
    +#
    55 
    +# Verify that the merge request has the allow-collaboration checkbox ticked
    56 
    +#
    57 
    +check-merge-request:
    58 
    +  extends:
    59 
    +    - .fdo.ci-fairy
    60 
    +  stage: deploy
    61 
    +  script:
    62 
    +    - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
    63 
    +  artifacts:
    64 
    +    when: on_failure
    65 
    +    reports:
    66 
    +      junit: results.xml
    67 
    +  allow_failure: true
    68 
    +
    69 
    +
    70 
    +#
    71 
    +# Build a container with the given tag and the packages pre-installed.
    72 
    +# This only happens if/when the tag changes, otherwise the existing image is
    73 
    +# re-used.
    74 
    +#
    75 
    +container-prep:
    76 
    +  extends:
    77 
    +    - .fdo.container-build@arch
    78 
    +  stage: prep
    79 
    +  variables:
    80 
    +    GIT_STRATEGY: none
    81 
    +
    82 
    +
    83 
    +#
    84 
    +# The default build, runs on the image built above.
    85 
    +#
    86 
    +build:
    87 
    +  stage: build
    88 
    +  extends:
    89 
    +    - .fdo.distribution-image@arch
    90 
    +  script:
    91 
    +    - autoreconf -ivf
    92 
    +    - mkdir _builddir
    93 
    +    - pushd _builddir > /dev/null
    94 
    +    - ../configure --disable-silent-rules
    95 
    +    - make
    96 
    +    - make check
    97 
    +    - make distcheck
    98 
    +    - popd > /dev/null

  • .gitmodules
    1 1 
     [submodule "m4"]
    2 2 
     	path = m4
    3 
    -	url = "" class="idiff left deletion" style="background-color: #fac5cd;">git://anongit.freedesktop.org/xcb/util-common-m4.git
    3 
    +	url = "" class="idiff left addition" style="background-color: #c7f0d2;">https://gitlab.freedesktop.org/xorg/util/xcb-util-m4.git

  • Makefile.am
    ... ... @@ -13,4 +13,4 @@ ChangeLog:
    13 13 
     dist-hook: ChangeLog INSTALL
    14 14
    15 15 
     SUBDIRS = icccm ewmh
    16 
    -EXTRA_DIST = autogen.sh
    16 
    +EXTRA_DIST = autogen.sh README.md

  • README → README.md
    ... ... @@ -13,12 +13,11 @@ you're using and why you aren't in a mental hospital yet. We'd welcome
    13 13 
     patches/suggestions for enhancement and new libraries; Please report any
    14 14 
     issues you find to the freedesktop.org bug tracker, at:
    15 15
    16 
    -  <https://bugs.freedesktop.org/enter_bug.cgi?product=XCB>
    16 
    +  https://gitlab.freedesktop.org/xorg/lib/libxcb-wm/issues
    17 17
    18 18 
     Discussion about XCB occurs on the XCB mailing list:
    19 19
    20 
    -  <mailto:xcb at lists.freedesktop.org>
    21 
    -  <http://lists.freedesktop.org/mailman/listinfo/xcb>
    20 
    +  https://lists.freedesktop.org/mailman/listinfo/xcb
    22 21
    23 22 
     About XCB util-wm module
    24 23 
     ========================
    ... ... @@ -28,22 +27,14 @@ XCB util-wm module provides the following libraries:
    28 27 
       - ewmh: Both client and window-manager helpers for EWMH.
    29 28 
       - icccm: Both client and window-manager helpers for ICCCM.
    30 29
    30 
    +You can obtain the latest development versions of XCB using GIT from:
    31 31
    32 
    -Please report any issues you find to the freedesktop.org bug tracker,
    33 
    -at:
    32 
    +  https://gitlab.freedesktop.org/xorg/lib/libxcb-wm
    34 33
    35 
    -	<https://bugs.freedesktop.org/enter_bug.cgi?product=xcb&component=Utils>
    34 
    +  For anonymous checkouts, use:
    36 35
    37 
    -Discussion about XCB occurs on the XCB mailing list:
    38 
    -
    39 
    -        <mailto:xcb at lists.freedesktop.org>
    40 
    -        <http://lists.freedesktop.org/mailman/listinfo/xcb>
    41 
    -
    42 
    -You can obtain the latest development versions of XCB using GIT.
    43 
    -For anonymous checkouts, use:
    44 
    -
    45 
    -        git clone --recursive git://anongit.freedesktop.org/git/xcb/util-wm
    36 
    +    git clone --recursive https://gitlab.freedesktop.org/xorg/lib/libxcb-wm.git
    46 37
    47 
    -For developers, use:
    38 
    +  For developers, use:
    48 39
    49 
    -        git clone --recursive git+ssh://git.freedesktop.org/git/xcb/util-wm
    40 
    +    git clone --recursive git@gitlab.freedesktop.org:xorg/lib/libxcb-wm.git

  • 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 
     # If this is a git checkout, verify that the submodules are initialized,
    10 10 
     # otherwise autotools will just fail with an unhelpful error message.
    ... ... @@ -22,6 +22,11 @@ then
    22 22 
     fi
    23 23
    24 24 
     autoreconf -v --install || exit 1
    25 
    -cd $ORIGDIR || exit $?
    25 
    +cd "$ORIGDIR" || exit $?
    26 26
    27 
    -$srcdir/configure --enable-maintainer-mode "$@"
    27 
    +git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
    28 
    +    git config --local format.subjectPrefix "PATCH libxcb-wm"
    29 
    +
    30 
    +if test -z "$NOCONFIGURE"; then
    31 
    +    exec "$srcdir"/configure "$@"
    32 
    +fi

  • configure.ac
    1 1 
     dnl XCB_UTIL_M4_WITH_INCLUDE_PATH requires Autoconf >= 2.62
    2 2 
     AC_PREREQ(2.62)
    3 
    -AC_INIT([xcb-util-wm],[0.4.1],
    4 
    -        [https://bugs.freedesktop.org/enter_bug.cgi?product=xcb&component=Utils],
    3 
    +AC_INIT([xcb-util-wm], [0.4.2],
    4 
    +        [https://gitlab.freedesktop.org/xorg/lib/libxcb-wm/-/issues],
    5 5 
             [xcb-util-wm])
    6 6 
     AC_CONFIG_SRCDIR([Makefile.am])
    7 7 
     AC_CONFIG_HEADERS([config.h])
    8 8 
     AC_CONFIG_MACRO_DIR([m4])
    9 
    -AM_INIT_AUTOMAKE([foreign dist-bzip2])
    10 
    -AM_MAINTAINER_MODE
    9 
    +AM_INIT_AUTOMAKE([foreign dist-xz])
    11 10
    12 11 
     XCB_UTIL_M4_WITH_INCLUDE_PATH
    13 12 
     XCB_UTIL_COMMON([1.4], [1.6])

  • debian/changelog
    1 
    -xcb-util-wm (0.4.1-2) UNRELEASED; urgency=medium
    1 
    +xcb-util-wm (0.4.2-1) unstable; urgency=medium
    2 
    +
    3 
    +  * Team upload.
    2 4
    3 5 
       [ Jeremy Bicha ]
    4 6 
       * Build with dh instead of cdbs
    ... ... @@ -10,7 +12,13 @@ xcb-util-wm (0.4.1-2) UNRELEASED; urgency=medium
    10 12 
       [ Debian Janitor ]
    11 13 
       * Remove MIA uploader Julien Danjou <acid@debian.org>. Closes: #928565
    12 14
    13 
    - -- Jeremy Bicha <jbicha@debian.org>  Thu, 22 Jul 2021 19:38:56 -0400
    15 
    +  [ Emilio Pozuelo Monfort ]
    16 
    +  * New upstream release. Closes: #1084962
    17 
    +  * debian/watch: switch to version 4, thanks Boyuan Yang.
    18 
    +  * debian/docs: install README.md, the file has been renamed.
    19 
    +  * debian/control: switch to pkgconf.
    20 
    +
    21 
    + -- Emilio Pozuelo Monfort <pochu@debian.org>  Fri, 18 Oct 2024 12:17:23 +0200
    14 22
    15 23 
     xcb-util-wm (0.4.1-1.1) unstable; urgency=medium
    16 24

  • debian/control
    ... ... @@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
    5 5 
     Uploaders: Arnaud Fontaine <arnau@debian.org>
    6 6 
     Build-Depends: debhelper-compat (= 13),
    7 7 
                    libxcb1-dev (>= 1.6),
    8 
    -               pkg-config,
    8 
    +               pkgconf,
    9 9 
                    xutils-dev (>= 1:7.7~1~)
    10 10 
     Standards-Version: 4.5.1
    11 11 
     Homepage: https://xcb.freedesktop.org

  • debian/docs
    1 1 
     NEWS
    2 
    -README
    2 
    +README.md

  • debian/watch
    1 
    -version=3
    2 
    -https://xcb.freedesktop.org/dist/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@
    1 
    +version=4
    2 
    +opts="" \
    3 
    + http://xcb.freedesktop.org/dist/ @PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@

  • m4
    1 
    -Subproject commit f662e3a93ebdec3d1c9374382dcc070093a42fed
    1 
    +Subproject commit c617eee22ae5c285e79e81ec39ce96862fd3262f

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: