diff -u gnade-1.6.1/patches/series gnade-1.6.1/patches/series --- gnade-1.6.1/patches/series +++ gnade-1.6.1/patches/series @@ -1,0 +2 @@ +gnat-4.2_compatibility diff -u gnade-1.6.1/debian/changelog gnade-1.6.1/debian/changelog --- gnade-1.6.1/debian/changelog +++ gnade-1.6.1/debian/changelog @@ -1,3 +1,11 @@ +gnade (1.6.1-2ubuntu2.1) hardy-proposed; urgency=low + + * Rebuild gnade for the gnat-4.2 transition (LP: #268260). + * Replace gnat-4.1 dependencies with gnat. + * patches/gnat-4.2_compatibility: fix FTBFS with gnat-4.2. + + -- Luca Falavigna Sat, 11 Oct 2008 11:20:55 +0200 + gnade (1.6.1-2ubuntu2) hardy; urgency=low * Rebuild against libpq5 diff -u gnade-1.6.1/debian/control gnade-1.6.1/debian/control --- gnade-1.6.1/debian/control +++ gnade-1.6.1/debian/control @@ -36,7 +36,7 @@ Package: libgnadeodbc-dev Architecture: alpha amd64 hppa i386 ia64 kfreebsd-i386 powerpc sparc s390 Section: libdevel -Depends: gnat-4.1, unixodbc (>= 2.2.4-6), libgnadeodbc1.6 (= ${Source-Version}) +Depends: gnat, unixodbc (>= 2.2.4-6), libgnadeodbc1.6 (= ${Source-Version}) Recommends: gnade-doc (= ${Source-Version}) Suggests: libgnademysql-dev, libgnadepostgresql-dev, libgnadesqlite-dev Conflicts: gnade-dev @@ -84,7 +84,7 @@ Package: libgnademysql-dev Architecture: alpha amd64 hppa i386 ia64 kfreebsd-i386 powerpc sparc s390 -Depends: gnat-4.1, libgnadeodbc-dev (= ${Source-Version}), libgnademysql1.6 (= ${Source-Version}), libmysqlclient15-dev +Depends: gnat, libgnadeodbc-dev (= ${Source-Version}), libgnademysql1.6 (= ${Source-Version}), libmysqlclient15-dev Recommends: gnade-bin Section: libdevel Description: GNat Ada Database Environment - MySQL programming interface @@ -131,7 +131,7 @@ Package: libgnadepostgresql-dev Architecture: alpha amd64 hppa i386 ia64 kfreebsd-i386 powerpc sparc s390 -Depends: gnat-4.1, libgnadeodbc-dev (= ${Source-Version}), libgnadepostgresql1.6 (= ${Source-Version}), libpq-dev +Depends: gnat, libgnadeodbc-dev (= ${Source-Version}), libgnadepostgresql1.6 (= ${Source-Version}), libpq-dev Recommends: gnade-bin Section: libdevel Description: GNat Ada Database Environment - PostgreSQL programming interface @@ -179,7 +179,7 @@ Package: libgnadesqlite-dev Architecture: alpha amd64 hppa i386 ia64 kfreebsd-i386 powerpc sparc s390 -Depends: gnat-4.1, libgnadeodbc-dev (= ${Source-Version}), libgnadesqlite1.6 (= ${Source-Version}), libsqlite3-dev +Depends: gnat, libgnadeodbc-dev (= ${Source-Version}), libgnadesqlite1.6 (= ${Source-Version}), libsqlite3-dev Recommends: gnade-bin Section: libdevel Description: GNat Ada Database Environment - SQLite programming interface only in patch2: unchanged: --- gnade-1.6.1.orig/patches/gnat-4.2_compatibility +++ gnade-1.6.1/patches/gnat-4.2_compatibility @@ -0,0 +1,165 @@ +Index: gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_array.adb +=================================================================== +--- gnade-1.6.1.orig/dbi/odbc/gnu-db-sqlcli-dispatch-a_array.adb 2001-07-26 15:34:07.000000000 +0200 ++++ gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_array.adb 2008-10-11 11:07:44.830494644 +0200 +@@ -59,8 +59,8 @@ + + procedure Register (Index : in Attr.T) is + begin +- Get_Dispatch_Array (Index) := Get'Access; +- Set_Dispatch_Array (Index) := Set'Access; ++ Get_Dispatch_Array (Index) := Get'Unrestricted_Access; ++ Set_Dispatch_Array (Index) := Set'Unrestricted_Access; + end Register; + + end GNU.DB.SQLCLI.Dispatch.A_Array; +Index: gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_bitmap.adb +=================================================================== +--- gnade-1.6.1.orig/dbi/odbc/gnu-db-sqlcli-dispatch-a_bitmap.adb 2008-10-11 11:08:38.625561113 +0200 ++++ gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_bitmap.adb 2008-10-11 11:09:06.731161096 +0200 +@@ -59,8 +59,8 @@ + + procedure Register (Index : in Attr.T) is + begin +- Get_Dispatch_Array (Index) := Get'Access; +- Set_Dispatch_Array (Index) := Set'Access; ++ Get_Dispatch_Array (Index) := Get'Unrestricted_Access; ++ Set_Dispatch_Array (Index) := Set'Unrestricted_Access; + end Register; + + begin +Index: gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_boolean.adb +=================================================================== +--- gnade-1.6.1.orig/dbi/odbc/gnu-db-sqlcli-dispatch-a_boolean.adb 2008-10-11 11:08:38.889576996 +0200 ++++ gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_boolean.adb 2008-10-11 11:09:06.743160942 +0200 +@@ -59,8 +59,8 @@ + + procedure Register (Index : in Attr.T) is + begin +- Get_Dispatch_Array (Index) := Get'Access; +- Set_Dispatch_Array (Index) := Set'Access; ++ Get_Dispatch_Array (Index) := Get'Unrestricted_Access; ++ Set_Dispatch_Array (Index) := Set'Unrestricted_Access; + end Register; + + end GNU.DB.SQLCLI.Dispatch.A_Boolean; +Index: gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_boolean_string.adb +=================================================================== +--- gnade-1.6.1.orig/dbi/odbc/gnu-db-sqlcli-dispatch-a_boolean_string.adb 2008-10-11 11:08:39.161590822 +0200 ++++ gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_boolean_string.adb 2008-10-11 11:09:06.751163912 +0200 +@@ -59,8 +59,8 @@ + + procedure Register (Index : in Attr.T) is + begin +- Get_Dispatch_Array (Index) := Get'Access; +- Set_Dispatch_Array (Index) := Set'Access; ++ Get_Dispatch_Array (Index) := Get'Unrestricted_Access; ++ Set_Dispatch_Array (Index) := Set'Unrestricted_Access; + end Register; + + end GNU.DB.SQLCLI.Dispatch.A_Boolean_String; +Index: gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_context.adb +=================================================================== +--- gnade-1.6.1.orig/dbi/odbc/gnu-db-sqlcli-dispatch-a_context.adb 2008-10-11 11:08:39.429606933 +0200 ++++ gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_context.adb 2008-10-11 11:09:06.763162920 +0200 +@@ -59,8 +59,8 @@ + + procedure Register (Index : in Attr.T) is + begin +- Get_Dispatch_Array (Index) := Get'Access; +- Set_Dispatch_Array (Index) := Set'Access; ++ Get_Dispatch_Array (Index) := Get'Unrestricted_Access; ++ Set_Dispatch_Array (Index) := Set'Unrestricted_Access; + end Register; + + end GNU.DB.SQLCLI.Dispatch.A_Context; +Index: gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_enumerated.adb +=================================================================== +--- gnade-1.6.1.orig/dbi/odbc/gnu-db-sqlcli-dispatch-a_enumerated.adb 2008-10-11 11:08:39.705622662 +0200 ++++ gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_enumerated.adb 2008-10-11 11:09:06.771165052 +0200 +@@ -59,8 +59,8 @@ + + procedure Register (Index : in Attr.T) is + begin +- Get_Dispatch_Array (Index) := Get'Access; +- Set_Dispatch_Array (Index) := Set'Access; ++ Get_Dispatch_Array (Index) := Get'Unrestricted_Access; ++ Set_Dispatch_Array (Index) := Set'Unrestricted_Access; + end Register; + + begin +Index: gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_integer.adb +=================================================================== +--- gnade-1.6.1.orig/dbi/odbc/gnu-db-sqlcli-dispatch-a_integer.adb 2008-10-11 11:08:39.973640450 +0200 ++++ gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_integer.adb 2008-10-11 11:09:06.783163221 +0200 +@@ -59,8 +59,8 @@ + + procedure Register (Index : in Attr.T) is + begin +- Get_Dispatch_Array (Index) := Get'Access; +- Set_Dispatch_Array (Index) := Set'Access; ++ Get_Dispatch_Array (Index) := Get'Unrestricted_Access; ++ Set_Dispatch_Array (Index) := Set'Unrestricted_Access; + end Register; + + end GNU.DB.SQLCLI.Dispatch.A_Integer; +Index: gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_pointer.adb +=================================================================== +--- gnade-1.6.1.orig/dbi/odbc/gnu-db-sqlcli-dispatch-a_pointer.adb 2008-10-11 11:08:40.261653511 +0200 ++++ gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_pointer.adb 2008-10-11 11:09:06.795163067 +0200 +@@ -59,8 +59,8 @@ + + procedure Register (Index : in Attr.T) is + begin +- Get_Dispatch_Array (Index) := Get'Access; +- Set_Dispatch_Array (Index) := Set'Access; ++ Get_Dispatch_Array (Index) := Get'Unrestricted_Access; ++ Set_Dispatch_Array (Index) := Set'Unrestricted_Access; + end Register; + + end GNU.DB.SQLCLI.Dispatch.A_Pointer; +Index: gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_string.adb +=================================================================== +--- gnade-1.6.1.orig/dbi/odbc/gnu-db-sqlcli-dispatch-a_string.adb 2008-10-11 11:08:40.537670079 +0200 ++++ gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_string.adb 2008-10-11 11:09:06.803166876 +0200 +@@ -59,8 +59,8 @@ + + procedure Register (Index : in Attr.T) is + begin +- Get_Dispatch_Array (Index) := Get'Access; +- Set_Dispatch_Array (Index) := Set'Access; ++ Get_Dispatch_Array (Index) := Get'Unrestricted_Access; ++ Set_Dispatch_Array (Index) := Set'Unrestricted_Access; + end Register; + + end GNU.DB.SQLCLI.Dispatch.A_String; +Index: gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_unsigned.adb +=================================================================== +--- gnade-1.6.1.orig/dbi/odbc/gnu-db-sqlcli-dispatch-a_unsigned.adb 2008-10-11 11:08:40.809685579 +0200 ++++ gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_unsigned.adb 2008-10-11 11:09:06.815165883 +0200 +@@ -59,8 +59,8 @@ + + procedure Register (Index : in Attr.T) is + begin +- Get_Dispatch_Array (Index) := Get'Access; +- Set_Dispatch_Array (Index) := Set'Access; ++ Get_Dispatch_Array (Index) := Get'Unrestricted_Access; ++ Set_Dispatch_Array (Index) := Set'Unrestricted_Access; + end Register; + + end GNU.DB.SQLCLI.Dispatch.A_Unsigned; +Index: gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_wide_string.adb +=================================================================== +--- gnade-1.6.1.orig/dbi/odbc/gnu-db-sqlcli-dispatch-a_wide_string.adb 2008-10-11 11:08:41.093700927 +0200 ++++ gnade-1.6.1/dbi/odbc/gnu-db-sqlcli-dispatch-a_wide_string.adb 2008-10-11 11:09:06.823169692 +0200 +@@ -59,8 +59,8 @@ + + procedure Register (Index : in Attr.T) is + begin +- Get_Dispatch_Array (Index) := Get'Access; +- Set_Dispatch_Array (Index) := Set'Access; ++ Get_Dispatch_Array (Index) := Get'Unrestricted_Access; ++ Set_Dispatch_Array (Index) := Set'Unrestricted_Access; + end Register; + + end GNU.DB.SQLCLI.Dispatch.A_Wide_String;