[med-svn] [Git][med-team/pftools][master] 5 commits: Revert "Add missing build dependency on dh addon."

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / pftools


Commits:
4ec3b57a by Nilesh Patra at 2022-01-25T22:22:02+05:30
Revert "Add missing build dependency on dh addon."

This reverts commit 4a13523419c3be98eced4804875436eb9b992d0b.

- - - - -
70650b26 by Nilesh Patra at 2022-01-25T22:33:53+05:30
Add patch to fix blhc

- - - - -
1c6493e6 by Nilesh Patra at 2022-01-25T22:35:03+05:30
d/salsa-ci.yml: Disable i386 build

- - - - -
76a1cb32 by Nilesh Patra at 2022-01-25T22:35:43+05:30
d/salsa-ci.yml: Disable reprotest

- - - - -
bb0db8a8 by Nilesh Patra at 2022-01-25T22:36:19+05:30
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/hardening.patch
- debian/patches/series
- debian/salsa-ci.yml


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,18 @@
+pftools (3.2.11-2) unstable; urgency=medium
+
+  * Team Upload.
+  * Revert "Add missing build dependency on dh addon."
+  * Add patch to fix blhc
+  * d/salsa-ci.yml:
+    + Disable i386 build
+    + Disable reprotest
+
+ -- Nilesh Patra <nilesh at debian.org>  Tue, 25 Jan 2022 22:35:45 +0530
+
 pftools (3.2.11-1) unstable; urgency=medium
 
   * Use Github tags instead of releases
   * New upstream version
-  * Add missing build dependency on dh addon.
 
  -- Andreas Tille <tille at debian.org>  Tue, 25 Jan 2022 10:01:51 +0100
 


=====================================
debian/control
=====================================
@@ -9,8 +9,7 @@ Build-Depends: debhelper-compat (= 13),
                libfile-slurp-perl,
                libbz2-dev,
                libreadline-dev,
-               zlib1g-dev,
-               debhelper
+               zlib1g-dev
 Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/med-team/pftools
 Vcs-Git: https://salsa.debian.org/med-team/pftools.git


=====================================
debian/patches/hardening.patch
=====================================
@@ -0,0 +1,14 @@
+Description: Use env LDFLAGS to fix blhc
+Author: Nilesh Patra <nilesh at debian.org>
+Last-Update: 2022-01-25
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -275,7 +275,7 @@
+ ELSE(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+   OPTION(USE_RPATH "Use -rpath when linking libraries, executables" ON)
+   IF(USE_RPATH)
+-    SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
++    SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags $ENV{LDFLAGS}")
+     # use, i.e. don't skip the full RPATH for the build tree
+     SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+ 


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 spelling.patch
 fix_perl_interpreter.patch
 destdir_for_examples.patch
+hardening.patch


=====================================
debian/salsa-ci.yml
=====================================
@@ -2,3 +2,7 @@
 include:
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
+variables:
+  SALSA_CI_DISABLE_BUILD_PACKAGE_I386: "true"
+  SALSA_CI_DISABLE_REPROTEST: 1



View it on GitLab: https://salsa.debian.org/med-team/pftools/-/compare/27db68c33cfd5e2c69149eaf52fc7169cab72e12...bb0db8a870a4bb634744f57eaac28e84a07ece1e

-- 
View it on GitLab: https://salsa.debian.org/med-team/pftools/-/compare/27db68c33cfd5e2c69149eaf52fc7169cab72e12...bb0db8a870a4bb634744f57eaac28e84a07ece1e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220125/e145a3cb/attachment-0001.htm>