diff -pruN 1.5.1-1/debian/changelog 1.5.1-1ubuntu1/debian/changelog --- 1.5.1-1/debian/changelog 2019-08-03 05:48:40.000000000 +0000 +++ 1.5.1-1ubuntu1/debian/changelog 2021-11-24 02:53:34.000000000 +0000 @@ -1,3 +1,21 @@ +pastebinit (1.5.1-1ubuntu1) devel; urgency=medium + + * d/p/0001-Fix-pasting-files-to-JSON-based-bins.patch: + - Fix pasting files to JSON based bins. (LP: #1785821) + * d/p/0002-Allow-private-to-be-configured.patch: + - Allow 'private' to be configured. + * d/p/0003-Update-Openstack-s-pastebin-site-paste.openstack.org.patch: + - Update Openstack's pastebin site, paste.openstack.org → paste.opendev.org + * d/p/0004-Fix-distro.linux_distribution-deprecation.patch: + - Fix distro.linux_distribution deprecation. (LP: #1844128) + * d/copyright: Correct paths. + * d/control: + - Replace d/compat with debhelper-compat, bump to 13. + - R³: no. + * Update Standards-Version to 4.6.0. + + -- Unit 193 Tue, 23 Nov 2021 21:53:34 -0500 + pastebinit (1.5.1-1) unstable; urgency=medium * New upstream release. diff -pruN 1.5.1-1/debian/compat 1.5.1-1ubuntu1/debian/compat --- 1.5.1-1/debian/compat 2019-08-03 05:36:47.000000000 +0000 +++ 1.5.1-1ubuntu1/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -12 diff -pruN 1.5.1-1/debian/control 1.5.1-1ubuntu1/debian/control --- 1.5.1-1/debian/control 2019-08-03 05:46:07.000000000 +0000 +++ 1.5.1-1ubuntu1/debian/control 2021-11-24 02:53:34.000000000 +0000 @@ -1,10 +1,12 @@ Source: pastebinit Section: misc Priority: optional -Maintainer: Simon Quigley -Build-Depends: debhelper (>= 12) +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Simon Quigley +Build-Depends: debhelper-compat (= 13) Build-Depends-Indep: docbook-xml, docbook-xsl, xsltproc -Standards-Version: 4.4.0 +Rules-Requires-Root: no +Standards-Version: 4.6.0 Homepage: https://phab.lubuntu.me/source/pastebinit/ Vcs-Browser: https://salsa.debian.org/debian/pastebinit Vcs-Git: https://salsa.debian.org/debian/pastebinit.git diff -pruN 1.5.1-1/debian/copyright 1.5.1-1ubuntu1/debian/copyright --- 1.5.1-1/debian/copyright 2019-08-03 05:36:47.000000000 +0000 +++ 1.5.1-1ubuntu1/debian/copyright 2021-11-24 02:53:34.000000000 +0000 @@ -7,13 +7,13 @@ Files: * Copyright: 2007-2016 Stéphane Graber, Daniel Bartlett, David Paleino License: GPL-2+ -Files: debian/ +Files: debian/* Copyright: 2006-2008 Stéphane Graber 2008-2018 Rolf Leggewie 2019 Simon Quigley +Date: Thu, 7 Oct 2021 04:37:07 -0400 +Subject: [PATCH 1/4] Fix pasting files to JSON based bins. + +--- + pastebinit | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pastebinit b/pastebinit +index 8a68959..6160a93 100755 +--- a/pastebinit ++++ b/pastebinit +@@ -343,7 +343,7 @@ try: + content = sys.stdin.read() + else: + try: +- with open(filename, "rb") as fd: ++ with open(filename, "r") as fd: + content = fd.read() + except KeyboardInterrupt: + print(_("KeyboardInterrupt caught."), file=sys.stderr) +-- +2.30.2 + diff -pruN 1.5.1-1/debian/patches/0002-Allow-private-to-be-configured.patch 1.5.1-1ubuntu1/debian/patches/0002-Allow-private-to-be-configured.patch --- 1.5.1-1/debian/patches/0002-Allow-private-to-be-configured.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.5.1-1ubuntu1/debian/patches/0002-Allow-private-to-be-configured.patch 2021-11-24 02:53:34.000000000 +0000 @@ -0,0 +1,24 @@ +From e07b7d115535c6d9e817edeef2c262fdcd66591a Mon Sep 17 00:00:00 2001 +From: Unit 193 +Date: Thu, 7 Oct 2021 04:37:30 -0400 +Subject: [PATCH 2/4] Allow 'private' to be configured. + +--- + pastebinit | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pastebinit b/pastebinit +index 6160a93..e5a28d4 100755 +--- a/pastebinit ++++ b/pastebinit +@@ -260,6 +260,7 @@ try: + configxml = xml.dom.minidom.parseString(configtext) + for variable, key in (('pastebin', 'website'), ('author', 'user'), + ('format', 'format'), ++ ('private', 'private'), + ('jabberid', 'jabberid')): + try: + value = getFirstNodeText(configxml, variable) +-- +2.30.2 + diff -pruN 1.5.1-1/debian/patches/0003-Update-Openstack-s-pastebin-site-paste.openstack.org.patch 1.5.1-1ubuntu1/debian/patches/0003-Update-Openstack-s-pastebin-site-paste.openstack.org.patch --- 1.5.1-1/debian/patches/0003-Update-Openstack-s-pastebin-site-paste.openstack.org.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.5.1-1ubuntu1/debian/patches/0003-Update-Openstack-s-pastebin-site-paste.openstack.org.patch 2021-11-24 02:53:34.000000000 +0000 @@ -0,0 +1,49 @@ +From 1057cecdbd1cf8c6edc016f2136ecd3186d93b08 Mon Sep 17 00:00:00 2001 +From: Unit 193 +Date: Thu, 7 Oct 2021 04:39:15 -0400 +Subject: [PATCH 3/4] =?UTF-8?q?Update=20Openstack's=20pastebin=20site,=20p?= + =?UTF-8?q?aste.openstack.org=20=E2=86=92=20paste.opendev.org.?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + ...ste.openstack.org.conf => paste.opendev.org.conf} | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + rename pastebin.d/{paste.openstack.org.conf => paste.opendev.org.conf} (54%) + +diff --git a/pastebin.d/paste.openstack.org.conf b/pastebin.d/paste.opendev.org.conf +similarity index 54% +rename from pastebin.d/paste.openstack.org.conf +rename to pastebin.d/paste.opendev.org.conf +index c025923..5c504cb 100644 +--- a/pastebin.d/paste.openstack.org.conf ++++ b/pastebin.d/paste.opendev.org.conf +@@ -1,10 +1,11 @@ + [pastebin] +-basename = paste.openstack.org +-regexp = http://paste.openstack.org ++basename = paste.opendev.org ++regexp = https://paste.opendev.org + + [format] +-lang = language ++format = language + page = page ++private = private + content = code + post_format = post_format + regexp = regexp +@@ -13,6 +14,7 @@ target_url = target_url + [defaults] + page = /json/?method=pastes.newPaste + post_format = json +-lang = ++private = "" ++language = none + regexp = \"data\": \"([^"]*) +-target_url = http://paste.openstack.org/show/ ++target_url = https://paste.opendev.org/show/ +-- +2.30.2 + diff -pruN 1.5.1-1/debian/patches/0004-Fix-distro.linux_distribution-deprecation.patch 1.5.1-1ubuntu1/debian/patches/0004-Fix-distro.linux_distribution-deprecation.patch --- 1.5.1-1/debian/patches/0004-Fix-distro.linux_distribution-deprecation.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.5.1-1ubuntu1/debian/patches/0004-Fix-distro.linux_distribution-deprecation.patch 2021-11-24 02:53:34.000000000 +0000 @@ -0,0 +1,26 @@ +From 47efd7c8f62afd643ad0e1a5b67a75b68e7695da Mon Sep 17 00:00:00 2001 +From: Unit 193 +Date: Thu, 7 Oct 2021 04:40:16 -0400 +Subject: [PATCH 4/4] Fix distro.linux_distribution deprecation. + +--- + pastebinit | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/pastebinit b/pastebinit +index e5a28d4..63f8065 100755 +--- a/pastebinit ++++ b/pastebinit +@@ -32,8 +32,7 @@ defaultPB = "pastebin.com" + # Now try to override it with a distributor pastebin + try: + import distro +- release = distro.linux_distribution( +- full_distribution_name=False)[0].lower() ++ release = distro.id() + if release == 'debian': + defaultPB = "paste.debian.net" + elif release == 'fedora': +-- +2.30.2 + diff -pruN 1.5.1-1/debian/patches/series 1.5.1-1ubuntu1/debian/patches/series --- 1.5.1-1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 1.5.1-1ubuntu1/debian/patches/series 2021-11-24 02:53:34.000000000 +0000 @@ -0,0 +1,4 @@ +0001-Fix-pasting-files-to-JSON-based-bins.patch +0002-Allow-private-to-be-configured.patch +0003-Update-Openstack-s-pastebin-site-paste.openstack.org.patch +0004-Fix-distro.linux_distribution-deprecation.patch diff -pruN 1.5.1-1/debian/watch 1.5.1-1ubuntu1/debian/watch --- 1.5.1-1/debian/watch 2019-08-03 05:45:11.000000000 +0000 +++ 1.5.1-1ubuntu1/debian/watch 2021-11-24 02:53:34.000000000 +0000 @@ -1,3 +1,3 @@ version=4 opts=filenamemangle=s/.+\/@ANY_VERSION@\.tar\.gz/pastebinit_$1\.orig\.tar\.gz/ \ - https://github.com/lubuntu-team/pastebinit/releases .*/@ANY_VERSION@\.tar\.gz + https://github.com/lubuntu-team/pastebinit/tags .*/@ANY_VERSION@\.tar\.gz