From 65690f437fa5f89034b8e788f10eba449a5312e5 Mon Sep 17 00:00:00 2001
From: Fabian Keil First, make sure that you have freshly exported the right version
- into an empty directory. (See "Building and releasing packages" above). Then add a log entry to
- debian/changelog, if it is not already there, for example by running (from the debian
- directory): Then, run (from the root directory): 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: 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: After this enter the checked out privoxy git tree and check that all (new) build dependencies are met: If something is missing, just add it using Now you may update debian/changelog, especially the version number using and finally build the package: 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 And maybe repair some artefacts using one or both of the following commands: 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: After this enter the checked out privoxy git tree and check that all (new) build dependencies are met: If something is missing, just add it using Now you may update debian/changelog, especially the version number using and finally build the package: 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 And maybe repair some artefacts using one or both of the following commands: https://www.privoxy.org/donate The most recent release is 3.0.30 (UNRELEASED). The most recent release is 3.0.30 (stable).6.3.4. Debian
-
-
-
-
-
-
- debchange -v 3.0.30-UNRELEASED-1 "New upstream version"
-
-
-
-
-
-
- dpkg-buildpackage -rfakeroot -us -uc -b
-
@@ -436,9 +414,8 @@ for-privoxy-version=3.0.11
-
gbp clone https://salsa.debian.org/debian/privoxy.git
- cd privoxy
-
+ gbp clone https://salsa.debian.org/debian/privoxy.git
+ cd privoxy
@@ -446,8 +423,7 @@ for-privoxy-version=3.0.11
-
cd privoxy
- gbp pull
-
+ cd privoxy
+ gbp pull
@@ -455,8 +431,7 @@ for-privoxy-version=3.0.11
-
gbp import-orig --uscan
-
+ gbp import-orig --uscan
@@ -464,9 +439,8 @@ for-privoxy-version=3.0.11
-
while quilt push; do quilt refresh; done
-
+ while quilt push; do quilt refresh; done
@@ -474,10 +448,9 @@ for-privoxy-version=3.0.11
-
quilt delete XX_patchname.patch
- git rm debian/patches/XX_patchname.patch
-
+ quilt delete XX_patchname.patch
+ git rm debian/patches/XX_patchname.patch
@@ -485,8 +458,7 @@ for-privoxy-version=3.0.11
-
quilt push -f
- quilt edit some_file
- quilt refresh
-
+ quilt push -f
+ quilt edit some_file
+ quilt refresh
@@ -494,8 +466,7 @@ for-privoxy-version=3.0.11
-
while quilt push; do quilt refresh; done
-
+ while quilt push; do quilt refresh; done
@@ -503,8 +474,7 @@ for-privoxy-version=3.0.11
-
quilt pop -a
-
+ quilt pop -a
@@ -513,8 +483,7 @@ for-privoxy-version=3.0.11
-
dch -v 3.0.30-1
-
+ dch -v 3.0.30-1
@@ -522,8 +491,7 @@ for-privoxy-version=3.0.11
-
gbp buildpackage -us -uc
-
+ gbp buildpackage -us -uc
@@ -532,8 +500,7 @@ for-privoxy-version=3.0.11
-
lintian -iI ../build-area/privoxy_3.0.30-1_amd64.changes
-
+ lintian -iI ../build-area/privoxy_3.0.30-1_amd64.changes
@@ -542,8 +509,7 @@ for-privoxy-version=3.0.11
sudo cowbuilder --build --basepath /var/cache/pbuilder/base.cow ../build-area/privoxy_3.0.30-1.dsc
-
+ "PROGRAMLISTING"> sudo cowbuilder --build --basepath /var/cache/pbuilder/base.cow ../build-area/privoxy_3.0.30-1.dsc
@@ -554,82 +520,77 @@ for-privoxy-version=3.0.11
autopkgtest /var/cache/pbuilder/result/privoxy_3.0.30-1_amd64.changes -s -- schroot sid
-
+ "PROGRAMLISTING"> autopkgtest /var/cache/pbuilder/result/privoxy_3.0.30-1_amd64.changes -s -- schroot sid
-
gpg --detach-sign --armor privoxy_3.0.30-1_i386.deb
- gpg --detach-sign --armor privoxy_3.0.30-1_amd64.deb
-
+ gpg --detach-sign --armor privoxy_3.0.30-1_i386.deb
+ gpg --detach-sign --armor privoxy_3.0.30-1_amd64.deb
-
-
-
-
-
- sudo apt install build-essential devscripts
- sudo apt-get build-dep privoxy
-
-
-
-
-
-
-
- dpkg-checkbuilddeps
-
-
-
-
-
-
-
- sudo apt install foobar
-
-
-
-
-
-
-
- dch
-
-
-
-
-
-
-
- debuild -us -uc -b
-
-
-
-
-
-
-
- debian/rules clean
-
-
-
+
-
-
-
- git reset --hard
- git clean -fd
-
- 6.3.4.1. Debian GIT Snapshot
+
+
+
+
+
+
+ sudo apt install build-essential devscripts
+ sudo apt-get build-dep privoxy
+
+
+
+
+
+
+ dpkg-checkbuilddeps
+
+
+
+
+
+
+ sudo apt install foobar
+
+
+
+
+
+
+ dch
+
+
+
+
+
+
+ debuild -us -uc -b
+
+
+
+
+
+
+ debian/rules clean
+
+
+
+
+
+
+ git reset --hard
+ git clean -fd
+ 6.3.5. Mac OS X
diff --git a/doc/webserver/index.html b/doc/webserver/index.html
index b48ad6bf..bacb0b5c 100644
--- a/doc/webserver/index.html
+++ b/doc/webserver/index.html
@@ -32,7 +32,7 @@
diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index aed42cdc..c5508209 100644
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -202,7 +202,7 @@
these. If not, you will get a friendly error message. Internet access is not necessary either.
Privoxy main page:
+Privoxy main page:
@@ -211,7 +211,7 @@ "APPLICATION">Privoxy)
View and toggle client tags:
+View and toggle client tags:
@@ -219,21 +219,21 @@
Show information about the current configuration, including viewing and editing of actions - files:
+ files:Show the browser's request headers:
+Show the browser's request headers:
Show which actions apply to a URL and why:
+Show which actions apply to a URL and why:
http://config.privoxy.org/show-url-info
@@ -242,15 +242,15 @@Toggle Privoxy on or off. This feature can be turned off/on in the main config file. When toggled "off", "Privoxy" continues to run, - but only as a pass-through proxy, with no actions taking place:
+ but only as a pass-through proxy, with no actions taking place:-Short cuts. Turn off, then on:
+Short cuts. Turn off, then on:
-+
http://config.privoxy.org/toggle?set=enable
diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html index bb6cf300..977651be 100644 --- a/doc/webserver/user-manual/configuration.html +++ b/doc/webserver/user-manual/configuration.html @@ -40,7 +40,7 @@ -Privoxy Menu
+Privoxy Menu
@@ -94,8 +94,7 @@
6.2. Configuration Files Overview
For Unix, *BSD and GNU/Linux, all configuration files are located in /etc/privoxy/ by default. For MS Windows these are all in the same directory as the Privoxy - executable. The name and number of configuration files has changed from previous versions, and is subject to - change as development progresses.
+ executable.The installed defaults provide a reasonable starting point, though some settings may be aggressive by some standards. For the time being, the principle configuration files are:
@@ -146,9 +145,6 @@ listening address of Privoxy, these "wake up" requests must obviously be sent to the old listening address. -
While under development, the configuration content is subject to change. The below documentation may not be - accurate by the time you read this. Also, what constitutes a "default" setting, may - change, so please check all your configuration files on important issues.
diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html index 374a64da..087e013d 100644 --- a/doc/webserver/user-manual/installation.html +++ b/doc/webserver/user-manual/installation.html @@ -128,8 +128,8 @@diff --git a/doc/webserver/user-manual/introduction.html b/doc/webserver/user-manual/introduction.html index 0b6ad1d5..5f643145 100644 --- a/doc/webserver/user-manual/introduction.html +++ b/doc/webserver/user-manual/introduction.html @@ -27,20 +27,13 @@
- tar xzvf privoxy-3.0.30-beta-src.tar.gz - cd privoxy-3.0.30-beta+tar xzvf privoxy-3.0.30-stable-src.tar.gz + cd privoxy-3.0.30-stable1. Introduction
-This documentation is included with the current UNRELEASED version of Privoxy, - 3.0.30, and is mostly complete at this point. The most up to date reference for the time being is still the - comments in the source files and in the individual configuration files. Development of a new version is currently - nearing completion, and includes significant changes and enhancements over earlier versions.
-Since this is a UNRELEASED version, not all new features are well tested. This documentation may be slightly out - of sync as a result (especially with git sources). And there may be bugs, though - hopefully not many!
+This documentation is included with the current stable version of Privoxy, + 3.0.30.
1.1. Features
In addition to the core features of ad blocking and cookie management, Privoxy provides many supplemental - features, some of them currently under development, that give the end-user more control, more privacy and more - freedom:
+ features, that give the end-user more control, more privacy and more freedom:
Supports "Connection: keep-alive". Outgoing connections can be kept alive independently from the diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html index 108f66a7..3a2c7a03 100644 --- a/doc/webserver/user-manual/quickstart.html +++ b/doc/webserver/user-manual/quickstart.html @@ -219,7 +219,7 @@
Find user.action in the top section, and click on "Edit":
- +Figure 1. Actions Files in Use
diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html index d1db7dd3..d247293f 100644 --- a/doc/webserver/user-manual/startup.html +++ b/doc/webserver/user-manual/startup.html @@ -35,7 +35,7 @@Please note that Privoxy can only proxy HTTP and HTTPS traffic. It will not work with FTP or other protocols.