ViewMTN: Diff from [5b8292c4..] to [266fd03a..]

ViewMTN : Branches | Tags | Help | About
Revision [5b8292c4..]: Info | Browse Files | Download (tar)
The unified diff between revisions [5b8292c4..] and [266fd03a..] is displayed below. It can also be downloaded as a raw diff.
#
#
# patch "debian/README.Debian"
#  from [151969c449dd5e2b58a8f4c731a3b3b1f519a1f1]
#    to [f5e7d2d4b58b4e878c239f89127f419cb2ca08e3]
#
# patch "debian/changelog"
#  from [bf8777ce16f2f67895c53a3ac651dd57155e2fcb]
#    to [4252cf649ea2ae6fbd8c549b240d28b3b7b67434]
#
# patch "debian/control"
#  from [ba6daabac64a748924efce32f9a068894456caed]
#    to [5c3b826bd5ab1025dfdbfba81cf18eb35dcb6ea0]
#
# patch "debian/rules"
#  from [b653bc14916454e4c67f4b9a63e9e522e896115a]
#    to [b348a8630819824e44c1c0f2361d5d2deade9411]
#
============================================================
--- debian/README.Debian	151969c449dd5e2b58a8f4c731a3b3b1f519a1f1
+++ debian/README.Debian	f5e7d2d4b58b4e878c239f89127f419cb2ca08e3
@@ -48,14 +48,14 @@ The default compiler versions for Debian
 The default compiler versions for Debian GNU/Linux on i386 are
 (minor version numbers omitted):

-	cpp		: cpp-4.3
-	gcc		: gcc-4.3
-	g++		: g++-4.3
-	gfortran	: gfortran-4.3
-	gcj		: gcj-4.3
-	gij		: gij-4.3
-	gobjc		: gobjc-4.3
-	gobjc++		: gobjc++-4.3
+	cpp		: cpp-4.4
+	gcc		: gcc-4.4
+	g++		: g++-4.4
+	gfortran	: gfortran-4.4
+	gcj		: gcj-4.4
+	gij		: gij-4.4
+	gobjc		: gobjc-4.4
+	gobjc++		: gobjc++-4.4
 	gpc		: gpc-4.1
 	gdc		: gdc-4.1

============================================================
--- debian/changelog	bf8777ce16f2f67895c53a3ac651dd57155e2fcb
+++ debian/changelog	4252cf649ea2ae6fbd8c549b240d28b3b7b67434
@@ -1,3 +1,9 @@
+gcc-defaults (1.90) unstable; urgency=low
+
+  * Make GCC-4.4 the default.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 08 Dec 2009 00:39:44 +0100
+
 gcc-defaults (1.89) unstable; urgency=low

   * Remove support for gdc-4.2.  Addresses: #559361.
============================================================
--- debian/control	ba6daabac64a748924efce32f9a068894456caed
+++ debian/control	5c3b826bd5ab1025dfdbfba81cf18eb35dcb6ea0
@@ -4,7 +4,7 @@ Standards-Version: 3.8.3
 Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
 Uploaders: Matthias Klose <doko@debian.org>, Arthur Loiret <aloiret@debian.org>
 Standards-Version: 3.8.3
-Build-Depends: m4, debhelper (>= 5), dpkg-dev (>= 1.13.9), gcj-4.4-base (>= 4.4.2-2) [!arm], gcc-4.3-base (>= 4.3.4-1), lsb-release
+Build-Depends: m4, debhelper (>= 5), dpkg-dev (>= 1.13.9), gcj-4.4-base (>= 4.4.2-2) [!arm], gcc-4.4-base (>= 4.4.2-1), lsb-release
 Build-Depends-Indep: ca-certificates, gcj-jdk, python, python-central
 XS-Python-Version: all

@@ -188,8 +188,8 @@ Suggests: gcj-jdk
 Architecture: any
 Depends: libgcj-common (>= ${version:libgcjcommon}), ${dep:jrehl}
 Suggests: gcj-jdk
-Conflicts: gij (<< ${ver:gcjconflict}), java-gcj-compat-headless (<< 1.0.80-2)
-Replaces: java-gcj-compat-headless (<< 1.0.80-2)
+Conflicts: gij (<< ${ver:gcjconflict}), java-gcj-compat-headless (<< 1.0.80-6)
+Replaces: java-gcj-compat-headless (<< 1.0.80-6)
 Provides: java-gcj-compat-headless, java-virtual-machine, java5-runtime-headless, java2-runtime-headless, java1-runtime-headless, java-runtime-headless
 Description: Java runtime environment using GIJ/classpath (headless version)
  GIJ is a Java bytecode interpreter, not limited to interpreting bytecode.
============================================================
--- debian/rules	b653bc14916454e4c67f4b9a63e9e522e896115a
+++ debian/rules	b348a8630819824e44c1c0f2361d5d2deade9411
@@ -91,6 +91,8 @@ REL_NO_441	:= $(shell expr $(VMINOR) - 8
 REL_NO_440	:= $(shell expr $(VMINOR) - 80)$(REL_EXT)
 # gcc-defaults 1.88 is the first version with 4.4.1 support.
 REL_NO_441	:= $(shell expr $(VMINOR) - 87)$(REL_EXT)
+# gcc-defaults 1.90 is the first version with 4.4.2 support.
+REL_NO_442	:= $(shell expr $(VMINOR) - 89)$(REL_EXT)

 GPC_VERSION	:= 2.1
 GDC_VERSION	:= 0.25
@@ -111,9 +113,9 @@ REQV_43		:= (>= 4.3.4-1)
 REQV_42		:= (>= 4.2.4-1)
 REQV_42_GCJ	:= (>= 4.2.4-1)
 REQV_43		:= (>= 4.3.4-1)
-REQV_44		:= (>= 4.4.1-2)
+REQV_44		:= (>= 4.4.2-1)

-REQV_LIBGCJ_BC	:= (>= 4.3.4-1)
+REQV_LIBGCJ_BC	:= (>= 4.4.2-1)

 # architecture dependent variables
 DEB_HOST_ARCH		:= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -121,53 +123,47 @@ DEB_HOST_GNU_TYPE	:= $(shell dpkg-archit

 # gcj-4.4 has some regressions in the testsuite compared to 4.3
 # results on alpha are bad in both 4.3 and 4.4.
-gcj44_archs = amd64 armel hppa hurd-i386 lpia mips mipsel powerpc ppc64 kfreebsd-amd64 kfreebsd-i386 sh4
-gcj44_archs = hppa
+gcj44_archs = amd64 armel hppa hurd-i386 i386 lpia mips mipsel powerpc ppc64 kfreebsd-amd64 kfreebsd-i386 sh4

 # CV_XXX is the complete version number, including the release, without epoch
 CV_CHILL:= 2.95.4-$(REL_NO_295)
 CV_GPC	:= 3.4.6-$(REL_NO_346)

-CV_CPP      := 4.3.4-$(REL_NO_434)
-CV_GCC      := 4.3.4-$(REL_NO_434)
-CV_GPP      := 4.3.4-$(REL_NO_434)
-CV_GOBJC    := 4.3.4-$(REL_NO_434)
-CV_GOBJCXX  := 4.3.4-$(REL_NO_434)
-CV_GFORT	:= 4.3.4-$(REL_NO_434)
-CV_GCJ		:= 4.3.4-$(REL_NO_434)
-CV_GIJ		:= 4.3.4-$(REL_NO_434)
-CV_LIBGCJBC	:= 4.3.4-$(REL_NO_434)
+CV_CPP		:= 4.4.2-$(REL_NO_442)
+CV_GCC		:= 4.4.2-$(REL_NO_442)
+CV_GPP		:= 4.4.2-$(REL_NO_442)
+CV_GOBJC	:= 4.4.2-$(REL_NO_442)
+CV_GOBJCXX	:= 4.4.2-$(REL_NO_442)
+CV_GFORT	:= 4.4.2-$(REL_NO_442)
+CV_GCJ		:= 4.4.2-$(REL_NO_442)
+CV_GIJ		:= 4.4.2-$(REL_NO_442)
+CV_LIBGCJBC	:= 4.4.2-$(REL_NO_442)
 CV_GPC		:= $(GPC_VERSION)-4.1.2-$(REL_NO_412)
 CV_GDC		:= 4.1.2-$(REL_NO_412)
-CV_LIBGCJCOMMON	:= 1:4.4.1-$(REL_NO_441)
+CV_LIBGCJCOMMON	:= 1:4.4.2-$(REL_NO_442)
 CV_SPU		:= 4.3.4-$(REL_NO_434)

-ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj44_archs)))
-  CV_GCJ		:= 4.4.1-$(REL_NO_441)
-  CV_GIJ		:= 4.4.1-$(REL_NO_441)
-  CV_LIBGCJBC		:= 4.4.1-$(REL_NO_441)
-endif
+#ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj44_archs)))
+#  CV_GCJ		:= 4.4.2-$(REL_NO_442)
+#  CV_GIJ		:= 4.4.2-$(REL_NO_442)
+#  CV_LIBGCJBC		:= 4.4.2-$(REL_NO_442)
+#endif

 REQV_CHILL	= $(REQV_295)
 REQV_GPC	= $(REQV_34)

-REQV_CPP	= $(REQV_43)
-REQV_GCC	= $(REQV_43)
-REQV_GPP	= $(REQV_43)
-REQV_GOBJC	= $(REQV_43)
-REQV_GOBJCXX= $(REQV_43)
-REQV_GFORT	= $(REQV_43)
-REQV_GCJ	= $(REQV_43)
-REQV_GIJ	= $(REQV_43)
+REQV_CPP	= $(REQV_44)
+REQV_GCC	= $(REQV_44)
+REQV_GPP	= $(REQV_44)
+REQV_GOBJC	= $(REQV_44)
+REQV_GOBJCXX	= $(REQV_44)
+REQV_GFORT	= $(REQV_44)
+REQV_GCJ	= $(REQV_44)
+REQV_GIJ	= $(REQV_44)
 REQV_GPC	= $(REQV_41_GPC)
 REQV_GDC	= $(REQV_41_GDC)
 REQV_SPU	= $(REQV_43)

-ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj44_archs)))
-    REQV_GCJ	= $(REQV_44)
-    REQV_GIJ	= $(REQV_44)
-endif
-
 EPOCH=4
 EPOCH_GPC=5
 OS_NAME	:= Linux
@@ -178,16 +174,10 @@ lib32 = /usr/lib32

 lib32 = /usr/lib32

-LIBGCJ		= libgcj9-0
-LIBGCJ_PC	= libgcj9.pc
-LIBGCJ_SONAME	= 90
+LIBGCJ	= libgcj10
+LIBGCJ_PC	= libgcj10.pc
+LIBGCJ_SONAME	= 10

-ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj44_archs)))
-  LIBGCJ	= libgcj10
-  LIBGCJ_PC	= libgcj10.pc
-  LIBGCJ_SONAME	= 10
-endif
-
 gcj_archs = alpha amd64 armel hppa i386 ia64 lpia m68k mips mipsel powerpc ppc64 s390 sh4 sparc kfreebsd-amd64 kfreebsd-i386 hurd-i386
 gcj_native_archs = alpha amd64 armel hppa i386 ia64 lpia mips mipsel powerpc ppc64 s390 sh4 sparc kfreebsd-amd64 kfreebsd-i386 hurd-i386
 multilib_archs = amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 sparc