X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Fdeveloper-manual.sgml;fp=doc%2Fsource%2Fdeveloper-manual.sgml;h=79e0a7e02350f3a54d00ace8bd9eeaefda232b29;hp=deab4bd200c25c18563e10f37ba31b5dbff7d92e;hb=34a6a841e529579e2be4457ea0d4cb1befbc840a;hpb=f2be4cfb0e98db4cf6fcf33f3f1efadabe399887
diff --git a/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml
index deab4bd2..79e0a7e0 100644
--- a/doc/source/developer-manual.sgml
+++ b/doc/source/developer-manual.sgml
@@ -2640,6 +2640,170 @@ for-privoxy-version=3.0.11
../privoxy_&p-version;-&p-status;-1_i386.deb
which can be uploaded.
+
+ Using git-buildpackage we start with a clone of the last Debian version:
+
+
+ gbp clone https://salsa.debian.org/debian/privoxy.git
+ cd privoxy
+
+
+ or if the repository is already there
+
+
+ cd privoxy
+ gbp pull
+
+
+ Now import the newly released upstream tarball via debian/watch file:
+
+
+ gbp import-orig --uscan
+
+
+ Next update all Debian quilt patches to the new version:
+
+
+ while quilt push; do quilt refresh; done
+
+
+ If some patch is no longer required (because it is already merged
+ upstream), it can be removed using
+
+
+ quilt delete XX_patchname.patch
+ git rm debian/patches/XX_patchname.patch
+
+
+ If the patch needs modification, you can apply, edit and update it with
+
+
+ quilt push -f
+ quilt edit some_file
+ quilt refresh
+
+
+ until
+
+
+ while quilt push; do quilt refresh; done
+
+
+ succeeds. Then you can
+
+
+ quilt pop -a
+
+
+ Now add a new entry to the debian/changelog representing the new
+ version:
+
+
+ dch -v &p-version;-1
+
+
+ and describe what you did before and don't forget to git commit all
+ changes.
+
+
+ Now you can build the package on the local machine using
+
+
+ gbp buildpackage -us -uc
+
+
+ You should check for warnings using
+
+
+ lintian -iI ../build-area/privoxy_&p-version;-1_amd64.changes
+
+
+ Maybe rebuild the package in different defined cowbuilder environments
+ like
+
+
+ sudo cowbuilder --build --basepath /var/cache/pbuilder/base.cow ../build-area/privoxy_&p-version;-1.dsc
+
+
+ And try to run autopackage testing suite on the result:
+
+
+ autopkgtest /var/cache/pbuilder/result/privoxy_&p-version;-1_amd64.changes -s -- schroot sid
+
+
+ Or just push the changes to salsa.debian.org, where a CI pipeline is
+ defined for the package, that builds and tests it.
+
+
+ If everything is okay, run cowbuilder with i386 and amd64 environments
+ for current Debian stable release and build
+ privoxy_&p-version;-1_i386.deb and privoxy_&p-version;-1_amd64.deb.
+ Then sign both files:
+
+
+ gpg --detach-sign --armor privoxy_&p-version;-1_i386.deb
+ gpg --detach-sign --armor privoxy_&p-version;-1_amd64.deb
+
+
+ Create a README file containing the recent block from debian/changelog
+ and upload the two packages, the two signatures and the README to a
+ freshly created folder below
+ https://sourceforge.net/projects/ijbswa/files/Debian/
+
+
+ For building just a git snapshot build the following workflow may be
+ useful. First create a build environment, for this you may have to
+ run the following commands:
+
+
+ sudo apt install build-essential devscripts
+ sudo apt-get build-dep privoxy
+
+
+ After this enter the checked out privoxy git tree and check that all
+ (new) build dependencies are met:
+
+
+ dpkg-checkbuilddeps
+
+
+ If something is missing, just add it using
+
+
+ sudo apt install foobar
+
+
+ Now you may update debian/changelog, especially the version number
+ using
+
+
+ dch
+
+
+ and finally build the package:
+
+
+ debuild -us -uc -b
+
+
+ If everything went okay, you may find the resulting Debian package in
+ the parent directory.
+
+
+ You may want to clean up the build tree using
+
+
+ debian/rules clean
+
+
+ And maybe repair some artefacts using one or both of the following
+ commands:
+
+
+ git reset --hard
+ git clean -fd
+
+
Mac OS X