diff --git a/doc/xml/release.xml b/doc/xml/release.xml index 2c7aae216..f0d7a0b72 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -99,7 +99,7 @@ -

Remove RHEL package patch since it has been committed upstream.

+

Remove RHEL and Debian package patches since they have been committed upstream.

diff --git a/test/patch/debian-package.patch b/test/patch/debian-package.patch deleted file mode 100644 index 8df7f5675..000000000 --- a/test/patch/debian-package.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- control -+++ control -@@ -20,9 +20,10 @@ - Depends: libdbd-pg-perl, - postgresql-common, - ${misc:Depends}, -- ${perl:Depends}, - ${shlibs:Depends} --Suggests: pgbackrest-doc -+Suggests: pgbackrest-doc, -+ libio-socket-ssl-perl, -+ libxml-libxml-perl - Description: Reliable PostgreSQL Backup & Restore - pgBackRest is a simple, reliable backup and restore system for PostgreSQL - that can seamlessly scale up to the largest databases and workloads. ---- pgbackrest.install -+++ pgbackrest.install -@@ -1,2 +1 @@ - debian/pgbackrest.conf etc/ --lib/pgBackRest usr/share/perl5/ -diff -Naur /backrest/test/.vagrant/package/u18/src/debian.old/rules /backrest/test/.vagrant/package/u18/src/debian.new/rules ---- rules -+++ rules -@@ -3,8 +3,7 @@ - MANTEMPLATE="${CURDIR}/doc/output/man/pgbackrest.1.txt" - - #export DEB_BUILD_MAINT_OPTIONS = hardening=+all --#DPKG_EXPORT_BUILDFLAGS = 1 --#include /usr/share/dpkg/buildflags.mk -+include /usr/share/dpkg/buildflags.mk - - #export DH_VERBOSE = 1 - -@@ -20,22 +19,16 @@ - -t pgbackrest \ - -s 1 \ - ${MANTEMPLATE} > ${CURDIR}/doc/output/man/pgbackrest.1 -- cd $(CURDIR)/libc; perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 -- make -C $(CURDIR)/libc/ -- make -C $(CURDIR)/src/ -+ make -C $(CURDIR)/src CEXTRA="$(CFLAGS)" - dh_auto_build - - override_dh_auto_test: -- test "$(DEB_TARGET_ARCH_ENDIAN)" = "little" && \ -- cd $(CURDIR)/libc; make test - dh_auto_test - - override_dh_auto_clean: - rm -rf $(CURDIR)/doc/output -- test ! -f libc/Makefile || make -C libc distclean - dh_auto_clean - - override_dh_auto_install: -- make -C libc install DESTDIR=$(CURDIR)/debian/pgbackrest - make -C src install DESTDIR=$(CURDIR)/debian/pgbackrest - dh_auto_install