Merge ~skia/ubuntu/+source/mmc-utils:skia/merge_1.0-1_0+git20240329.f757f413-1ubuntu1 into ubuntu/+source/mmc-utils:debian/sid

[Skia]

PPA: https://launchpad.net/~skia/+archive/ubuntu/merge-mmc-utils-lp2132140
autopkgtest: the package has none

[Nick Rosbrook (enr0n)]

LGTM. Thanks!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 663aa26..ccb9d49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+mmc-utils (1.0-1ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable (LP: #2132140).
+    Remaining changes:
+    - d/rules: undefine _FORTIFY_SOURCE as its already set to the highest
+      value that builds by the upstream code
+    Dropped changes:
+    - Fix various compiler nitpicks resulting in an FTBFS.
+    The former delta was mostly a result of building with _FORTIFY_SOURCE=3.
+    That didn't really worked, was broken, and wasn't applicable anymore with
+    the new version. Instead, the package is now back to building with
+    _FORTIFY_SOURCE=2, with a one-line delta in d/rules.
+
+ -- Florent 'Skia' Jacquet <[e-mail]>  Fri, 21 Nov 2025 18:36:13 +0100
+
 mmc-utils (1.0-1) unstable; urgency=medium
 
   * Update to v1.0.
@@ -13,6 +28,12 @@ mmc-utils (1.0-1) unstable; urgency=medium
 
  -- Nobuhiro Iwamatsu <[e-mail]>  Sun, 17 Aug 2025 06:44:39 +0900
 
+mmc-utils (0+git20240329.f757f413-1ubuntu1) plucky; urgency=medium
+
+  * Fix various compiler nitpicks resulting in an FTBFS.
+
+ -- Simon Quigley <[e-mail]>  Sat, 08 Mar 2025 12:27:29 -0600
+
 mmc-utils (0+git20240329.f757f413-1) unstable; urgency=medium
 
   * Snapshot, taken from the master (20240329) (Closes: #1030829)
diff --git a/debian/control b/debian/control
index 02eb8cc..7bd564f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: mmc-utils
 Section: utils
 Priority: optional
-Maintainer: Nobuhiro Iwamatsu <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Nobuhiro Iwamatsu <[e-mail]>
 Build-Depends: debhelper-compat (= 13)
 Standards-Version: 4.7.2
 Rules-Requires-Root: no
diff --git a/debian/rules b/debian/rules
index bf08709..2e1f5c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DEB_CPPFLAGS_MAINT_APPEND=-U_FORTIFY_SOURCE
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 include /usr/share/dpkg/pkg-info.mk