All changes from the Debian version of a package (with the exception of files inside the debian directory) must be applied in the form of a patch.
See Also
You can use the quilt command to generate a patchfile like so:
$ quilt new my-changes.patch
$ quilt add src/some_source_file.c
(modify the file)
$ quilt refresh
$ quilt pop -a
Unfortunately, this requires you to add the file to quilt BEFORE you do any modifications, so if you forget to do so, you're stuck.
This method allows you to make your changes first, but you must be careful not to include any changes in the debian dir.
Create the patch file:
$ git diff -- path/to/file1 path/to/file2 >debian/patches/my-changes.patch
Add the patchfile to the end of the series file:
$ echo my-changes.patch >> debian/patches/series
Check the patchfile to make sure it's correct, because the next command will wipe out your changes:
$ git checkout path/to/file1 path/to/file2
The patch file must have a DEP3 header (http://dep.debian.net/deps/dep3). The basic structure is:
Description: <short description, required>
<long description that can span multiple lines, optional>
Author: <name and email of author, optional>
Origin: <upstream|backport|vendor|other>, <URL, required except if Author is present>
Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional>
Bug-<Vendor>: <URL to the vendor bug report if any, optional>
Forwarded: <URL|no|not-needed, useless if you have a Bug field, optional>
Applied-Upstream: <version|URL|commit, identifies patches merged upstream, optional>
Reviewed-by: <name and email of a reviewer, optional>
Last-Update: 2018-05-10 <YYYY-MM-DD, last update of the meta-information, optional>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Description: While this can be multiline, all subsequent lines after the first must be indented by a whitespace character, and empty lines must start with whitespace and a period ..
Author: Refers to code authorship, not patch authorship. Use the name of whoever wrote the original code in the patch.
Origin: Where the code came from:
- upstream = points to code on the original software site or repo.
- backport = you had to change the code to fit an ubuntu requirement
- vendor = the code came from some vendor like red hat, suse, etc.
- other = the code came from somewhere else
Bug: Bug report on the upstream site, if any.
Bug-[Vendor]: Bug report on a vendor's site. We should have one for Ubuntu, but often there will also be reports from other vendors like Debian, Red Hat, etc. Add them if they're readily available, but you don't need to go hunting for them.
Forwarded: Information about where you sent the patch if it hasn't been upstreamed. Only useful for vendor specific patches.
Applied-Upstream: If the patch has already been applied upstream, link to it. Not needed if you have Origin upstream.
Check your changelog:
You can use dep3changelog to verify the headers, as well as generate a changelog entry.
You can use quilt to automatically add a DEP-3 header:
$ quilt header -e --dep3 my-changes.patch
Use quilt to apply the patches in order:
$ quilt push -a
...
Applying patch 70_some-check.patch
patching file conf/some-script
Applying patch fix-something.patch
patching file src/a_source_file.c
patching file src/another_source_file.c
Applying patch my-changes.patch
patching file path/to/file1
patching file path/to/file2
Now at patch my-changes.patch
Now revert the patches:
$ quilt pop -a
From here, git status should show the following:
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: debian/patches/series
Untracked files:
(use "git add <file>..." to include in what will be committed)
.pc/
debian/patches/my-changes.patch
.pc is the control directory for quilt patches. Remove it manually before committing.