summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorBrice Goglin <[email protected]>2009-09-04 11:33:17 +0200
committerBrice Goglin <[email protected]>2009-09-04 11:33:17 +0200
commit4c79e26a9d863d40a5aee024cc0182fb7ec47ff6 (patch)
tree4ecc9cf0aaa47c3f3e08ec3cf89a4c217d570793 /debian
parent1783d52ace07546e94f94b647f6a47441dce54c2 (diff)
Add a Mesa-specific README.source inspired from the one in xsfbs
Diffstat (limited to 'debian')
-rw-r--r--debian/README.source39
-rw-r--r--debian/changelog5
2 files changed, 42 insertions, 2 deletions
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 00000000000..e9fa95833e4
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,39 @@
+------------------------------------------------------
+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.
+
+
+The X Strike Force team maintains X packages in git repositories on
+git.debian.org in the pkg-xorg subdirectory. Most upstream packages
+are actually maintained in git repositories as well, so they often
+just need to be pulled into git.debian.org in a "upstream-*" branch.
+
+The .orig.tar.gz upstream source file could be generated this
+"upstream-*" branch in the Debian git repository but it is actually
+generated from upstream tarballs directly.
+Upstream ships Mesa as 3 different tarballs (MesaLib, MesaGLUT and
+MesaDemos) which are re-bundled together into a single .orig.tar.gz.
+
+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.
+ Thus, the patching system requires a build dependency on quilt.
diff --git a/debian/changelog b/debian/changelog
index 16f29d916f2..30ed82ad99b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,15 @@
-mesa (7.5.1-1) unstable; urgency=low
+mesa (7.5.1-1) UNRELEASED; urgency=low
[ Brice Goglin ]
* New upstream release.
+ * Add README.source.
[ Julien Cristau ]
* Override 'package-name-doesnt-match-sonames' lintian warnings for libGLU,
libGLw and both libGLs.
* Use dh_lintian and bump debhelper build-dep accordingly.
- -- Brice Goglin <[email protected]> Fri, 04 Sep 2009 10:56:55 +0200
+ -- Brice Goglin <[email protected]> Fri, 04 Sep 2009 11:31:45 +0200
mesa (7.5-3) unstable; urgency=low