Drop patches that were applied upstream

diff --git a/debian/patches/lib-Fix-symbol-versioning-inheritance.patch b/debian/patches/lib-Fix-symbol-versioning-inheritance.patch
deleted file mode 100644 (file)
index b0b4889..0000000
--- a/debian/patches/lib-Fix-symbol-versioning-inheritance.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Colin Walters <walters@verbum.org>
-Date: Wed, 8 Jun 2022 16:27:30 -0400
-Subject: [PATCH] lib: Fix symbol versioning inheritance
-
-I messed this up; the last release should inherit from the previous
-release (N-1) and not the previous to that (N-2).
-
-I think (hope) this isn't an ABI break...
-
-Just noticed this when I was going to add a new symbol.
-
-Applied-upstream: 2022.4, commit:145d91d1c96755bc61a468b5da1061547909121e
----
- src/libostree/libostree-released.sym | 2 +-
- tests/test-symbols.sh                | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym
-index 8b8a722d8..5afdfd3e2 100644
---- a/src/libostree/libostree-released.sym
-+++ b/src/libostree/libostree-released.sym
-@@ -681,7 +681,7 @@ LIBOSTREE_2022.4 {
- global:
-   ostree_fs_get_all_xattrs;
-   ostree_fs_get_all_xattrs_at;
--} LIBOSTREE_2021.5;
-+} LIBOSTREE_2022.2;
- 
- /* NOTE: Only add more content here in release commits!  See the
-  * comments at the top of this file.
-diff --git a/tests/test-symbols.sh b/tests/test-symbols.sh
-index a888ef358..a14849d56 100755
---- a/tests/test-symbols.sh
-+++ b/tests/test-symbols.sh
-@@ -54,7 +54,7 @@ echo 'ok documented symbols'
- 
- # ONLY update this checksum in release commits!
- cat > released-sha256.txt <<EOF
--fb66f84d9af5270ed34fdf9f70f97e59394336a9559f493917704bdffa19027d  ${released_syms}
-+34ff6c97e20242a449b210f7452a12d0bb6ac9e135638f71c2d27b2f2b583ef3  ${released_syms}
- EOF
- sha256sum -c released-sha256.txt
- 
--- 
-2.30.2
-

diff --git a/debian/patches/series b/debian/patches/series
index cb3cc41df60c5aba16bfc35438f9d10e8eae3067..b73e566a722cdb595a2da78c1c1ef5f43703efb2 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-test-basic-c-Don-t-assert-that-extended-attributes-are-av.patch
-lib-Fix-symbol-versioning-inheritance.patch
 debian/Skip-test-pull-repeated-during-CI.patch

diff --git a/debian/patches/test-basic-c-Don-t-assert-that-extended-attributes-are-av.patch b/debian/patches/test-basic-c-Don-t-assert-that-extended-attributes-are-av.patch
deleted file mode 100644 (file)
index 39d2a26..0000000
--- a/debian/patches/test-basic-c-Don-t-assert-that-extended-attributes-are-av.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Fri, 17 Jun 2022 14:15:35 +0100
-Subject: test-basic-c: Don't assert that extended attributes are available
-
-Not all filesystems support extended attributes. This test uses
-/var/tmp to try to get an extended-attributes-capable filesystem,
-but that might not succeed.
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Forwarded: https://github.com/ostreedev/ostree/pull/2652
----
- tests/test-basic-c.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test-basic-c.c b/tests/test-basic-c.c
-index 1886feb..fc99529 100644
---- a/tests/test-basic-c.c
-+++ b/tests/test-basic-c.c
-@@ -514,8 +514,15 @@ test_read_xattrs (void)
-     g_assert_no_error (local_error);
-   
-     int r = fsetxattr (tmpd.fd, "user.ostreetesting", value, sizeof (value), 0);
--    g_assert_cmpint (r, ==, 0);
--  
-+
-+    if (r != 0)
-+      {
-+        g_autofree gchar *message = g_strdup_printf ("Unable to set extended attributes in /var/tmp: %s",
-+                                                     g_strerror (errno));
-+        g_test_skip (message);
-+        return;
-+      }
-+
-     g_autoptr(GVariant) new_xattrs = ostree_fs_get_all_xattrs (tmpd.fd, NULL, error);
-     g_assert_no_error (local_error);
-