Merge ~danilogondolfo/ubuntu/+source/firebird3.0:mantic_merge_1 into ubuntu/+source/firebird3.0:debian/sid

[Danilo Egea Gondolfo]

412d26b... by Danilo Egea Gondolfo on 2023-07-05

Switch architecture to i686 on Ubuntu instead of i486

69ea98c... by Danilo Egea Gondolfo on 2023-07-05

Update maintainer

0affba6... by Danilo Egea Gondolfo on 2023-07-05

Changelog

[Athos Ribeiro (athos-ribeiro)]

Hi Danilo,

Did you follow the process described in https://github.com/canonical/ubuntu-maintainers-handbook/blob/main/PackageMerging.md?

If so, would you mind also pushing the tags generated through that merge process?

[Athos Ribeiro (athos-ribeiro)]

I also triggered dep8 tests in your ppa for the remaining arches (we had only the amd64 results):

All tests are passing

* Results:
  - firebird3.0/3.0.11.33637.ds4-2ubuntu1
    + ✅ firebird3.0 on mantic for amd64 @ 04.07.23 12:37:08
    + ✅ firebird3.0 on mantic for arm64 @ 07.07.23 17:51:33
    + ✅ firebird3.0 on mantic for armhf @ 07.07.23 17:52:29
    + ✅ firebird3.0 on mantic for i386 @ 07.07.23 17:48:52
    + ✅ firebird3.0 on mantic for ppc64el @ 07.07.23 17:48:25
    + ✅ firebird3.0 on mantic for s390x @ 07.07.23 17:47:24

[Christian Ehrhardt  (paelzer)]

Hi,
the Ubuntu delta on this is small and retained correctly.
But I'm not entirely sure it is worth it and I feel uncomfortable carrying this forward without asking some questions.

I mean, march helps, but how much?
Is it worth the effort for this to not be a sync?
Could I ask you to talk to Gianfranco (the author) about the background when it was added (there is no LP bug) and how much the gain was.

If that is not known, you might do an investigation on your own, file that and
a) proven improvement - refer to the bug in the changelog
b) no improvement - we make this a sync again

Even in case of (a) you might want to prep something that does this change via dpkg-vendor in d/rules so that it can be a sync after accepted in Debian.

P.S. does it even have effect, it is well hidden so it can not be seen int he buildlog?!

review: Needs Information

[Gianfranco Costamagna (costamagnagianfranco)]

Approved and sponsored!

review: Approve

[Gianfranco Costamagna (costamagnagianfranco)]

Hello, the fix was about fixing FTBFS on i386. I think we have a default on i586 instead of i486 in Ubuntu.
This is why we FTBFS.

Unmerged commits

0affba6... by Danilo Egea Gondolfo on 2023-07-05

Changelog

69ea98c... by Danilo Egea Gondolfo on 2023-07-05

Update maintainer

412d26b... by Danilo Egea Gondolfo on 2023-07-05

Switch architecture to i686 on Ubuntu instead of i486

diff --git a/debian/changelog b/debian/changelog
index 1ddb631..3f1ab74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+firebird3.0 (3.0.11.33637.ds4-2ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian unstable (LP: #2025754). Remaining changes:
+    - Switch architecture to i686 on Ubuntu instead of i486
+
+ -- Danilo Egea Gondolfo <[e-mail]>  Tue, 04 Jul 2023 11:46:03 +0100
+
 firebird3.0 (3.0.11.33637.ds4-2) unstable; urgency=medium
 
   * fix arch-all-only build by overriding only dh_lintian-arch for libib-util
@@ -57,6 +64,30 @@ firebird3.0 (3.0.9.33560.ds4-1) unstable; urgency=medium
 
  -- Damyan Ivanov <[e-mail]>  Mon, 14 Feb 2022 21:09:03 +0000
 
+firebird3.0 (3.0.8.33535.ds4-1ubuntu4) lunar; urgency=medium
+
+  * Rebuild against latest icu
+
+ -- Jeremy Bicha <[e-mail]>  Sat, 04 Feb 2023 10:37:09 -0500
+
+firebird3.0 (3.0.8.33535.ds4-1ubuntu3) kinetic; urgency=medium
+
+  * No-change rebuild against latest icu
+
+ -- Jeremy Bicha <[e-mail]>  Fri, 29 Apr 2022 08:04:11 -0400
+
+firebird3.0 (3.0.8.33535.ds4-1ubuntu2) jammy; urgency=medium
+
+  * No-change rebuild for icu soname change.
+
+ -- Matthias Klose <[e-mail]>  Wed, 09 Feb 2022 05:39:18 +0100
+
+firebird3.0 (3.0.8.33535.ds4-1ubuntu1) jammy; urgency=medium
+
+  * Switch architecture to i686 on Ubuntu instead of i486
+
+ -- Gianfranco Costamagna <[e-mail]>  Tue, 23 Nov 2021 21:41:01 +0100
+
 firebird3.0 (3.0.8.33535.ds4-1) unstable; urgency=medium
 
   * New upstream version 3.0.8.33535.ds4
diff --git a/debian/control b/debian/control
index c83c6d2..e32bb2f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: firebird3.0
 Section: database
 Priority: optional
-Maintainer: Damyan Ivanov <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Damyan Ivanov <[e-mail]>
 Build-Depends:
  autoconf,
  automake,
diff --git a/debian/patches/deb/march-i486.patch b/debian/patches/deb/march-i486.patch
index b667939..54b7c4e 100644
--- a/debian/patches/deb/march-i486.patch
+++ b/debian/patches/deb/march-i486.patch
@@ -9,7 +9,7 @@
  COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 -fno-delete-null-pointer-checks
  CXXFLAGS+=-std=gnu++03
 -OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer
-+OPTIMIZE_FLAGS=-O3 -march=i486 -mtune=i686 -fno-omit-frame-pointer
++OPTIMIZE_FLAGS=-O3 -march=i686 -mtune=i686 -fno-omit-frame-pointer
  WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-narrowing
  
  PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
@@ -20,7 +20,7 @@
  COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DFREEBSD -pipe -MMD -fPIC -fmessage-length=0 -fno-delete-null-pointer-checks
  CXXFLAGS+=-std=gnu++03
 -OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer
-+OPTIMIZE_FLAGS=-O3 -march=i486 -mtune=i686 -fno-omit-frame-pointer
++OPTIMIZE_FLAGS=-O3 -march=i686 -mtune=i686 -fno-omit-frame-pointer
  WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-narrowing
  
  PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)