diff -Nru gnat-4.8-4.8.2/debian/changelog gnat-4.8-4.8.2/debian/changelog --- gnat-4.8-4.8.2/debian/changelog 2013-11-01 19:44:37.000000000 +0000 +++ gnat-4.8-4.8.2/debian/changelog 2013-11-16 01:06:58.000000000 +0000 @@ -1,3 +1,11 @@ +gnat-4.8 (4.8.2-4+rpi1) jessie-staging; urgency=low + + * Set defaults for raspbian (ARMv6+VFP) + * Disable testsuite + * Don't apply Ubuntu specific packages on unknown derivatives. + + -- Peter Michael Green Sat, 16 Nov 2013 01:06:20 +0000 + gnat-4.8 (4.8.2-4) unstable; urgency=low * Regenerate debian/control. diff -Nru gnat-4.8-4.8.2/debian/control gnat-4.8-4.8.2/debian/control --- gnat-4.8-4.8.2/debian/control 2013-11-01 15:30:46.000000000 +0000 +++ gnat-4.8-4.8.2/debian/control 2013-11-16 01:10:45.000000000 +0000 @@ -5,7 +5,7 @@ Uploaders: Ludovic Brenta Standards-Version: 3.9.4 Build-Depends: debhelper (>= 5.0.62), g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel mipsn32 mipsn32el powerpc ppc64 s390 s390x sparc sparc64 x32], - 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 (>= 2.13-31) [armel armhf], libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-sparc [sparc64], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 mipsn32 mipsn32el mips64 mips64el s390x sparc64 x32], libn32gcc1 [mips mipsel mips64 mips64el], lib64gcc1 [i386 mips mipsel mipsn32 mipsn32el powerpc sparc s390 x32], libc6-dev-mips64 [mips mipsel mipsn32 mipsn32el], libc6-dev-mipsn32 [mips mipsel mips64 mips64el], libc6-dev-mips32 [mipsn32 mipsn32el mips64 mips64el], libc6-dev-x32 [amd64 i386], libx32gcc1 [amd64 i386], libc6.1-dbg [alpha ia64] | libc0.3-dbg [hurd-i386] | libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64] | libc6-dbg, + 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 (>= 2.13-31) [armel armhf], libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-sparc [sparc64], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 mipsn32 mipsn32el mips64 mips64el s390x sparc64 x32], libn32gcc1 [mips mipsel mips64 mips64el], lib64gcc1 [i386 mips mipsel mipsn32 mipsn32el powerpc sparc s390 x32], libc6-dev-mips64 [mips mipsel mipsn32 mipsn32el], libc6-dev-mipsn32 [mips mipsel mips64 mips64el], libc6-dev-mips32 [mipsn32 mipsn32el mips64 mips64el], libc6.1-dbg [alpha ia64] | libc0.3-dbg [hurd-i386] | libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64] | libc6-dbg, kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], m4, libtool, autoconf2.64, libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], diff -Nru gnat-4.8-4.8.2/debian/rules2 gnat-4.8-4.8.2/debian/rules2 --- gnat-4.8-4.8.2/debian/rules2 2013-10-23 20:50:10.000000000 +0000 +++ gnat-4.8-4.8.2/debian/rules2 2013-11-16 01:06:58.000000000 +0000 @@ -403,9 +403,9 @@ ifneq (,$(findstring gcj,$(PKGSOURCE))) with_arm_arch = armv6 else - with_arm_arch = armv7-a + with_arm_arch = armv6 endif - with_arm_fpu = vfpv3-d16 + with_arm_fpu = vfp else # armel ifeq ($(distribution),Debian) @@ -417,9 +417,9 @@ ifneq (,$(findstring gcj,$(PKGSOURCE))) with_arm_arch = armv6 else - with_arm_arch = armv7-a + with_arm_arch = armv6 endif - with_arm_fpu = vfpv3-d16 + with_arm_fpu = vfp else with_arm_arch = armv5t # starting with quantal endif @@ -430,7 +430,7 @@ endif CONFARGS += --with-float=$(float_abi) ifeq ($(with_arm_thumb),yes) - CONFARGS += --with-mode=thumb + # CONFARGS += --with-mode=thumb endif endif diff -Nru gnat-4.8-4.8.2/debian/rules.defs gnat-4.8-4.8.2/debian/rules.defs --- gnat-4.8-4.8.2/debian/rules.defs 2013-10-23 20:50:10.000000000 +0000 +++ gnat-4.8-4.8.2/debian/rules.defs 2013-11-16 01:06:58.000000000 +0000 @@ -940,7 +940,7 @@ with_ssp := $(call envfilt, ssp, , , $(with_ssp)) ifeq ($(with_ssp),yes) - ifneq ($(distribution),Debian) + ifeq ($(distribution),Ubuntu) ifneq (,$(findstring gcc-4, $(PKGSOURCE))) with_ssp_default := yes endif @@ -1165,7 +1165,7 @@ # run testsuite --------------- with_check := yes # if you don't want to run the gcc testsuite, uncomment the next line -#with_check := disabled by hand +with_check := disabled by plugwash ifeq ($(with_base_only),yes) with_check := no endif diff -Nru gnat-4.8-4.8.2/debian/rules.parameters gnat-4.8-4.8.2/debian/rules.parameters --- gnat-4.8-4.8.2/debian/rules.parameters 2013-11-01 15:30:46.000000000 +0000 +++ gnat-4.8-4.8.2/debian/rules.parameters 2013-11-16 01:10:45.000000000 +0000 @@ -2,14 +2,14 @@ GCC_VERSION := 4.8.2 NEXT_GCC_VERSION := 4.8.3 BASE_VERSION := 4.8 -SOURCE_VERSION := 4.8.2-3 -DEB_VERSION := 4.8.2-3 -DEB_EVERSION := 1:4.8.2-3 +SOURCE_VERSION := 4.8.2-4+rpi1 +DEB_VERSION := 4.8.2-4+rpi1 +DEB_EVERSION := 1:4.8.2-4+rpi1 DEB_GDC_VERSION := DEB_SOVERSION := 4.8 DEB_SOEVERSION := 1:4.8 DEB_LIBGCC_SOVERSION := -DEB_LIBGCC_VERSION := 1:4.8.2-3 +DEB_LIBGCC_VERSION := 1:4.8.2-4+rpi1 DEB_STDCXX_SOVERSION := 4.8 DEB_GCJ_SOVERSION := 4.8 PKG_GCJ_EXT := 14 diff -Nru gnat-4.8-4.8.2/debian/rules.patch gnat-4.8-4.8.2/debian/rules.patch --- gnat-4.8-4.8.2/debian/rules.patch 2013-10-29 20:06:25.000000000 +0000 +++ gnat-4.8-4.8.2/debian/rules.patch 2013-11-16 01:06:58.000000000 +0000 @@ -99,7 +99,7 @@ ifeq ($(with_ssp)-$(with_ssp_default),yes-yes) hardening_patches += gcc-default-ssp endif -ifneq ($(distribution),Debian) +ifeq ($(distribution),Ubuntu) ifneq (,$(findstring gcc-4, $(PKGSOURCE))) hardening_patches += \ gcc-default-format-security \ @@ -339,6 +339,7 @@ # files (AUTO ) and run them separately, # maybe only once per directory). $(patch_stamp): $(unpack_stamp) $(series_stamp) + echo GFDL_INVARIANT_FREE $(GFDL_INVARIANT_FREE) QUILT_PATCHES=$(patchdir) \ quilt --quiltrc /dev/null push -a || test $$? = 2