From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 1 Jun 2023 22:42:56 +0000 (+0000)
Subject: Manual merge of version 1.12.1+dfsg-4+rpi1 and 1.13.0+dfsg-3 to produce 1.13.0+dfsg... 
X-Git-Tag: archive/raspbian/1.13.0+dfsg-3+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c32bb8ccb51da8f00fbcfa4015e956f3d0832274;p=pcl.git

Manual merge of version 1.12.1+dfsg-4+rpi1 and 1.13.0+dfsg-3 to produce 1.13.0+dfsg-3+rpi1
---

c32bb8ccb51da8f00fbcfa4015e956f3d0832274
diff --cc debian/changelog
index 7b682a11,96a6f4d6..d0ac43ab
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,47 +1,54 @@@
- pcl (1.12.1+dfsg-4+rpi1) bookworm-staging; urgency=medium
++pcl (1.13.0+dfsg-3+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1.12.1+dfsg-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 03 Feb 2022 18:00:06 +0000]
 +  * Build with clang 11 to avoid armv7 contamination.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 06 Aug 2022 16:56:47 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 01 Jun 2023 22:41:43 +0000
++
+ pcl (1.13.0+dfsg-3) unstable; urgency=medium
+ 
+   * upload to unstable
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Mon, 09 Jan 2023 21:21:07 +0100
+ 
+ pcl (1.13.0+dfsg-2) experimental; urgency=medium
+ 
+   * Add patch for failing tests on i386
+   * Fix dwz with clang
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Sat, 07 Jan 2023 09:26:50 +0100
+ 
+ pcl (1.13.0+dfsg-1) experimental; urgency=medium
+ 
+   [ Debian Janitor ]
+   * Use secure URI in Homepage field.
+   * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository-Browse.
+ 
+   [ Jochen Sprickerhof ]
+   * Better fix for dwz failing with clang
+   * New upstream version 1.13.0+dfsg
+   * Rebase patches
+   * Drop patches to disable tests
+   * Switch to new libglut-dev package name
+   * Move package description to source package
+   * Rename library packages due to Soname bump
+   * Update d/copyright
+   * Bump policy version (no changes)
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Sun, 01 Jan 2023 13:00:10 +0100
+ 
+ pcl (1.12.1+dfsg-6) unstable; urgency=medium
+ 
+   * Disable dh_dwz for clang builds
+   * Revert "Temporary add depends for #1013316"
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Sun, 25 Sep 2022 12:41:19 +0200
+ 
+ pcl (1.12.1+dfsg-5) unstable; urgency=medium
+ 
+   * Add upstream patch to fix build on armhf
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Fri, 19 Aug 2022 13:41:49 +0200
  
  pcl (1.12.1+dfsg-4) unstable; urgency=medium
  
diff --cc debian/control
index da3dadae,7bc44509..13c2385a
--- a/debian/control
+++ b/debian/control
@@@ -6,8 -6,7 +6,7 @@@ Section: lib
  Priority: optional
  Build-Depends: debhelper-compat (= 13),
                 cmake,
- 	       libstdc++-12-dev [mipsel armel armhf],
 -	       clang [mipsel armel armhf],
 +	       clang-11 [mipsel armel armhf],
  	       python3-sphinx,
  	       libboost-system-dev,
  	       libboost-filesystem-dev,
diff --cc debian/rules
index 6cfe8a9e,e8b34e05..a4bfeb5e
--- a/debian/rules
+++ b/debian/rules
@@@ -6,10 -6,15 +6,15 @@@ export DEB_CXXFLAGS_MAINT_APPEND = -g
  
  BUILD_DOC = $(if $(shell dh_listpackages | grep libpcl-doc),-DWITH_DOCS=ON)
  
+ # use clang on some archs as gcc is running into "virtual memory exhausted"
  ifneq (,$(filter $(DEB_BUILD_ARCH),mipsel armhf armel))
    PARALLEL=--max-parallel=2
 -  export CC=/usr/bin/clang
 -  export CXX=/usr/bin/clang++
 +  export CC=/usr/bin/clang-11
 +  export CXX=/usr/bin/clang++-11
+   # fails with "Unknown debugging section .debug_addr"
+   # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1016936
+   # can be removed once dwz is fixed
+ override_dh_dwz:
  else
    PARALLEL=
  endif