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: - − debian/README.source - debian/changelog - debian/control - debian/rules - debian/source/format Changes: ===================================== debian/README.source deleted ===================================== @@ -1,49 +0,0 @@ ------------------------------------------------------- -Quick Guide To Patching This Package For The Impatient ------------------------------------------------------- - -1. Make sure you have quilt installed -2. Unpack the package as usual with "dpkg-source -x" -3. Run the "patch" target in debian/rules -4. Create a new patch with "quilt new" (see quilt(1)) -5. Edit all the files you want to include in the patch with "quilt edit" - (see quilt(1)). -6. Write the patch with "quilt refresh" (see quilt(1)) -7. Run the "clean" target in debian/rules - -Alternatively, instead of using quilt directly, you can drop the patch in to -debian/patches and add the name of the patch to debian/patches/series. - ------------------------------------- -Guide To The X Strike Force Packages ------------------------------------- - -The X Strike Force team maintains X packages in git repositories on -salsa.debian.org in the xorg-team subdirectory. Most upstream packages -are actually maintained in git repositories as well, so they often -just need to be pulled into salsa.debian.org in a "upstream-*" branch. -Otherwise, the upstream sources are manually installed in the Debian -git repository. - -The .orig.tar.gz upstream source file could be generated using this -"upstream-*" branch in the Debian git repository but it is actually -copied from upstream tarballs directly. - -Due to X.org being highly modular, packaging all X.org applications -as their own independent packages would have created too many Debian -packages. For this reason, some X.org applications have been grouped -into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, -x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. -Most packages, including the X.org server itself and all libraries -and drivers are, however maintained independently. - -The Debian packaging is added by creating the "debian-*" git branch -which contains the aforementioned "upstream-*" branch plus the debian/ -repository files. -When a patch has to be applied to the Debian package, two solutions -are involved: -* If the patch is available in one of the upstream branches, it - may be git'cherry-picked into the Debian repository. In this - case, it appears directly in the .diff.gz. -* Otherwise, the patch is added to debian/patches/ which is managed - 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 * Drop patch added in version 1:1.0.17-2, applied upstream. * Add Matt Turner's key 16238A7D92448B02B7B10344B6B1CEAE5103DB07 to debian/upstream/signing-key.asc. + * Switch to format 3.0 (quilt). + - Drop quilt from Build-Depends and delete debian/README.source. + * Change Homepage field to https://nouveau.freedesktop.org/. * Bump Standards-Version to 4.7.0, no changes needed. -- Sven Joachim <svenj...@gmx.de> Thu, 06 Feb 2025 17:25:32 +0100 ===================================== debian/control ===================================== @@ -11,10 +11,9 @@ Build-Depends: libdrm-dev, libudev-dev, xutils-dev, - quilt, Standards-Version: 4.7.0 Rules-Requires-Root: no -Homepage: https://nouveau.freedesktop.org/wiki/ +Homepage: https://nouveau.freedesktop.org/ Vcs-Git: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-nouveau.git Vcs-Browser: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-nouveau ===================================== debian/rules ===================================== @@ -23,4 +23,4 @@ override_dh_shlibdeps: dh_shlibdeps -- --warnings=6 %: - dh $@ --with quilt,xsf --builddirectory=build/ + dh $@ --with xsf --builddirectory=build/ ===================================== debian/source/format ===================================== @@ -1 +1 @@ -1.0 +3.0 (quilt) View it on GitLab: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-nouveau/-/compare/ffba7af614662fd6ee91ab1cb7e90a33ce05d9de...8658c85a381c55e3a41d81e47136f84756e5f4c9 -- View it on GitLab: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-nouveau/-/compare/ffba7af614662fd6ee91ab1cb7e90a33ce05d9de...8658c85a381c55e3a41d81e47136f84756e5f4c9 You're receiving this email because of your account on salsa.debian.org.
