diff -pruN 2:4.36-1/debian/changelog 2:4.36-1ubuntu2/debian/changelog
--- 2:4.36-1/debian/changelog	2024-11-18 22:05:41.000000000 +0000
+++ 2:4.36-1ubuntu2/debian/changelog	2025-09-22 11:23:23.000000000 +0000
@@ -1,3 +1,22 @@
+nspr (2:4.36-1ubuntu2) questing; urgency=medium
+
+  * No-change rebuild for IEEE long double on ppc64el
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Mon, 22 Sep 2025 11:23:23 +0000
+
+nspr (2:4.36-1ubuntu1) plucky; urgency=medium
+
+  * Merge from Debian Unstable. Remaining changes:
+    - Drop explicit -Wl,--as-needed linker flag. It's the default.
+    - Drop explicit CFLAGS that are checked by configure.
+    - Also use non-hardening flags from dpkg-buildflags to pick up flags
+      like -fno-omit-frame-pointer.
+  * Dropped change (included upstream):
+    - d/p/fix-ftbfs-incompatible-thread-start-type.patch: Fix FTBFS due
+      to incompatible native thread start types (LP: #2081110)
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 11 Feb 2025 16:23:06 -0600
+
 nspr (2:4.36-1) unstable; urgency=medium
 
   * New upstream release.
@@ -5,6 +24,35 @@ nspr (2:4.36-1) unstable; urgency=medium
 
  -- Mike Hommey <glandium@debian.org>  Tue, 19 Nov 2024 07:05:41 +0900
 
+nspr (2:4.35-1.1ubuntu2) plucky; urgency=medium
+
+  * d/p/fix-ftbfs-incompatible-thread-start-type.patch: Fix FTBFS due
+    to incompatible native thread start types (LP: #2081110)
+
+ -- Lena Voytek <lena.voytek@canonical.com>  Fri, 11 Oct 2024 08:27:41 -0700
+
+nspr (2:4.35-1.1ubuntu1) oracular; urgency=medium
+
+  * Drop explicit -Wl,--as-needed linker flag. It's the default.
+  * Drop explicit CFLAGS that are checked by configure.
+  * Also use non-hardening flags from dpkg-buildflags to pick up flags
+    like -fno-omit-frame-pointer.
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Mon, 22 Jul 2024 11:39:40 +0200
+
+nspr (2:4.35-1.1build1) noble; urgency=high
+
+  * No change rebuild for 64-bit time_t and frame pointers.
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Mon, 08 Apr 2024 18:14:31 +0200
+
+nspr (2:4.35-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Avoid libreswan build failures on mipsel (Closes: #854472)
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Wed, 22 Feb 2023 15:00:34 -0500
+
 nspr (2:4.35-1) unstable; urgency=medium
 
   * New upstream release.
@@ -721,3 +769,4 @@ nspr (4.6.6-1) experimental; urgency=low
   * Initial release. (Closes: #416150)
 
  -- Mike Hommey <glandium@debian.org>  Sun, 25 Mar 2007 16:32:41 +0200
+
diff -pruN 2:4.36-1/debian/control 2:4.36-1ubuntu2/debian/control
--- 2:4.36-1/debian/control	2021-11-20 22:33:58.000000000 +0000
+++ 2:4.36-1ubuntu2/debian/control	2024-11-19 03:47:17.000000000 +0000
@@ -1,7 +1,8 @@
 Source: nspr
 Section: libs
 Priority: optional
-Maintainer: Maintainers of Mozilla-related packages <team+pkg-mozilla@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Maintainers of Mozilla-related packages <team+pkg-mozilla@tracker.debian.org>
 Uploaders: Mike Hommey <glandium@debian.org>
 Build-Depends: debhelper-compat (= 13), dpkg-dev (>= 1.15.4)
 Standards-Version: 4.6.0
diff -pruN 2:4.36-1/debian/rules 2:4.36-1ubuntu2/debian/rules
--- 2:4.36-1/debian/rules	2021-11-20 22:33:56.000000000 +0000
+++ 2:4.36-1ubuntu2/debian/rules	2024-11-19 03:47:17.000000000 +0000
@@ -4,15 +4,6 @@ include debian/make.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-# Use dpkg-buildflags to get hardening flags, and exclude non-hardening flags
-dpkg_buildflags = $(and $(1),$(shell DEB_CFLAGS_MAINT_STRIP="$(shell DEB_BUILD_MAINT_OPTIONS=hardening=-all dpkg-buildflags --get $(1))" dpkg-buildflags --get $(1)))
-$(call lazy,CFLAGS,$$(call dpkg_buildflags,CFLAGS))
-$(call lazy,CPPFLAGS,$$(call dpkg_buildflags,CPPFLAGS))
-$(call lazy,LDFLAGS,$$(call dpkg_buildflags,LDFLAGS))
-
-CFLAGS += -Wall -pipe
-LDFLAGS += -Wl,--as-needed
-
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CONFIGURE_FLAGS := --disable-optimize
 else
@@ -49,9 +40,6 @@ override_dh_auto_configure: $(PREPROCESS
 	done
 
 	cd nspr && \
-	CFLAGS="$(CFLAGS)" \
-	CPPFLAGS="$(CPPFLAGS)" \
-	LDFLAGS="$(LDFLAGS)" \
 	./configure --target=$(DEB_HOST_GNU_TYPE) --host=$(DEB_BUILD_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
                     $(CONFIGURE_FLAGS) \
 		    --prefix=/usr \
