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

[Git][xorg-team/wayland/weston][debian-experimental] 7 commits: Drop outdated references to quilt



Title: GitLab

Dylan Aïssi pushed to branch debian-experimental at X Strike Force / wayland / weston

Commits:

  • c91a7c7e
    by Dylan Aïssi at 2024-01-18T09:51:56+01:00
    Drop outdated references to quilt
    
    No longer required since the package format was clarified
    to "3.0 (quilt)"
    
    Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>
    
  • 422160e4
    by Dylan Aïssi at 2024-01-18T09:51:56+01:00
    Fix short description of libweston-13-dev
    
    Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>
    
  • 074e6a76
    by Dylan Aïssi at 2024-01-18T09:54:31+01:00
    Standards-Version: 4.6.2 (no changes required)
    
    Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>
    
  • 644e1591
    by Dylan Aïssi at 2024-01-18T09:56:58+01:00
    Update debian/copyright
    
    Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>
    
  • 1490b8b2
    by Dylan Aïssi at 2024-01-18T09:58:37+01:00
    Remove trailing whitespace in debian/changelog
    
    Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>
    
  • 4a86d3aa
    by Dylan Aïssi at 2024-01-18T10:07:02+01:00
    Update minimun version of Build-Deps
    
    Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>
    
  • dc4b82fe
    by Dylan Aïssi at 2024-01-18T10:10:26+01:00
    Add debian/gbp.conf
    
    Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>
    

6 changed files:

Changes:

  • debian/README.source deleted
    1
    -This package uses quilt to manage all modifications to the upstream
    
    2
    -source.  Changes are stored in the source package as diffs in
    
    3
    -debian/patches and applied during the build.
    
    4
    -
    
    5
    -To configure quilt to use debian/patches instead of patches, you want
    
    6
    -either to export QUILT_PATCHES=debian/patches in your environment
    
    7
    -or use this snippet in your ~/.quiltrc:
    
    8
    -
    
    9
    -    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
    
    10
    -        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
    
    11
    -                export QUILT_PATCHES=debian/patches
    
    12
    -                break
    
    13
    -        fi
    
    14
    -    done
    
    15
    -
    
    16
    -To get the fully patched source after unpacking the source package, cd to
    
    17
    -the root level of the source package and run:
    
    18
    -
    
    19
    -    quilt push -a
    
    20
    -
    
    21
    -The last patch listed in debian/patches/series will become the current
    
    22
    -patch.
    
    23
    -
    
    24
    -To add a new set of changes, first run quilt push -a, and then run:
    
    25
    -
    
    26
    -    quilt new <patch>
    
    27
    -
    
    28
    -where <patch> is a descriptive name for the patch, used as the filename in
    
    29
    -debian/patches.  Then, for every file that will be modified by this patch,
    
    30
    -run:
    
    31
    -
    
    32
    -    quilt add <file>
    
    33
    -
    
    34
    -before editing those files.  You must tell quilt with quilt add what files
    
    35
    -will be part of the patch before making changes or quilt will not work
    
    36
    -properly.  After editing the files, run:
    
    37
    -
    
    38
    -    quilt refresh
    
    39
    -
    
    40
    -to save the results as a patch.
    
    41
    -
    
    42
    -Alternately, if you already have an external patch and you just want to
    
    43
    -add it to the build system, run quilt push -a and then:
    
    44
    -
    
    45
    -    quilt import -P <patch> /path/to/patch
    
    46
    -    quilt push -a
    
    47
    -
    
    48
    -(add -p 0 to quilt import if needed). <patch> as above is the filename to
    
    49
    -use in debian/patches.  The last quilt push -a will apply the patch to
    
    50
    -make sure it works properly.
    
    51
    -
    
    52
    -To remove an existing patch from the list of patches that will be applied,
    
    53
    -run:
    
    54
    -
    
    55
    -    quilt delete <patch>
    
    56
    -
    
    57
    -You may need to run quilt pop -a to unapply patches first before running
    
    58
    -this command.

  • debian/changelog
    ... ... @@ -346,7 +346,7 @@ weston (1.5.93-1) experimental; urgency=medium
    346 346
       * d/control:
    
    347 347
         + bump wayland version requirement for build.
    
    348 348
         + bump build depend on libinput-dev.
    
    349
    -  * Upload to experimental. 
    
    349
    +  * Upload to experimental.
    
    350 350
     
    
    351 351
      -- Hector Oron <zumbi@debian.org>  Fri, 12 Sep 2014 18:28:31 +0200
    
    352 352
     
    

  • debian/control
    ... ... @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 10),
    11 11
                    libcairo2-dev (>= 1.10.0),
    
    12 12
                    libcolord-dev (>= 0.1.27),
    
    13 13
                    libdbus-1-dev,
    
    14
    -               libdrm-dev (>= 2.4.95),
    
    14
    +               libdrm-dev (>= 2.4.108),
    
    15 15
                    libegl1-mesa-dev (>= 9.0~),
    
    16 16
                    libgbm-dev (>= 17.2),
    
    17 17
                    libgdk-pixbuf-2.0-dev,
    
    ... ... @@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 10),
    19 19
                    libglu1-mesa-dev,
    
    20 20
                    libgstreamer-plugins-base1.0-dev,
    
    21 21
                    libgstreamer1.0-dev,
    
    22
    -               libinput-dev (>= 0.8.0),
    
    22
    +               libinput-dev (>= 1.2.0),
    
    23 23
                    libjpeg-dev,
    
    24 24
                    liblcms2-dev,
    
    25 25
                    libneatvnc-dev,
    
    ... ... @@ -33,7 +33,7 @@ Build-Depends: debhelper (>= 10),
    33 33
                    libudev-dev (>= 136),
    
    34 34
                    libva-dev,
    
    35 35
                    libvpx-dev,
    
    36
    -               libwayland-dev (>= 1.18.0),
    
    36
    +               libwayland-dev (>= 1.22.0),
    
    37 37
                    libwebp-dev,
    
    38 38
                    libx11-dev,
    
    39 39
                    libx11-xcb-dev,
    
    ... ... @@ -47,11 +47,10 @@ Build-Depends: debhelper (>= 10),
    47 47
                    libxkbcommon-dev (>= 0.3.0),
    
    48 48
                    libxml2-dev,
    
    49 49
                    mesa-common-dev,
    
    50
    -               meson (>= 0.52.1),
    
    50
    +               meson (>= 0.63.0),
    
    51 51
                    pkg-config,
    
    52
    -               quilt,
    
    53
    -               wayland-protocols (>= 1.18)
    
    54
    -Standards-Version: 4.4.0
    
    52
    +               wayland-protocols (>= 1.31)
    
    53
    +Standards-Version: 4.6.2
    
    55 54
     Rules-Requires-Root: no
    
    56 55
     Homepage: http://wayland.freedesktop.org/
    
    57 56
     Vcs-Git: https://salsa.debian.org/xorg-team/wayland/weston.git
    
    ... ... @@ -99,7 +98,7 @@ Depends: libpixman-1-dev,
    99 98
              ${shlibs:Depends}
    
    100 99
     Replaces: weston (<< 1.12.0-1)
    
    101 100
     Breaks: weston (<< 1.12.0-1)
    
    102
    -Description: reference implementation of a wayland compositor (shared libs)
    
    101
    +Description: reference implementation of a wayland compositor (headers)
    
    103 102
      Part of the Wayland project is also the Weston reference implementation
    
    104 103
      of a Wayland compositor. Weston can run as an X client or under Linux
    
    105 104
      KMS and ships with a few demo clients. The Weston compositor is a minimal
    

  • debian/copyright
    1
    -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
    
    2
    -Source: http://wayland.freedesktop.org/
    
    1
    +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
    
    2
    +Source: https://wayland.freedesktop.org/
    
    3 3
     
    
    4 4
     Files: *
    
    5 5
     Copyright: © 2016 Armin Krezović
    
    ... ... @@ -64,7 +64,7 @@ Files: data/terminal.png
    64 64
     Copyright: @ 2002-2008 GNOME Project
    
    65 65
     License: CC-BY-SA-3.0
    
    66 66
     
    
    67
    -Files: src/hash.*
    
    67
    +Files: shared/hash.*
    
    68 68
     Copyright: © 2009 Intel Corporation
    
    69 69
                © 1988-2004 Keith Packard and Bart Massey.
    
    70 70
     License: MIT
    

  • debian/gbp.conf
    1
    +[DEFAULT]
    
    2
    +debian-branch = debian-experimental
    
    3
    +upstream-branch = upstream-experimental

  • debian/rules
    ... ... @@ -21,7 +21,7 @@ override_dh_fixperms:
    21 21
     	dh_fixperms -Xusr/bin/weston-launch
    
    22 22
     
    
    23 23
     %:
    
    24
    -	dh $@ --with quilt --buildsystem=meson
    
    24
    +	dh $@ --buildsystem=meson
    
    25 25
     
    
    26 26
     # For maintainer use only, generate a tarball:
    
    27 27
     gentarball: SOURCE=$(shell dpkg-parsechangelog|awk '/^Source:/ {print $$2}')
    


  • Reply to: