diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-04-27 19:50:44 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-04-27 19:50:44 +0000 |
| commit | 258d79d055c93aaf97367b828e83abffea69ed37 (patch) | |
| tree | 1ef2c7ccb31fdef30e9ac002a9b562ba2ea29230 | |
| parent | 2860e1eb565d28016cd0bfdc6e71fb513762f818 (diff) | |
| download | gcc-49-258d79d055c93aaf97367b828e83abffea69ed37.tar.gz | |
- fix upgrade to packages providing hppa64 alternatives
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.9@7327 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 00c7550..1a4611d 100644 --- a/debian/control +++ b/debian/control @@ -303,7 +303,7 @@ Architecture: hppa Section: devel Priority: optional Depends: gcc-4.9-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.8-hppa64 (<< 4.8.2-22) 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 101fbec..d06407e 100644 --- a/debian/control.m4 +++ b/debian/control.m4 @@ -798,7 +798,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.8-hppa64 (<< 4.8.2-22) BUILT_USING`'dnl Description: GNU C compiler (cross compiler for hppa64) This is the GNU C compiler, a fairly portable optimizing compiler for C. |