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

[Git][xorg-team/lib/xcb-util-renderutil][debian-unstable] 14 commits: Update README for gitlab migration

Title: GitLab

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / xcb-util-renderutil

Commits:

  • fe9e4975
    by Alan Coopersmith at 2019-02-17T11:37:49-08:00 
    Update README for gitlab migration

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 2970e4f8
    by Alan Coopersmith at 2019-02-17T11:37:49-08:00 
    Update configure.ac bug URL for gitlab migration

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 62518b54
    by Alan Coopersmith at 2022-07-20T15:25:04-07:00 
    Build xz tarballs instead of bzip2

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

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

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 0b5fd545
    by Alan Coopersmith at 2022-07-24T14:16:50-07:00 
    configure: Drop AM_MAINTAINER_MODE

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 5dc8a48b
    by Alan Coopersmith at 2022-07-24T14:16:50-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>
  • 5826607a
    by Peter Hutterer at 2022-07-24T14:16:50-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>
  • 4d28322e
    by Emil Velikov at 2022-07-24T14:16:50-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>
  • 67740128
    by Mihail Konev at 2022-07-24T14:16:55-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>
  • 5293d8b6
    by Alan Coopersmith at 2022-10-18T18:40:10-07:00 
    xcb-util-renderutil 0.3.10

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 92e5ec9e
    by Timo Aaltonen at 2025-01-22T12:47:48+02:00 
    Merge branch 'upstream-unstable' into debian-unstable
  • 33c74b0d
    by Timo Aaltonen at 2025-01-22T12:48:17+02:00 
    version bump
  • 3193800b
    by Timo Aaltonen at 2025-01-22T12:50:29+02:00 
    re-indent depends

8 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-render-util'
    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-render-util
    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

  • Makefile.am
    ... ... @@ -14,4 +14,4 @@ dist-hook: ChangeLog INSTALL
    14 14
    15 15 
     SUBDIRS = renderutil
    16 16
    17 
    -EXTRA_DIST = autogen.sh
    17 
    +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-render-util/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-renderutil module
    24 23 
     ================================
    ... ... @@ -28,10 +27,11 @@ XCB util-renderutil module provides the following library:
    28 27 
       - renderutil: Convenience functions for the Render extension.
    29 28
    30 29 
     You can obtain the latest development versions of XCB util-renderutil
    31 
    -using GIT. For anonymous checkouts, use:
    30 
    +using GIT from <https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util>.
    32 31
    33 
    -  git clone --recursive git://anongit.freedesktop.org/git/xcb/util-renderutil
    32 
    +  For anonymous checkouts, use:
    34 33
    35 
    -For developers, use:
    34 
    +    git clone --recursive https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util.git
    35 
    +  For developers, use:
    36 36
    37 
    -  git clone --recursive git+ssh://git.freedesktop.org/git/xcb/util-renderutil
    37 
    +    git clone --recursive git@gitlab.freedesktop.org:xorg/lib/libxcb-render-util.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-render-util"
    29 
    +
    30 
    +if test -z "$NOCONFIGURE"; then
    31 
    +    exec "$srcdir"/configure "$@"
    32 
    +fi

  • configure.ac
    1 1 
     AC_PREREQ(2.59c)
    2 
    -AC_INIT([xcb-util-renderutil],[0.3.9],
    3 
    -        [https://bugs.freedesktop.org/enter_bug.cgi?product=xcb&component=Utils],
    2 
    +AC_INIT([xcb-util-renderutil],[0.3.10],
    3 
    +        [https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util/-/issues],
    4 4 
             [xcb-util-renderutil])
    5 5 
     AC_CONFIG_SRCDIR([Makefile.am])
    6 6 
     AC_CONFIG_HEADERS([config.h])
    7 7 
     AC_CONFIG_MACRO_DIR([m4])
    8 
    -AM_INIT_AUTOMAKE([foreign dist-bzip2])
    9 
    -AM_MAINTAINER_MODE
    8 
    +AM_INIT_AUTOMAKE([foreign dist-xz])
    10 9
    11 10 
     XCB_UTIL_COMMON([1.4], [1.6])
    12 11

  • debian/changelog
    1 
    -xcb-util-renderutil (0.3.9-2) UNRELEASED; urgency=medium
    1 
    +xcb-util-renderutil (0.3.10-1) UNRELEASED; urgency=medium
    2 2
    3 
    +  [ Debian Janitor ]
    3 4 
       * Use secure copyright file specification URI.
    4 5 
       * Use secure URI in Homepage field.
    5 6 
       * Bump debhelper from old 9 to 10.
    ... ... @@ -8,6 +9,9 @@ xcb-util-renderutil (0.3.9-2) UNRELEASED; urgency=medium
    8 9 
       * Rely on pre-initialized dpkg-architecture variables.
    9 10 
       * Remove MIA uploader Julien Danjou <acid@debian.org>. Closes: #928588
    10 11
    12 
    +  [ Timo Aaltonen ]
    13 
    +  * New upstream release.
    14 
    +
    11 15 
      -- Debian Janitor <janitor@jelmer.uk>  Tue, 21 Jan 2020 00:31:10 +0000
    12 16
    13 17 
     xcb-util-renderutil (0.3.9-1) unstable; urgency=low

  • debian/control
    ... ... @@ -3,17 +3,18 @@ Section: libdevel
    3 3 
     Priority: optional
    4 4 
     Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
    5 5 
     Uploaders: Arnaud Fontaine <arnau@debian.org>
    6 
    -Build-Depends: cdbs (>= 0.4.93~),
    7 
    -               debhelper (>= 10~),
    8 
    -               dh-autoreconf,
    9 
    -               libxcb1-dev (>= 1.6),
    10 
    -               libxcb-render0-dev,
    11 
    -               pkg-config,
    12 
    -               libtool,
    13 
    -               autotools-dev,
    14 
    -               autoconf,
    15 
    -               automake,
    16 
    -               xutils-dev
    6 
    +Build-Depends:
    7 
    + cdbs (>= 0.4.93~),
    8 
    + debhelper (>= 10~),
    9 
    + dh-autoreconf,
    10 
    + libxcb1-dev (>= 1.6),
    11 
    + libxcb-render0-dev,
    12 
    + pkg-config,
    13 
    + libtool,
    14 
    + autotools-dev,
    15 
    + autoconf,
    16 
    + automake,
    17 
    + xutils-dev
    17 18 
     Standards-Version: 3.9.5
    18 19 
     Homepage: https://xcb.freedesktop.org
    19 20 
     Vcs-Git: https://salsa.debian.org/xorg-team/lib/xcb-util-renderutil.git
    ... ... @@ -24,7 +25,9 @@ Section: libs
    24 25 
     Architecture: any
    25 26 
     Multi-Arch: same
    26 27 
     Pre-Depends: ${misc:Pre-Depends}
    27 
    -Depends: ${shlibs:Depends}, ${misc:Depends}
    28 
    +Depends:
    29 
    + ${shlibs:Depends},
    30 
    + ${misc:Depends}
    28 31 
     Description: utility libraries for X C Binding -- render-util
    29 32 
      This package contains the library files needed to run software using
    30 33 
      libxcb-render-util, providing convenience functions for the Render extension.
    ... ... @@ -39,10 +42,11 @@ Description: utility libraries for X C Binding -- render-util
    39 42 
     Package: libxcb-render-util0-dev
    40 43 
     Architecture: any
    41 44 
     Multi-Arch: same
    42 
    -Depends: libxcb-render-util0 (= ${binary:Version}),
    43 
    -         libxcb1-dev,
    44 
    -         libxcb-render0-dev,
    45 
    -         ${misc:Depends}
    45 
    +Depends:
    46 
    + libxcb-render-util0 (= ${binary:Version}),
    47 
    + libxcb1-dev,
    48 
    + libxcb-render0-dev,
    49 
    + ${misc:Depends}
    46 50 
     Description: utility libraries for X C Binding -- render-util
    47 51 
      This package contains the header and library files needed to build software
    48 52 
      using libxcb-render-util, providing convenience functions for the Render

  • 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: