| ... |
... |
@@ -19,9 +19,9 @@ Guide To The X Strike Force Packages |
|
19
|
19
|
------------------------------------
|
|
20
|
20
|
|
|
21
|
21
|
The X Strike Force team maintains X packages in git repositories on
|
|
22
|
|
-git.debian.org in the pkg-xorg subdirectory. Most upstream packages
|
|
|
22
|
+salsa.debian.org in the xorg-team group. Most upstream packages
|
|
23
|
23
|
are actually maintained in git repositories as well, so they often
|
|
24
|
|
-just need to be pulled into git.debian.org in a "upstream-*" branch.
|
|
|
24
|
+just need to be pulled into salsa.debian.org in a "upstream-*" branch.
|
|
25
|
25
|
Otherwise, the upstream sources are manually installed in the Debian
|
|
26
|
26
|
git repository.
|
|
27
|
27
|
|
| ... |
... |
@@ -47,27 +47,3 @@ are involved: |
|
47
|
47
|
case, it appears directly in the .diff.gz.
|
|
48
|
48
|
* Otherwise, the patch is added to debian/patches/ which is managed
|
|
49
|
49
|
with quilt as documented in /usr/share/doc/quilt/README.source.
|
|
50
|
|
-
|
|
51
|
|
-quilt is actually invoked by the Debian X packaging through a larger
|
|
52
|
|
-set of scripts called XSFBS. XSFBS brings some other X specific
|
|
53
|
|
-features such as managing dependencies and conflicts due to the video
|
|
54
|
|
-and input driver ABIs.
|
|
55
|
|
-XSFBS itself is maintained in a separate repository at
|
|
56
|
|
- git://git.debian.org/pkg-xorg/xsfbs.git
|
|
57
|
|
-and it is pulled inside the other Debian X repositories when needed.
|
|
58
|
|
-
|
|
59
|
|
-The XSFBS patching system requires a build dependency on quilt. Also
|
|
60
|
|
-a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
|
|
61
|
|
-so that the XSFBS patching occurs before the actual build. So the
|
|
62
|
|
-very first target of the build (likely the one running autoreconf)
|
|
63
|
|
-should depend on $(STAMP_DIR)/patch. It should also not depend on
|
|
64
|
|
-anything so that parallel builds are correctly supported (nothing
|
|
65
|
|
-should probably run while patching is being done). And finally, the
|
|
66
|
|
-clean target should depend on the xsfclean target so that patches
|
|
67
|
|
-are unapplied on clean.
|
|
68
|
|
-
|
|
69
|
|
-When the upstream sources contain some DFSG-nonfree files, they are
|
|
70
|
|
-listed in text files in debian/prune/ in the "debian-*" branch of
|
|
71
|
|
-the Debian repository. XSFBS' scripts then take care of removing
|
|
72
|
|
-these listed files during the build so as to generate a modified
|
|
73
|
|
-DFSG-free .orig.tar.gz tarball.
|