Merge ~mkukri/ubuntu/+source/gnustep-base:ubuntu/devel into ubuntu/+source/gnustep-base:ubuntu/devel

[Mate Kukri]

Fix gnustep-base regression caused by tzdata 2023c-9ubuntu1.

[Julian Andres Klode (juliank)]

This was missing a call to update-maintainer and it may have been nice to drop the empty line after [...] but I ran the call and uploaded it, thank you!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index aad605d..6417092 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+gnustep-base (1.29.0-6ubuntu2) mantic; urgency=medium
+
+  [ Yavor Doganov ]
+
+  * debian/templates/control.m4 (Build-Depends): Replace tzdata with
+    tzdata-legacy; fixes FTBFS and autopkgtest failure with recent tzdata
+    (Closes: #1050528).  Thanks Paul Gevers for the report.
+    (gnustep-base-common) <Depends>: Likewise.  This has the unfortunate
+    effect of pulling in tzdata-legacy on practically every GNUstep
+    installation but it's necessary so that methods like NSTimeZone
+    +timeZoneWithAbbreviation: continue to work.
+  * debian/control: Regenerate.
+
+ -- Mate Kukri <[e-mail]>  Wed, 06 Sep 2023 14:15:57 +0100
+
 gnustep-base (1.29.0-6ubuntu1) mantic; urgency=low
 
   * Merge from Debian unstable. Remaining changes:
diff --git a/debian/control b/debian/control
index 588f3e9..b33626b 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends: debhelper-compat (= 13),
                m4,
                libavahi-client-dev,
                libicu-dev,
-               tzdata
+               tzdata-legacy,
 Build-Depends-Indep: texinfo <!nodoc>,
                      texlive-latex-base <!nodoc>,
                      texlive-fonts-recommended <!nodoc>,
@@ -35,7 +35,7 @@ Package: gnustep-base-common
 Architecture: all
 Depends: gnustep-common (>= 2.9.1-2),
          ca-certificates,
-         tzdata,
+         tzdata-legacy,
          ${misc:Depends}
 Description: GNUstep Base library - common files
  The GNUstep Base Library is a powerful fast library of
diff --git a/debian/templates/control.m4 b/debian/templates/control.m4
index d2a6d26..0c795b8 100644
--- a/debian/templates/control.m4
+++ b/debian/templates/control.m4
@@ -19,7 +19,7 @@ Build-Depends: debhelper-compat (= 13),
                m4,
                libavahi-client-dev,
                libicu-dev,
-               tzdata
+               tzdata-legacy,
 Build-Depends-Indep: texinfo <!nodoc>,
                      texlive-latex-base <!nodoc>,
                      texlive-fonts-recommended <!nodoc>,
@@ -35,7 +35,7 @@ Package: gnustep-base-common
 Architecture: all
 Depends: gnustep-common (>= V_MAKE),
          ca-certificates,
-         tzdata,
+         tzdata-legacy,
          ${misc:Depends}
 Description: GNUstep Base library - common files
  The GNUstep Base Library is a powerful fast library of