On Fri, Sep 16, 2016 at 09:58:07PM +, Mattia Rizzolo wrote:
> On Fri, Sep 16, 2016 at 10:57:59PM +0200, Svante Signell wrote:
> > As fas as I understand it is OK to NMU this package, based on the
> > latest replies by Xavier. Unfortunately nobody from debian-ada has
> > stepped forward, and Xavier is too busy, maybe you can help out here.
> > I'm available whenever you need assistance.
>
> I'd happy to sponsor an NMU for you.
> Would you kindly provide me a single debdiff from the polyorb as
> currently in the archive to what you'd get?
Alright, I uploaded the attached debdiff, based on Svante's patches.
I'm not closing this bug, as the package is really unmaintainer, and I
have no clue whether it actually works after my NMU.
If anybody needs sponsorship to upload any possible fix/improvements,
please feel free to contact me.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for polyorb-2.11~20140418 polyorb-2.11~20140418
changelog | 10 ++
control |4 ++--
patches/add-missing-include.patch | 16
patches/hardening.patch |3 +--
patches/series|1 +
rules |7 +++
6 files changed, 33 insertions(+), 8 deletions(-)
diff -Nru polyorb-2.11~20140418/debian/changelog polyorb-2.11~20140418/debian/changelog
--- polyorb-2.11~20140418/debian/changelog 2014-09-26 13:00:26.0 +
+++ polyorb-2.11~20140418/debian/changelog 2016-09-19 14:20:50.0 +
@@ -1,3 +1,13 @@
+polyorb (2.11~20140418-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Svante Signell ]
+ * build with gnat-6. Closes: #831255.
+ * Add patch to fix compilation due to missing include.
+
+ -- Mattia Rizzolo Mon, 19 Sep 2016 14:20:50 +
+
polyorb (2.11~20140418-3) unstable; urgency=low
[Ludovic Brenta]
diff -Nru polyorb-2.11~20140418/debian/control polyorb-2.11~20140418/debian/control
--- polyorb-2.11~20140418/debian/control 2014-09-26 13:00:26.0 +
+++ polyorb-2.11~20140418/debian/control 2016-09-19 12:44:40.0 +
@@ -5,7 +5,7 @@
Uploaders: Ludovic Brenta
Build-Depends: debhelper (>= 8.9.7), dpkg-dev (>= 1.16.1),
dh-ada-library, python-gnatpython,
- automake, autotools-dev, libtool, gnat-4.9, python
+ automake, autotools-dev, libtool, gnat-6, python
Build-Depends-Indep: ghostscript, texlive-formats-extra,
texlive-generic-recommended, transfig, texinfo
Standards-Version: 3.9.5
@@ -29,7 +29,7 @@
Package: libpolyorb3-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libpolyorb4 (= ${binary:Version}), g++, gnat-4.9
+Depends: ${misc:Depends}, ${shlibs:Depends}, libpolyorb4 (= ${binary:Version}), g++, gnat-6
Breaks: libpolyorb2-dev
Replaces: libpolyorb2-dev
Recommends: polyorb-servers (= ${binary:Version})
diff -Nru polyorb-2.11~20140418/debian/patches/add-missing-include.patch polyorb-2.11~20140418/debian/patches/add-missing-include.patch
--- polyorb-2.11~20140418/debian/patches/add-missing-include.patch 1970-01-01 00:00:00.0 +
+++ polyorb-2.11~20140418/debian/patches/add-missing-include.patch 2016-09-19 12:49:52.0 +
@@ -0,0 +1,16 @@
+Author: Svante Signell
+Acked-By: Mattia Rizzolo
+Last-Update: 2016-09-02
+
+Index: polyorb-2.11~20140418/src/csupport.c
+===
+--- polyorb-2.11~20140418.orig/src/csupport.c
polyorb-2.11~20140418/src/csupport.c
+@@ -27,6 +27,7 @@
+ /* C support functions for PolyORB */
+
+ #include "config.h"
++#include
+
+ #ifdef HAVE_FCNTL_H
+ #include
diff -Nru polyorb-2.11~20140418/debian/patches/hardening.patch polyorb-2.11~20140418/debian/patches/hardening.patch
--- polyorb-2.11~20140418/debian/patches/hardening.patch 2014-09-26 13:00:26.0 +
+++ polyorb-2.11~20140418/debian/patches/hardening.patch 2016-09-19 13:00:42.0 +
@@ -2,11 +2,10 @@
===
--- a/Makefile.in
+++ b/Makefile.in
-@@ -1,5 +1,8 @@
+@@ -1,5 +1,7 @@
# Main PolyORB Makefile
+include /usr/share/dpkg/default.mk
-+include /usr/share/ada/debian_packaging.mk
+
.PHONY: default
default: all
diff -Nru polyorb-2.11~20140418/debian/patches/series polyorb-2.11~20140418/debian/patches/series
--- polyorb-2.11~20140418/debian/patches/series 2014-09-26 13:00:26.0 +
+++ polyorb-2.11~20140418/debian/patches/series 2016-09-19 12:49:16.0 +
@@ -43,3 +43,4 @@
xe_back-polyorb.adb.patch
support-tilde-in-pathname.patch