diff -Nru dh-ada-library-5.7/debian/changelog dh-ada-library-5.9/debian/changelog --- dh-ada-library-5.7/debian/changelog 2014-01-20 23:58:37.000000000 +0000 +++ dh-ada-library-5.9/debian/changelog 2014-03-01 13:13:48.000000000 +0000 @@ -1,3 +1,16 @@ +dh-ada-library (5.9) unstable; urgency=medium + + * Accept relocatable library type, alias for dynamic used by xmlada4.4. + + -- Nicolas Boulenguez Sat, 01 Mar 2014 14:13:12 +0100 + +dh-ada-library (5.8) unstable; urgency=medium + + * Depends: append 4.9 to allowed gnat versions. + * dh_ada_library.adb: allow snapshot versions when calling gnatmake. + + -- Nicolas Boulenguez Tue, 18 Feb 2014 20:03:35 +0100 + dh-ada-library (5.7) unstable; urgency=medium * default_cgpr: handle separates with 4.8. Should close #735824. diff -Nru dh-ada-library-5.7/debian/control dh-ada-library-5.9/debian/control --- dh-ada-library-5.7/debian/control 2014-01-19 15:22:20.000000000 +0000 +++ dh-ada-library-5.9/debian/control 2014-03-01 05:43:48.000000000 +0000 @@ -13,9 +13,13 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, ${perl:Depends}, debhelper, - gnat-4.8 | gnat-4.6 | gnat-4.4, dpkg-dev, binutils -# Executable calls gnatmake, dpkg-architecture, readelf. -# Recommends: debian-ada-policy + gnat-4.9 | gnat-4.8 | gnat-4.6 | gnat-4.4, +# Calls gnatmake. + dpkg-dev, +# Calls dpkg-architecture. + binutils +# Calls readelf. +# Recommends: debian-ada-policy (not a .deb yet) Description: Debian helper for Ada libraries Debhelper tools to ease common tasks in packaging libraries written in the Ada programming language, following the Debian Policy for Ada diff -Nru dh-ada-library-5.7/debian/copyright dh-ada-library-5.9/debian/copyright --- dh-ada-library-5.7/debian/copyright 2014-01-19 15:22:21.000000000 +0000 +++ dh-ada-library-5.9/debian/copyright 2014-03-01 05:43:48.000000000 +0000 @@ -2,6 +2,6 @@ Upstream-Name: dh-ada-library Files: * -Copyright: 2012-2013 Nicolas Boulenguez +Copyright: 2012-2014 Nicolas Boulenguez License: GPL-3+ GNU GPL v3 or later; see /usr/share/common-licenses/GPL-3. diff -Nru dh-ada-library-5.7/debian/rules dh-ada-library-5.9/debian/rules --- dh-ada-library-5.7/debian/rules 2014-01-20 23:34:43.000000000 +0000 +++ dh-ada-library-5.9/debian/rules 2014-03-01 05:55:32.000000000 +0000 @@ -19,7 +19,8 @@ include debian_packaging.mk ifdef ALL_CHECKS - ADAFLAGS += -Wall -Wextra -g -gnataEfoqQ -gnatVa -gnatw.e \ +# .Y is supposed to be the default on gnat-4.9, so may disappear one day. + ADAFLAGS += -Wall -Wextra -g -gnataEfoqQ -gnatVa -gnatw.e.Y \ -gnatySdouxy BUILDER_OPTIONS += -s -we endif diff -Nru dh-ada-library-5.7/debian/TODO dh-ada-library-5.9/debian/TODO --- dh-ada-library-5.7/debian/TODO 2014-01-19 15:22:20.000000000 +0000 +++ dh-ada-library-5.9/debian/TODO 2014-03-01 13:12:36.000000000 +0000 @@ -1,13 +1,17 @@ -If build_foo.gpr withes build_bar.gpr, -then foo.gpr is installed into libfooALIFOO-dev, - bar.gpr is installed into libbarALIBAR-dev, - foo.gpr withes bar.grp - libfooALIFOO-dev receives ada:Depends libbarALIBAR-dev = ${binary:Version} -Could the binary version restriction not be dropped? - --- Changes affecting dependencies (new major number) +More simple and consistant handling of library options: + The \fILinker\fR package of the new project + inherits any +-.B \-l +-or +-.B \-L +-linker options from \fILeading_Library_Options\fR +-and \fILibrary_Options\fR attributes of the build project file. ++Linker package of the build project file. +The documentation should also recall the difference between the three +fields. + TODO.change_input_format.diff "-dev Depends: gnat" and "-dbg Suggests: gnat". diff -Nru dh-ada-library-5.7/src/dh_ada_library.adb dh-ada-library-5.9/src/dh_ada_library.adb --- dh-ada-library-5.7/src/dh_ada_library.adb 2014-01-20 21:32:12.000000000 +0000 +++ dh-ada-library-5.9/src/dh_ada_library.adb 2014-03-01 06:11:08.000000000 +0000 @@ -342,9 +342,9 @@ declare procedure Process (Imported_Full_File_Name : in String; - Imported_Library_Name : in String); + Imported_Library_Name : in String); procedure Process (Imported_Full_File_Name : in String; - Imported_Library_Name : in String) is + Imported_Library_Name : in String) is begin if Imported_Library_Name = "" then Dh_Lib.Warning ("Imported project " & Imported_Full_File_Name @@ -859,13 +859,18 @@ Open (File, In_File, Temp_File.all); declare First_Line : constant String := Get_Line (File); - pragma Assert (First_Line (1 .. 9) = "GNATMAKE "); + pragma Assert (10 <= First_Line'Last + and then First_Line (1 .. 9) = "GNATMAKE "); + I : Positive := 10; begin Close (File); Ada.Directories.Delete_File (Temp_File.all); Free (Temp_File); + while I < First_Line'Last and then First_Line (I + 1) /= ' ' loop + I := I + 1; + end loop; Ada.Strings.Unbounded.Set_Unbounded_String - (Gnat_Version, First_Line (10 .. First_Line'Last)); + (Gnat_Version, First_Line (10 .. I)); end; exception when others => diff -Nru dh-ada-library-5.7/src/projects.adb dh-ada-library-5.9/src/projects.adb --- dh-ada-library-5.7/src/projects.adb 2014-01-21 00:04:04.000000000 +0000 +++ dh-ada-library-5.9/src/projects.adb 2014-03-01 05:47:57.000000000 +0000 @@ -71,7 +71,12 @@ return Boolean is begin - return Project.Project_Id.all.Library_Kind = Prj.Dynamic; + case Project.Project_Id.all.Library_Kind is + when Prj.Dynamic | Prj.Relocatable => + return True; + when Prj.Static => + return False; + end case; end Dynamic; function Is_Library