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

Side by Side Diff

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

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

Side by Side 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:

OLD	NEW
1 Source: google-o3d	1 Source: google-o3d

2 Section: non-free/web	2 Section: non-free/web

3 Priority: optional	3 Priority: optional

4 Maintainer: Tristan Schmelcher <tschmelcher@google.com>	4 Maintainer: Tristan Schmelcher <tschmelcher@google.com>

5 Build-Depends: debhelper (>= 4.0.0), cdbs (>=0.4.34ubuntu4)	5 Build-Depends: debhelper (>= 4.0.0), cdbs (>=0.4.34ubuntu4)

6 Standards-Version: 3.7.2	6 Standards-Version: 3.7.2

7	7

8 Package: google-o3d	8 Package: google-o3d

9 Architecture: amd64	9 Architecture: amd64

10 Depends: ia32-libs, libc6-i386, lib32stdc++6, lib32gcc1, lib32z1, nspluginwrappe r	10 Depends: ia32-libs, libc6-i386, lib32stdc++6, lib32gcc1, lib32z1, nspluginwrappe r

	11 Conflicts: o3d-plugin

	12 Replaces: o3d-plugin

11 Description: Google O3D Plugin	13 Description: Google O3D Plugin

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

13 the browser.	15 the browser.

14 .	16 .

15 This package provides the NPAPI browser plugin for running O3D-based web apps.	17 This package provides the NPAPI browser plugin for running O3D-based web apps.

OLD	NEW

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