From: Peter Michael Green <plugwash@raspbian.org>
Date: Sun, 1 Jun 2025 05:20:38 +0000 (+0000)
Subject: Manual merge of version 17.36.1-1+rpi1 and 17.36.7-1 to produce 17.36.7-1+rpi1
X-Git-Tag: archive/raspbian/17.36.7-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0a82a2f1d6612207165266af254b89c33eb68c92;p=libzypp.git

Manual merge of version 17.36.1-1+rpi1 and 17.36.7-1 to produce 17.36.7-1+rpi1
---

0a82a2f1d6612207165266af254b89c33eb68c92
diff --cc debian/changelog
index 5fbe06a,39fafb0..ad2d960
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,35 +1,43 @@@
- libzypp (17.36.1-1+rpi1) trixie-staging; urgency=medium
++libzypp (17.36.7-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 17.35.9-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 05 Sep 2024 21:27:32 +0000]
 +  * Add build-depends on liblzma-dev.
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 06 Mar 2025 23:34:37 +0000
++ -- Peter Michael Green  <plugwash@raspbian.org>  Sun, 01 Jun 2025 05:18:26 +0000
++
+ libzypp (17.36.7-1) unstable; urgency=medium
+ 
+   * Update upstream source from tag 'upstream/17.36.7'
+   * d/copyright: use GPL URL instead of old FSF postal address
+ 
+  -- Luca Boccassi <bluca@debian.org>  Fri, 02 May 2025 10:06:00 +0100
+ 
+ libzypp (17.36.6-1) unstable; urgency=medium
+ 
+   * Update upstream source from tag 'upstream/17.36.6'
+ 
+  -- Luca Boccassi <bluca@debian.org>  Fri, 04 Apr 2025 09:47:25 +0100
+ 
+ libzypp (17.36.5-1) unstable; urgency=medium
+ 
+   * Update upstream source from tag 'upstream/17.36.5'
+   * d/control: bump Standards-Version to 4.7.2, no changes
+ 
+  -- Luca Boccassi <bluca@debian.org>  Tue, 18 Mar 2025 18:03:27 +0000
+ 
+ libzypp (17.36.4-1) unstable; urgency=medium
+ 
+   * Update upstream source from tag 'upstream/17.36.4'
+   * Skip failing unit test (Closes: #1099245)
+ 
+  -- Luca Boccassi <bluca@debian.org>  Sun, 02 Mar 2025 13:01:54 +0000
+ 
+ libzypp (17.36.2-1) unstable; urgency=medium
+ 
+   * Update upstream source from tag 'upstream/17.36.2'
+ 
+  -- Luca Boccassi <bluca@debian.org>  Tue, 25 Feb 2025 17:39:14 +0000
  
  libzypp (17.36.1-1) unstable; urgency=medium
  
diff --cc debian/rules
index 0821701,b3e516a..3c33ac4
--- a/debian/rules
+++ b/debian/rules
@@@ -29,4 -29,4 +29,4 @@@ override_dh_auto_configure
  
  override_dh_auto_test:
  	mkdir -p $(HOME)/.gnupg
- 	#dh_auto_test -- ARGS+='--exclude-regex \(NetworkRequestDispatcher_test\|EvDownloader_test\|Provider_test\|RepoInfo_test\|MirrorList_test\)'
 -	dh_auto_test -- ARGS+='--exclude-regex \(NetworkRequestDispatcher_test\|EvDownloader_test\|Provider_test\|RepoInfo_test\|MirrorList_test\|YUMDownloader_test\|Fetcher_test\)'
++	#dh_auto_test -- ARGS+='--exclude-regex \(NetworkRequestDispatcher_test\|EvDownloader_test\|Provider_test\|RepoInfo_test\|MirrorList_test\|YUMDownloader_test\|Fetcher_test\)'