summaryrefslogtreecommitdiffstats
path: root/debian/README.source
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 13:18:04 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 13:18:04 +0000
commit519cbf08704063b930fa613235d4a598105a449a (patch)
tree426a5a2a33b5ea123678481edd7d59dcf7ff58e9 /debian/README.source
parentAdding upstream version 2:8.2.2434. (diff)
downloadvim-6bb4852636269baf7de18cd9ed665cff567ef9d6.tar.xz
vim-6bb4852636269baf7de18cd9ed665cff567ef9d6.zip
Adding debian version 2:8.2.2434-3+deb11u1.debian/2%8.2.2434-3+deb11u1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/README.source')
-rw-r--r--debian/README.source41
1 files changed, 41 insertions, 0 deletions
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..f4d85a1
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,41 @@
+If you are reading this from a Debian source package, you can stop now;
+this package should build normally after extracting with dpkg-source -x.
+The rest of this file gives some hints about generating source packages
+from the packaging git repository.
+
+This repository maintains patches to upstream source using gbp-pq. These
+patches are serialized to debian/patches/.
+
+In order to modify an existing patch, simply run “gbp pq import”. This will
+create a local branch with the commits that were used to create the patches.
+Edit or amend the commits as necessary.
+
+In order to create a new patch, switch to the patch using “gbp pq import” as
+before. If a patch file exists, use “gbp pg apply --topic={upstream,debian}
+patchfile” to apply the patch (works like “git am”). If the patch is intended
+to be upstreamed, it should be applied before any Debian-specific patches and
+use the "upstream" topic. Alternatively, if the patch is not intended to be
+upstreamed, it should use the "debian" topic and be applied after any upstream
+patches.
+
+When updating to a new version of upstream code, the patches need to be rebased
+on the new upstream code. The process is
+
+* Create the patch-queue branch -- gbp pq import
+* Switch back to the packaging branch -- gbp pq switch
+* Merge the upstream tag -- git merge vX.Y.ZZZZ
+* Rebase the patches -- gbp pq rebase
+ * Make any adjustments/fixups, as necessary
+* Switch back to the packaging branch -- gbp pq switch
+* Export the patches -- gbp pq export
+
+Whenever the patch queue branch is modified, those changes need to be exported
+back to the packaging branch. “gbp pq switch” will change from the patch queue
+branch to the packaging branch. At that point, “gbp pq export” will update
+debian/patches/ with the current state of the patch queue. This needs to be
+commited just like any other change.
+
+There are hooks setup in the git repo to avoid pushing the patch queue
+branches, but it's also wise to remove the local branch when done with the
+changes. The repository's configuration is set to delete the branch
+automatically after running “gbp pq export” in order to help enforce this.