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

[Git][xorg-team/driver/xserver-xorg-video-nouveau][debian-unstable] 2 commits: Switch to format 3.0 (quilt)

Title: GitLab

Sven Joachim pushed to branch debian-unstable at X Strike Force / driver / xserver-xorg-video-nouveau

Commits:

  • dc58e83f
    by Sven Joachim at 2025-02-09T16:56:37+01:00 
    Switch to format 3.0 (quilt)

This ensures that there are no spurious changes to upstream sources in
the source package, as dpkg-source aborts early.  Besides, this format
is pretty much standard in Debian these days.

The downside is that any cherry-picks from upstream commits need to be
exported as patches, but I guess we can live with that.  There has
been only one such cherry-pick in the last six years which was already
exported as a patch rather than applied directly.
  • 8658c85a
    by Sven Joachim at 2025-02-09T17:11:27+01:00 
    Change Homepage field to https://nouveau.freedesktop.org/

The Wiki is gone, https://nouveau.freedesktop.org/wiki/ redirects to
the new homepage.

5 changed files:

Changes:

  • debian/README.source deleted
    1 
    -------------------------------------------------------
    2 
    -Quick Guide To Patching This Package For The Impatient
    3 
    -------------------------------------------------------
    4 
    -
    5 
    -1. Make sure you have quilt installed
    6 
    -2. Unpack the package as usual with "dpkg-source -x"
    7 
    -3. Run the "patch" target in debian/rules
    8 
    -4. Create a new patch with "quilt new" (see quilt(1))
    9 
    -5. Edit all the files you want to include in the patch with "quilt edit"
    10 
    -   (see quilt(1)).
    11 
    -6. Write the patch with "quilt refresh" (see quilt(1))
    12 
    -7. Run the "clean" target in debian/rules
    13 
    -
    14 
    -Alternatively, instead of using quilt directly, you can drop the patch in to
    15 
    -debian/patches and add the name of the patch to debian/patches/series.
    16 
    -
    17 
    -------------------------------------
    18 
    -Guide To The X Strike Force Packages
    19 
    -------------------------------------
    20 
    -
    21 
    -The X Strike Force team maintains X packages in git repositories on
    22 
    -salsa.debian.org in the xorg-team subdirectory. Most upstream packages
    23 
    -are actually maintained in git repositories as well, so they often
    24 
    -just need to be pulled into salsa.debian.org in a "upstream-*" branch.
    25 
    -Otherwise, the upstream sources are manually installed in the Debian
    26 
    -git repository.
    27 
    -
    28 
    -The .orig.tar.gz upstream source file could be generated using this
    29 
    -"upstream-*" branch in the Debian git repository but it is actually
    30 
    -copied from upstream tarballs directly.
    31 
    -
    32 
    -Due to X.org being highly modular, packaging all X.org applications
    33 
    -as their own independent packages would have created too many Debian
    34 
    -packages. For this reason, some X.org applications have been grouped
    35 
    -into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
    36 
    -x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
    37 
    -Most packages, including the X.org server itself and all libraries
    38 
    -and drivers are, however maintained independently.
    39 
    -
    40 
    -The Debian packaging is added by creating the "debian-*" git branch
    41 
    -which contains the aforementioned "upstream-*" branch plus the debian/
    42 
    -repository files.
    43 
    -When a patch has to be applied to the Debian package, two solutions
    44 
    -are involved:
    45 
    -* If the patch is available in one of the upstream branches, it
    46 
    -  may be git'cherry-picked into the Debian repository. In this
    47 
    -  case, it appears directly in the .diff.gz.
    48 
    -* Otherwise, the patch is added to debian/patches/ which is managed
    49 
    -  with quilt as documented in /usr/share/doc/quilt/README.source.

  • debian/changelog
    ... ... @@ -7,6 +7,9 @@ xserver-xorg-video-nouveau (1:1.0.18-1) UNRELEASED; urgency=medium
    7 7 
       * Drop patch added in version 1:1.0.17-2, applied upstream.
    8 8 
       * Add Matt Turner's key 16238A7D92448B02B7B10344B6B1CEAE5103DB07 to
    9 9 
         debian/upstream/signing-key.asc.
    10 
    +  * Switch to format 3.0 (quilt).
    11 
    +    - Drop quilt from Build-Depends and delete debian/README.source.
    12 
    +  * Change Homepage field to https://nouveau.freedesktop.org/.
    10 13 
       * Bump Standards-Version to 4.7.0, no changes needed.
    11 14
    12 15 
      -- Sven Joachim <svenjoac@gmx.de>  Thu, 06 Feb 2025 17:25:32 +0100

  • debian/control
    ... ... @@ -11,10 +11,9 @@ Build-Depends:
    11 11 
      libdrm-dev,
    12 12 
      libudev-dev,
    13 13 
      xutils-dev,
    14 
    - quilt,
    15 14 
     Standards-Version: 4.7.0
    16 15 
     Rules-Requires-Root: no
    17 
    -Homepage: https://nouveau.freedesktop.org/wiki/
    16 
    +Homepage: https://nouveau.freedesktop.org/
    18 17 
     Vcs-Git: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-nouveau.git
    19 18 
     Vcs-Browser: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-nouveau
    20 19

  • debian/rules
    ... ... @@ -23,4 +23,4 @@ override_dh_shlibdeps:
    23 23 
     	dh_shlibdeps -- --warnings=6
    24 24
    25 25 
     %:
    26 
    -	dh $@ --with quilt,xsf --builddirectory=build/
    26 
    +	dh $@ --with xsf --builddirectory=build/

  • debian/source/format
    1 
    -1.0
    1 
    +3.0 (quilt)

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

    Reply to: