From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 16 Feb 2024 22:37:47 +0000 (+0000)
Subject: Merge version 2.3.4+dfsg1-1.1+rpi1 and 2.4.4+dfsg1-3 to produce 2.4.4+dfsg1-3+rpi1
X-Git-Tag: archive/raspbian/2.4.4+dfsg1-3+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e1496f469b6aff36f3a9cb73e26c1e6f5cbf1a8b;p=389-ds-base.git

Merge version 2.3.4+dfsg1-1.1+rpi1 and 2.4.4+dfsg1-3 to produce 2.4.4+dfsg1-3+rpi1
---

e1496f469b6aff36f3a9cb73e26c1e6f5cbf1a8b
diff --cc debian/changelog
index 2bec770,d43f213..62e4dda
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,23 +1,30 @@@
- 389-ds-base (2.3.4+dfsg1-1.1+rpi1) trixie-staging; urgency=medium
++389-ds-base (2.4.4+dfsg1-3+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.4.0.19-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 27 Dec 2018 01:27:25 +0000]
 +  * Add -latomic to LDFLAGS on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 06 Jan 2024 19:53:44 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 16 Feb 2024 22:37:46 +0000
++
+ 389-ds-base (2.4.4+dfsg1-3) unstable; urgency=medium
+ 
+   * rules: Fix build on 32bit. Thanks, Chris Peterson! (Closes:
+     #1063434)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Sat, 10 Feb 2024 11:04:23 +0200
+ 
+ 389-ds-base (2.4.4+dfsg1-2) unstable; urgency=medium
+ 
+   [ Chris Hofstaedtler ]
+   * Install aliased files into /usr (DEP17 M2) (Closes: #1060335)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Wed, 10 Jan 2024 16:11:28 +0200
+ 
+ 389-ds-base (2.4.4+dfsg1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * rules: Generate lib389/setup.py.
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Mon, 08 Jan 2024 18:04:08 +0200
  
  389-ds-base (2.3.4+dfsg1-1.1) unstable; urgency=medium
  
diff --cc debian/rules
index 6d8d93a,38ca64c..59f5052
--- a/debian/rules
+++ b/debian/rules
@@@ -4,9 -4,12 +4,12 @@@
  export DEB_BUILD_MAINT_OPTIONS = hardening=+pie
  
  
 -ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mips mipsel powerpc powerpcspe sh4))
 +ifneq (,$(filter $(DEB_HOST_ARCH), armhf armel m68k mips mipsel powerpc powerpcspe sh4))
    export DEB_LDFLAGS_MAINT_APPEND=-latomic
  endif
+ ifneq (,$(filter $(DEB_HOST_ARCH), armhf armel i386))
+   export DEB_CFLAGS_MAINT_APPEND=-D_LARGEFILE64_SOURCE
+ endif
  
  REALFILE = \
  	bin/ds-logpipe.py \