diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-04-27 19:49:56 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-04-27 19:49:56 +0000 |
| commit | af71aa16b620dc87fc411518eacc11287e6542b6 (patch) | |
| tree | c84f77858a0290b35c55bde42d6d2db08db3eabe | |
| parent | 4c36e10ab7200a98aafb0bf69b65a87e0a0dd975 (diff) | |
| download | gcc-48-af71aa16b620dc87fc411518eacc11287e6542b6.tar.gz | |
- fix upgrade to packages providing hppa64 alternatives
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.8@7326 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/control.m4 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/control b/debian/control index 23ea4c5..9bcced4 100644 --- a/debian/control +++ b/debian/control @@ -123,7 +123,7 @@ Architecture: hppa Section: devel Priority: optional Depends: gcc-4.8-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} -Conflicts: gcc-3.3-hppa64 (<= 1:3.3.4-5), gcc-3.4-hppa64 (<= 3.4.1-3) +Conflicts: gcc-3.3-hppa64 (<= 1:3.3.4-5), gcc-3.4-hppa64 (<= 3.4.1-3), gcc-4.7-hppa64 (<< 4.7.3-13), gcc-4.9-hppa64 (<< 4.9.0-2) Description: GNU C compiler (cross compiler for hppa64) This is the GNU C compiler, a fairly portable optimizing compiler for C. diff --git a/debian/control.m4 b/debian/control.m4 index 327ad2a..3801fba 100644 --- a/debian/control.m4 +++ b/debian/control.m4 @@ -750,7 +750,7 @@ Architecture: ifdef(`TARGET',`any',hppa) Section: devel Priority: PRI(optional) Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} -Conflicts: gcc-3.3-hppa64 (<= 1:3.3.4-5), gcc-3.4-hppa64 (<= 3.4.1-3) +Conflicts: gcc-3.3-hppa64 (<= 1:3.3.4-5), gcc-3.4-hppa64 (<= 3.4.1-3), gcc-4.7-hppa64 (<< 4.7.3-13), gcc-4.9-hppa64 (<< 4.9.0-2) BUILT_USING`'dnl Description: GNU C compiler (cross compiler for hppa64) This is the GNU C compiler, a fairly portable optimizing compiler for C. |