installer/linux/debian_amd64/control - Issue 155710: Linux: Adding conflicts with the ubuntu package

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: installer/linux/debian_amd64/control

Issue 155710: Linux: Adding conflicts with the ubuntu package (Closed)

Patch Set: Adds Replaces: Created 11 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: installer/linux/debian_amd64/control

diff --git a/installer/linux/debian_amd64/control b/installer/linux/debian_amd64/control

index 76e780ca4e1c4fb230913fc82bca34d386a1c5ae..8a3b6f83992442303b9bef1c706027112ce495e8 100644

--- a/installer/linux/debian_amd64/control

+++ b/installer/linux/debian_amd64/control

@@ -8,6 +8,8 @@ Standards-Version: 3.7.2

Package: google-o3d

Architecture: amd64

Depends: ia32-libs, libc6-i386, lib32stdc++6, lib32gcc1, lib32z1, nspluginwrapper

+Conflicts: o3d-plugin

+Replaces: o3d-plugin

Description: Google O3D Plugin

O3D is an open-source web API for creating rich, interactive 3D applications in

the browser.

« no previous file with comments | « no previous file | no next file » | no next file with comments »