diff -Nru gnat-4.6-4.6.4/debian/changelog gnat-4.6-4.6.4/debian/changelog --- gnat-4.6-4.6.4/debian/changelog 2014-04-12 12:50:38.000000000 +0000 +++ gnat-4.6-4.6.4/debian/changelog 2014-04-25 22:47:00.000000000 +0000 @@ -1,3 +1,18 @@ +gnat-4.6 (4.6.4-4+rpi2) jessie-staging; urgency=medium + + * Break/Replace 4.6.4-2+rpi1 for the same reason that version + 4.6.4-3 introduced a breaks/replaces on 4.6.4-2 + + -- Peter Michael Green Fri, 25 Apr 2014 22:45:49 +0000 + +gnat-4.6 (4.6.4-4+rpi1) jessie-staging; urgency=low + + [Mike Thompson ] + * Modified to build for Raspberry Pi + * Disabled thumb code option which is not supported on Raspberry Pi + + -- Peter Michael Green Sat, 19 Apr 2014 22:21:06 +0000 + gnat-4.6 (4.6.4-4) unstable; urgency=medium * Revert g4.6-base to Architecture: all. Closes: #743833. diff -Nru gnat-4.6-4.6.4/debian/control gnat-4.6-4.6.4/debian/control --- gnat-4.6-4.6.4/debian/control 2014-04-12 12:50:38.000000000 +0000 +++ gnat-4.6-4.6.4/debian/control 2014-04-25 22:45:40.000000000 +0000 @@ -6,7 +6,7 @@ Nicolas Boulenguez Standards-Version: 3.9.5 Build-Depends: dpkg-dev (>= 1.16.0~ubuntu4), debhelper (>= 5.0.62), g++-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc], - libc6.1-dev (>= 2.13-5) [alpha ia64] | libc0.3-dev (>= 2.13-5) [hurd-i386] | libc0.1-dev (>= 2.13-5) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-5), libc6-dev-amd64 [i386], libc6-dev-sparc64 [sparc], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 s390x], lib64gcc1 [i386 powerpc sparc s390], libc6-dev-mips64 [mips mipsel], libc6-dev-mipsn32 [mips mipsel], + libc6.1-dev (>= 2.13-0ubuntu6) [alpha ia64] | libc0.3-dev (>= 2.13-0ubuntu6) [hurd-i386] | libc0.1-dev (>= 2.13-0ubuntu6) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-0ubuntu6), libc6-dev-amd64 [i386], libc6-dev-sparc64 [sparc], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 s390x], lib64gcc1 [i386 powerpc sparc s390], libc6-dev-mips64 [mips mipsel], libc6-dev-mipsn32 [mips mipsel], m4, libtool, autoconf2.64, libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], zlib1g-dev, gawk, lzma, xz-utils, patchutils, @@ -39,9 +39,9 @@ Pre-Depends: multiarch-support Depends: gnat-4.6-base (= ${gnat:Version}), gcc-4.6 (>= ${gcc:SoftVersion}), ${dep:libgnat}, ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends} Suggests: gnat-4.6-doc, ada-reference-manual-2012, gnat-4.6-sjlj -Replaces: gnat (<< 4.6.1), dh-ada-library (<< 6.0), gnat-4.6-base (= 4.6.4-2), +Replaces: gnat (<< 4.6.1), dh-ada-library (<< 6.0), gnat-4.6-base (= 4.6.4-2), gnat-4.6-base (= 4.6.4-2+rpi1), gnat-4.9-base (= 4.9-20140330-1) -Breaks: gnat (<< 4.6.1), dh-ada-library (<< 6.0), gnat-4.6-base (= 4.6.4-2), +Breaks: gnat (<< 4.6.1), dh-ada-library (<< 6.0), gnat-4.6-base (= 4.6.4-2), gnat-4.6-base (= 4.6.4-2+rpi1), gnat-4.9-base (= 4.9-20140330-1) # Takes over symlink from gnat (<< 4.6.1): /usr/bin/gnatgcc. # Takes over file from dh-ada-library (<< 6.0): debian_packaging.mk. diff -Nru gnat-4.6-4.6.4/debian/control.m4 gnat-4.6-4.6.4/debian/control.m4 --- gnat-4.6-4.6.4/debian/control.m4 2014-04-12 12:50:38.000000000 +0000 +++ gnat-4.6-4.6.4/debian/control.m4 2014-04-25 22:45:31.000000000 +0000 @@ -2169,9 +2169,9 @@ ')`'dnl Depends: gnat`'PV-base (= ${gnat:Version}), gcc`'PV (>= ${gcc:SoftVersion}), ${dep:libgnat}, ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends} Suggests: gnat`'PV-doc, ada-reference-manual-2012, gnat`'-GNAT_V-sjlj -Replaces: gnat (<< 4.6.1), dh-ada-library (<< 6.0), gnat-4.6-base (= 4.6.4-2), +Replaces: gnat (<< 4.6.1), dh-ada-library (<< 6.0), gnat-4.6-base (= 4.6.4-2), gnat-4.6-base (= 4.6.4-2+rpi1), gnat-4.9-base (= 4.9-20140330-1) -Breaks: gnat (<< 4.6.1), dh-ada-library (<< 6.0), gnat-4.6-base (= 4.6.4-2), +Breaks: gnat (<< 4.6.1), dh-ada-library (<< 6.0), gnat-4.6-base (= 4.6.4-2), gnat-4.6-base (= 4.6.4-2+rpi1), gnat-4.9-base (= 4.9-20140330-1) # Takes over symlink from gnat (<< 4.6.1): /usr/bin/gnatgcc. # Takes over file from dh-ada-library (<< 6.0): debian_packaging.mk. diff -Nru gnat-4.6-4.6.4/debian/rules2 gnat-4.6-4.6.4/debian/rules2 --- gnat-4.6-4.6.4/debian/rules2 2014-04-12 12:50:39.000000000 +0000 +++ gnat-4.6-4.6.4/debian/rules2 2014-04-19 22:21:29.000000000 +0000 @@ -354,9 +354,11 @@ ifneq (,$(findstring gcj,$(PKGSOURCE))) with_arm_arch = armv6 else - with_arm_arch = armv7-a + # RPI with_arm_arch = armv7-a + with_arm_arch = armv6 endif - with_arm_fpu = vfpv3-d16 + # RPI with_arm_fpu = vfpv3-d16 + with_arm_fpu = vfp else # armel ifeq ($(distribution),Debian) @@ -368,9 +370,11 @@ ifneq (,$(findstring gcj,$(PKGSOURCE))) with_arm_arch = armv6 else - with_arm_arch = armv7-a + # RPI with_arm_arch = armv7-a + with_arm_arch = armv6 endif - with_arm_fpu = vfpv3-d16 + # RPI with_arm_fpu = vfpv3-d16 + with_arm_fpu = vfp else with_arm_arch = armv5t # starting with quantal endif @@ -381,7 +385,7 @@ endif CONFARGS += --with-float=$(float_abi) ifeq ($(with_arm_thumb),yes) - CONFARGS += --with-mode=thumb + # RPI CONFARGS += --with-mode=thumb endif endif @@ -603,7 +607,7 @@ ifeq ($(with_arm_thumb),yes) #DEJAGNU_RUNS += -marm else - DEJAGNU_RUNS += -mthumb + # RPI DEJAGNU_RUNS += -mthumb endif endif endif diff -Nru gnat-4.6-4.6.4/debian/rules.parameters gnat-4.6-4.6.4/debian/rules.parameters --- gnat-4.6-4.6.4/debian/rules.parameters 1970-01-01 00:00:00.000000000 +0000 +++ gnat-4.6-4.6.4/debian/rules.parameters 2014-04-19 23:03:53.000000000 +0000 @@ -0,0 +1,34 @@ +# configuration parameters taken from upstream source files +GCC_VERSION := 4.6.4 +NEXT_GCC_VERSION := 4.6.5 +BASE_VERSION := 4.6 +SOURCE_VERSION := 4.6.4-4+rpi1 +DEB_VERSION := 4.6.4-4+rpi1 +DEB_EVERSION := 1:4.6.4-4+rpi1 +GDC_BASE_VERSION := +DEB_GDC_VERSION := +DEB_SOVERSION := 4.6 +DEB_SOEVERSION := 1:4.6 +DEB_LIBGCC_SOVERSION := 1:4.6 +DEB_LIBGCC_VERSION := 1:4.6.4-4+rpi1 +DEB_STDCXX_SOVERSION := 4.6 +DEB_GCJ_SOVERSION := 4.6 +PKG_GCJ_EXT := 12 +PKG_LIBGCJ_EXT := 12 +DEB_GOMP_SOVERSION := 4.6 +DEB_GCCMATH_SOVERSION := 4.6 +GCC_SONAME := 1 +CXX_SONAME := 6 +FORTRAN_SONAME := 3 +OBJC_SONAME := 3 +GCJ_SONAME := 12 +GNAT_VERSION := 4.6 +GNAT_SONAME := 4.6 +FFI_SONAME := 4 +MUDFLAP_SONAME := 0 +SSP_SONAME := 0 +GOMP_SONAME := 1 +QMATH_SONAME := +GCCMATH_SONAME := +GO_SONAME := 0 +LIBC_DEP := libc6