From 91f9e6166459c4abba0dcb8e03e499337a61950c Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 18 Jan 2021 11:49:45 +0100 Subject: [PATCH] Rebuild developer manual --- doc/webserver/developer-manual/index.html | 2 +- .../developer-manual/newrelease.html | 208 ++++++++++++++++++ 2 files changed, 209 insertions(+), 1 deletion(-) diff --git a/doc/webserver/developer-manual/index.html b/doc/webserver/developer-manual/index.html index 6b436b72..fc3361af 100644 --- a/doc/webserver/developer-manual/index.html +++ b/doc/webserver/developer-manual/index.html @@ -13,7 +13,7 @@

Privoxy Developer Manual

Copyright - © 2001-2020 by Privoxy Developers

+ © 2001-2021 by Privoxy Developers

diff --git a/doc/webserver/developer-manual/newrelease.html b/doc/webserver/developer-manual/newrelease.html index dc47f64b..e49d9a57 100644 --- a/doc/webserver/developer-manual/newrelease.html +++ b/doc/webserver/developer-manual/newrelease.html @@ -422,6 +422,214 @@ for-privoxy-version=3.0.11

This will create ../privoxy_3.0.30-UNRELEASED-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 3.0.30-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_3.0.30-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_3.0.30-1.dsc
+
+
+

And try to run autopackage testing suite on the result:

+ + + + +
+ 
        autopkgtest /var/cache/pbuilder/result/privoxy_3.0.30-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_3.0.30-1_i386.deb and privoxy_3.0.30-1_amd64.deb. Then sign both files:

+ + + + +
+ 
        gpg --detach-sign --armor privoxy_3.0.30-1_i386.deb
+        gpg --detach-sign --armor privoxy_3.0.30-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
+
+

6.3.5. Mac OS X

-- 2.39.2