Control: tags 830383 + patch
Control: tags 830383 + pending
Dear maintainer,
I've prepared an NMU for adasockets (versioned as 1.9-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru adasockets-1.9/configure.ac adasockets-1.9/configure.ac
--- adasockets-1.9/configure.ac 2016-07-11 18:09:00.000000000 +0200
+++ adasockets-1.9/configure.ac 2016-07-11 18:09:01.000000000 +0200
@@ -7,7 +7,7 @@
#
# Package description
#
-LIBVERSIONINFO=5:0:0
+LIBVERSIONINFO=6:0:0
AC_SUBST(LIBVERSIONINFO)
AM_PROG_LIBTOOL
#
diff -Nru adasockets-1.9/debian/adasockets.gpr adasockets-1.9/debian/adasockets.gpr
--- adasockets-1.9/debian/adasockets.gpr 2016-07-11 18:09:00.000000000 +0200
+++ adasockets-1.9/debian/adasockets.gpr 2016-07-11 18:09:01.000000000 +0200
@@ -1,5 +1,5 @@
project Adasockets is
- Version := "5";
+ Version := "6";
for Library_Dir use "/usr/lib";
for Library_Name use "adasockets";
for Library_Kind use "relocatable";
diff -Nru adasockets-1.9/debian/changelog adasockets-1.9/debian/changelog
--- adasockets-1.9/debian/changelog 2016-07-11 18:09:00.000000000 +0200
+++ adasockets-1.9/debian/changelog 2016-07-11 18:09:01.000000000 +0200
@@ -1,3 +1,12 @@
+adasockets (1.9-1.1) unstable; urgency=medium
+
+ * Non maintainer upload.
+ * Rebuild with gnat-6, bump ALI and SO versions. Closes: #830383.
+ Conflict with previous -dev can be implicit via gnat-X per Ada policy.
+ When possible, copy versions automatically to ease next update.
+
+ -- Nicolas Boulenguez <[email protected]> Mon, 11 Jul 2016 16:07:44 +0200
+
adasockets (1.9-1) unstable; urgency=medium
* New upstream release (closes: #756864).
diff -Nru adasockets-1.9/debian/control adasockets-1.9/debian/control
--- adasockets-1.9/debian/control 2016-07-11 18:09:00.000000000 +0200
+++ adasockets-1.9/debian/control 2016-07-11 18:09:01.000000000 +0200
@@ -3,14 +3,12 @@
Section: devel
Priority: extra
Standards-Version: 3.9.6
-Build-Depends: gnat, gnat-4.9, debhelper (>= 6.0.0), texinfo, texlive, dh-autoreconf
+Build-Depends: gnat, gnat-6, debhelper (>= 6.0.0), texinfo, texlive, dh-autoreconf
-Package: libadasockets5-dev
+Package: libadasockets6-dev
Architecture: any
-Depends: gnat, gnat-4.9, libadasockets5 (=${binary:Version}), ${misc:Depends}, dpkg (>= 1.15.4) | install-info
+Depends: gnat, gnat-6, libadasockets6 (=${binary:Version}), ${misc:Depends}, dpkg (>= 1.15.4) | install-info
Section: libdevel
-Conflicts: adasockets, libadasockets0-dev, libadasockets-dev, libadasockets2-dev, libadasockets3-dev, libadasockets4-dev
-Replaces: adasockets, libadasockets0-dev, libadasockets-dev, libadasockets2-dev, libadasockets3-dev, libadasockets4-dev
Description: bindings for socket services in Ada
This package provides a binding for socket services to be used with GNAT
(the GNU Ada compiler). One can use it to write clients and servers that
@@ -19,7 +17,7 @@
This package provides the Ada programmer with headers and libraries used
to build Ada programs that use sockets services.
-Package: libadasockets5
+Package: libadasockets6
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Section: libs
diff -Nru adasockets-1.9/debian/libadasockets5-dev.dirs adasockets-1.9/debian/libadasockets5-dev.dirs
--- adasockets-1.9/debian/libadasockets5-dev.dirs 2016-07-11 18:09:00.000000000 +0200
+++ adasockets-1.9/debian/libadasockets5-dev.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/share/ada/adainclude/adasockets
-usr/lib/ada/adalib/adasockets
diff -Nru adasockets-1.9/debian/libadasockets5-dev.links adasockets-1.9/debian/libadasockets5-dev.links
--- adasockets-1.9/debian/libadasockets5-dev.links 2016-07-11 18:09:00.000000000 +0200
+++ adasockets-1.9/debian/libadasockets5-dev.links 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/share/doc/libadasockets5 usr/share/doc/libadasockets5-dev
diff -Nru adasockets-1.9/debian/libadasockets5.files adasockets-1.9/debian/libadasockets5.files
--- adasockets-1.9/debian/libadasockets5.files 2016-07-11 18:09:00.000000000 +0200
+++ adasockets-1.9/debian/libadasockets5.files 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/libadasockets.so.*
diff -Nru adasockets-1.9/debian/libadasockets5.lintian-overrides adasockets-1.9/debian/libadasockets5.lintian-overrides
--- adasockets-1.9/debian/libadasockets5.lintian-overrides 2016-07-11 18:09:00.000000000 +0200
+++ adasockets-1.9/debian/libadasockets5.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-libadasockets5: hardening-no-relro usr/lib/libadasockets.so.5.0.0
diff -Nru adasockets-1.9/debian/libadasockets6.lintian-overrides adasockets-1.9/debian/libadasockets6.lintian-overrides
--- adasockets-1.9/debian/libadasockets6.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ adasockets-1.9/debian/libadasockets6.lintian-overrides 2016-07-11 18:09:01.000000000 +0200
@@ -0,0 +1 @@
+hardening-no-relro usr/lib/libadasockets.so.*
diff -Nru adasockets-1.9/debian/rules adasockets-1.9/debian/rules
--- adasockets-1.9/debian/rules 2016-07-11 18:09:00.000000000 +0200
+++ adasockets-1.9/debian/rules 2016-07-11 18:09:01.000000000 +0200
@@ -5,7 +5,10 @@
# This has to be exported to make some magic below work.
export DH_OPTIONS
-ALIVERSION=5
+ALIVERSION=6
+SOVERSION=6
+DEV_PKG=libadasockets$(ALIVERSION)-dev
+LIB_PKG=libadasockets$(SOVERSION)
configure: configure-stamp
configure-stamp:
@@ -43,13 +46,14 @@
dh_testroot
dh_prep
dh_installdirs
+ dh_installdirs -p$(DEV_PKG) usr/share/ada/adainclude/adasockets usr/lib/ada/adalib/adasockets
$(MAKE) DESTDIR=`pwd`/debian/libadasockets$(ALIVERSION)-dev install
dh_installdocs -plibadasockets$(ALIVERSION) README
rm -rf debian/libadasockets$(ALIVERSION)-dev/usr/man
dh_installman -plibadasockets$(ALIVERSION)-dev man/adasockets-config.1
dh_installexamples -plibadasockets$(ALIVERSION)-dev examples/*.adb debian/Makefile debian/examples.gpr
dh_installchangelogs -plibadasockets$(ALIVERSION) NEWS
- dh_movefiles --sourcedir=debian/libadasockets$(ALIVERSION)-dev
+ dh_movefiles --sourcedir=debian/libadasockets$(ALIVERSION)-dev -p$(LIB_PKG) usr/lib/libadasockets.so.*
mv debian/libadasockets$(ALIVERSION)-dev/usr/share/doc/libadasockets$(ALIVERSION)-dev \
debian/libadasockets$(ALIVERSION)-dev/usr/share/doc/libadasockets$(ALIVERSION)
# Debian Ada policy directories.
@@ -90,6 +94,7 @@
# dh_installchangelogs
dh_strip
dh_link
+ dh_link -p$(DEV_PKG) usr/share/doc/$(LIB_PKG) usr/share/doc/$(DEV_PKG)
dh_compress -X.adb -X.ads
dh_fixperms
dh_makeshlibs
