From 5317035bce847346e61f3d51a6f8c031c960aef4 Mon Sep 17 00:00:00 2001
From: Roland Rosenfeld <roland@debian.org>
Date: Tue, 2 Jan 2024 19:29:06 +0100
Subject: [PATCH 1/1] Merge Debian 3.0.34-2/3 into Upstream tree.

This fixes the build dependency on libpcre2-dev, since upstream alreay
uses pcre2.
---
 debian/changelog | 18 ++++++++++++++++++
 debian/control   |  2 +-
 debian/po/ro.po  | 43 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 debian/po/ro.po

diff --git a/debian/changelog b/debian/changelog
index d8368f30..3d95a933 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,27 @@
 privoxy (3.0.35~gitsnapshot-1) UNRELEASED; urgency=medium
 
   * Unreleased GIT snapshot.
+  * The following patches are now incorporated upstream: 35_pcre2-support,
+    36_pcre2-patternfix.
 
  -- Roland Rosenfeld <roland@debian.org>  Sun, 05 Feb 2023 10:58:57 +0100
 
+privoxy (3.0.34-3) unstable; urgency=medium
+
+  * 35_pcre2-support: Update patch based on upstream GIT.
+  * 36_pcre2-patternfix: Fix using anchored pattern in pcre2.
+
+ -- Roland Rosenfeld <roland@debian.org>  Sun, 27 Aug 2023 16:20:57 +0200
+
+privoxy (3.0.34-2) unstable; urgency=medium
+
+  * Add ro debconf translation.  Thanks to Remus-Gabriel Chelu
+    (Closes: #1033443).
+  * 35_pcre2-support: Build with libpcre2-dev instead of obsolete pcre3
+    (Closes: #999981).
+
+ -- Roland Rosenfeld <roland@debian.org>  Fri, 30 Jun 2023 09:28:22 +0200
+
 privoxy (3.0.34-1) unstable; urgency=medium
 
   * New upstream version 3.0.34.
diff --git a/debian/control b/debian/control
index a1f43ff8..0396f097 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: autoconf,
                groff <!nodoc>,
                libbrotli-dev,
                libmbedtls-dev,
-               libpcre3-dev,
+               libpcre2-dev,
                man2html <!nodoc>,
                opensp:native <!nodoc>,
                po-debconf,
diff --git a/debian/po/ro.po b/debian/po/ro.po
new file mode 100644
index 00000000..6549093b
--- /dev/null
+++ b/debian/po/ro.po
@@ -0,0 +1,43 @@
+# Mesajele în limba română pentru pachetul privoxy.
+# Romanian translation of privoxy.
+# Copyright © 2023 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the privoxy package.
+#
+# Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>, 2023.
+#
+# Cronologia traducerii fișierului „privoxy”:
+# Traducerea inițială, făcută de R-GC, pentru versiunea privoxy 3.0.34-1(2006-11-01).
+# Actualizare a traducerii pentru versiunea Y, făcută de X, Y(anul).
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: privoxy 3.0.34-1\n"
+"Report-Msgid-Bugs-To: privoxy@packages.debian.org\n"
+"POT-Creation-Date: 2016-04-08 17:17+0200\n"
+"PO-Revision-Date: 2023-03-19 08:06+0100\n"
+"Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n"
+"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n==0 || (n!=1 && n%100>=1 && "
+"n%100<=19) ? 1 : 2);\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Generator: Poedit 3.2.2\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Adresses on with Privoxy listens:"
+msgstr "Adresele pe care Privoxy ascultă:"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid ""
+"Please enter a space separated list of address:port combinations on which "
+"Privoxy will listen for client requests."
+msgstr ""
+"Introduceți o listă de combinații de adresă:port, separată de spații, pe care "
+"Privoxy va asculta cererile clienților."
-- 
2.39.2