--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package libprelude
unblock libprelude/1.0.0-11.9
diff -Nru libprelude-1.0.0/debian/changelog libprelude-1.0.0/debian/changelog
--- libprelude-1.0.0/debian/changelog 2016-09-06 18:33:46.000000000 +0300
+++ libprelude-1.0.0/debian/changelog 2017-02-23 12:50:44.000000000 +0200
@@ -1,3 +1,19 @@
+libprelude (1.0.0-11.9) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport upstream fix for FTBFS with recent SWIG.
+ (Closes: #844897)
+ * - Apply patch from Andreas Beckmann to factor out a
+ libpreludecpp0 package.
+ - Move HTML documentation from libprelude2 to libprelude-dev.
+ (Closes: #797161)
+ * Switch from -dbg to -dbgsym.
+ * Remove generated bindings/lua/PreludeEasy.cxx
+ when cleaning to allow building twice in a row.
+ * Don't disable PIE.
+
+ -- Adrian Bunk <bunk@debian.org> Thu, 23 Feb 2017 12:50:44 +0200
+
libprelude (1.0.0-11.8) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru libprelude-1.0.0/debian/control libprelude-1.0.0/debian/control
--- libprelude-1.0.0/debian/control 2016-09-06 17:51:48.000000000 +0300
+++ libprelude-1.0.0/debian/control 2017-02-23 12:50:44.000000000 +0200
@@ -20,7 +20,7 @@
Package: libprelude-dev
Section: libdevel
Architecture: any
-Depends: libprelude2 (= ${binary:Version}), libgnutls28-dev, libgcrypt20-dev,
+Depends: libprelude2 (= ${binary:Version}), libpreludecpp0 (= ${binary:Version}), libgnutls28-dev, libgcrypt20-dev,
libltdl3-dev, ${misc:Depends}
Description: Security Information Management System [ Development files ]
Prelude is a Universal "Security Information Management" (SIM) system.
@@ -38,7 +38,7 @@
Package: libprelude2
Section: libs
Architecture: any
-Pre-Depends: multiarch-support
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Security Information Management System [ Base library ]
Prelude is a Universal "Security Information Management" (SIM) system.
@@ -53,11 +53,14 @@
.
This package contains the Prelude shared library.
-Package: libprelude2-dbg
-Section: debug
+Package: libpreludecpp0
+Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, libprelude2 (= ${binary:Version}), ${perl:Depends}, ${misc:Depends}
-Description: Security Information Management System [ Debug symbols ]
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: libprelude2 (<< 1.0.0-11.9~)
+Replaces: libprelude2 (<< 1.0.0-11.9~)
+Description: Security Information Management System [ C++ library ]
Prelude is a Universal "Security Information Management" (SIM) system.
Its goals are performance and modularity. It is divided in two main
parts :
@@ -68,7 +71,7 @@
- the Prelude report server, collecting data from Prelude sensors,
and generating user-readable reports.
.
- This package contains debugging symbols for Prelude shared library.
+ This package contains the Prelude C++ shared library.
Package: libprelude-perl
Section: perl
diff -Nru libprelude-1.0.0/debian/libprelude2.dirs libprelude-1.0.0/debian/libprelude2.dirs
--- libprelude-1.0.0/debian/libprelude2.dirs 2014-05-25 16:58:53.000000000 +0300
+++ libprelude-1.0.0/debian/libprelude2.dirs 2017-02-23 12:50:44.000000000 +0200
@@ -2,5 +2,4 @@
etc/prelude
etc/prelude/default
etc/prelude/profile
-usr/share/doc/libprelude2/html
var/spool/prelude
diff -Nru libprelude-1.0.0/debian/libprelude2.install libprelude-1.0.0/debian/libprelude2.install
--- libprelude-1.0.0/debian/libprelude2.install 2014-05-25 16:58:53.000000000 +0300
+++ libprelude-1.0.0/debian/libprelude2.install 2017-02-23 12:43:26.000000000 +0200
@@ -1,5 +1,4 @@
debian/tmp/etc/prelude/*
debian/tmp/usr/bin/prelude-admin
debian/tmp/usr/share/man/man1/prelude-admin.1
-debian/tmp/usr/lib/*/lib*.so.*
-debian/tmp/usr/share/gtk-doc/html/libprelude/* usr/share/doc/libprelude2/html/
+debian/tmp/usr/lib/*/libprelude.so.*
diff -Nru libprelude-1.0.0/debian/libpreludecpp0.install libprelude-1.0.0/debian/libpreludecpp0.install
--- libprelude-1.0.0/debian/libpreludecpp0.install 1970-01-01 02:00:00.000000000 +0200
+++ libprelude-1.0.0/debian/libpreludecpp0.install 2017-02-12 17:08:31.000000000 +0200
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*/libpreludecpp.so.*
diff -Nru libprelude-1.0.0/debian/libprelude-dev.install libprelude-1.0.0/debian/libprelude-dev.install
--- libprelude-1.0.0/debian/libprelude-dev.install 2014-05-25 16:58:53.000000000 +0300
+++ libprelude-1.0.0/debian/libprelude-dev.install 2017-02-23 12:50:44.000000000 +0200
@@ -1,3 +1,4 @@
debian/tmp/usr/lib/*/lib*.so
debian/tmp/usr/bin/libprelude-config
debian/tmp/usr/include/libprelude/*
+debian/tmp/usr/share/gtk-doc/html/libprelude/* usr/share/doc/libprelude-dev/html/
diff -Nru libprelude-1.0.0/debian/patches/series libprelude-1.0.0/debian/patches/series
--- libprelude-1.0.0/debian/patches/series 2015-12-19 16:26:56.000000000 +0200
+++ libprelude-1.0.0/debian/patches/series 2017-02-12 16:55:29.000000000 +0200
@@ -10,3 +10,4 @@
gcc5.diff
020_Update-to-latest-GnuTLS-API.patch
swig-perl-lua-comments.patch
+swig-ftbfs.patch
diff -Nru libprelude-1.0.0/debian/patches/swig-ftbfs.patch libprelude-1.0.0/debian/patches/swig-ftbfs.patch
--- libprelude-1.0.0/debian/patches/swig-ftbfs.patch 1970-01-01 02:00:00.000000000 +0200
+++ libprelude-1.0.0/debian/patches/swig-ftbfs.patch 2017-02-12 17:02:50.000000000 +0200
@@ -0,0 +1,23 @@
+Description: Fix SWIG FTBFS
+ Backport change from 3.1.0 that fixes FTBFS with recent SWIG.
+Author: Adrian Bunk <bunk@debian.org>
+Bug-Debian: https://bugs.debian.org/844897
+Origin: upstream
+
+--- libprelude-1.0.0.orig/bindings/libpreludecpp.i
++++ libprelude-1.0.0/bindings/libpreludecpp.i
+@@ -75,8 +75,12 @@ typedef signed int prelude_error_t;
+ %template() std::vector<Prelude::Connection>;
+
+
+-%fragment("IDMEFValue_to_SWIG", "header", fragment="IDMEFValueList_to_SWIG", fragment="SWIG_From_float") {
+-
++%fragment("IDMEFValue_to_SWIG", "header", fragment="SWIG_From_double",
++ fragment="SWIG_From_float",
++ fragment="SWIG_From_int", fragment=" SWIG_From_unsigned_SS_int",
++ fragment="SWIG_From_long_SS_long", fragment="SWIG_From_unsigned_SS_long_SS_long",
++ fragment="SWIG_FromCharPtr", fragment="SWIG_FromCharPtrAndSize", fragment="SWIG_FromBytePtrAndSize",
++ fragment="IDMEFValueList_to_SWIG") {
+
+ int IDMEFValue_to_SWIG(const IDMEFValue &result, TARGET_LANGUAGE_OUTPUT_TYPE ret)
+ {
diff -Nru libprelude-1.0.0/debian/rules libprelude-1.0.0/debian/rules
--- libprelude-1.0.0/debian/rules 2016-09-06 18:22:16.000000000 +0300
+++ libprelude-1.0.0/debian/rules 2017-02-22 19:55:02.000000000 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
#export DH_VERBOSE=1
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
PYVERS=$(shell pyversions -vr)
@@ -38,7 +38,7 @@
mv debian/tmp-python-libprelude/usr/lib/* debian/tmp/usr/lib/
override_dh_strip:
- dh_strip --dbg-package=libprelude2-dbg
+ dh_strip --dbgsym-migration='libprelude2-dbg (<< 1.0.0-11.9~)'
override_dh_auto_clean:
-rm -rf debian/tmp-python-libprelude
@@ -47,6 +47,7 @@
dh_auto_clean
rm -f bindings/low-level/perl/Makefile.old
rm -f bindings/perl/PreludeEasy.pm
+ rm -f bindings/lua/PreludeEasy.cxx
[ ! -d debian/temp.backup ] || cp -a debian/temp.backup/* bindings/python/
[ ! -d debian/temp.backup ] || rm -rf debian/temp.backup
--- End Message ---