diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-08-21 10:05:14 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-08-21 10:05:14 +0000 |
| commit | 34bf964dfa6f9c005c0353e760ff41cde5194a1f (patch) | |
| tree | f8acad810d0e6e200ccd725ad700595c24d062c0 | |
| parent | 88b09e1b231855af9875cef5183c87eb4cdde9cb (diff) | |
| download | gcc-47-34bf964dfa6f9c005c0353e760ff41cde5194a1f.tar.gz | |
* Update Debian release names (Stephen Kitt). Closes: #720263.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.7@6936 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/rules.defs | 5 | ||||
| -rw-r--r-- | debian/rules.patch | 2 | ||||
| -rw-r--r-- | debian/rules2 | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 5849a60..c7499ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ gcc-4.7 (4.7.3-7) UNRELEASED; urgency=low * Update to SVN 20130821 (r201895) from the gcc-4_7-branch. * Update the Linaro support to the 4.7-2013.08 release. * Tighten the build conflict with binutils-gold (closes: #720264). + * Update Debian release names (Stephen Kitt). Closes: #720263. -- Matthias Klose <doko@debian.org> Wed, 21 Aug 2013 11:40:56 +0200 diff --git a/debian/rules.defs b/debian/rules.defs index b805086..1743316 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -965,8 +965,7 @@ endif # ifndef DEB_STAGE # cloog backend ifneq (,$(filter $(distrelease),lenny etch squeeze dapper hardy jaunty karmic lucid maverick)) cloog_backend = ppl-0.10 -# FIXME: sid currently identifies itself as wheezy, add it here after the release -else ifneq (,$(filter $(distrelease),wheezy natty oneiric precise quantal)) +else ifneq (,$(filter $(distrelease),wheezy jessie sid natty oneiric precise quantal)) cloog_backend = ppl-0.11 else cloog_backend = ppl-1.0 @@ -1160,7 +1159,7 @@ export debian_extra_langs # multilib biarch_map := i686=x86_64 powerpc=powerpc64 sparc=sparc64 sparc64=sparc s390=s390x s390x=s390 \ x86_64=i686 powerpc64=powerpc mips=mips64 mipsel=mips64el -ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy sid dapper hardy jaunty karmic lucid)) +ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy jessie sid dapper hardy jaunty karmic lucid)) biarch_map := $(subst i686=,i486=,$(biarch_map)) endif ifeq ($(distribution),Ubuntu) diff --git a/debian/rules.patch b/debian/rules.patch index 23b7ebd..302004c 100644 --- a/debian/rules.patch +++ b/debian/rules.patch @@ -297,7 +297,7 @@ endif debian_patches += gcc-powerpc-undef debian_patches += gcc-multilib-multiarch -ifeq (,$(filter $(distrelease),lenny squeeze wheezy sid experimental dapper hardy intrepid jaunty karmic lucid maverick)) +ifeq (,$(filter $(distrelease),lenny squeeze wheezy jessie sid experimental dapper hardy intrepid jaunty karmic lucid maverick)) debian_patches += gcc-as-needed endif debian_patches += mips-fix-loongson2f-nop diff --git a/debian/rules2 b/debian/rules2 index 6d7e9eb..6bb8d88 100644 --- a/debian/rules2 +++ b/debian/rules2 @@ -454,7 +454,7 @@ endif ifneq (,$(filter $(DEB_TARGET_ARCH), amd64 i386 kfreebsd-i386 kfreebsd-amd64)) ifneq (,$(filter $(distrelease),etch lenny dapper hardy)) CONFARGS += --with-arch-32=i486 - else ifneq (,$(filter $(distrelease),squeeze wheezy sid jaunty karmic lucid)) + else ifneq (,$(filter $(distrelease),squeeze wheezy jessie sid jaunty karmic lucid)) CONFARGS += --with-arch-32=i586 else CONFARGS += --with-arch-32=i686 |