Ubuntu
gnome-games-extra-data package

Merge lp:~ubuntu-branches/ubuntu/maverick/gnome-games-extra-data/maverick-201007310613 into lp:ubuntu/maverick/gnome-games-extra-data

  1. Maverick (10.10)
  2. maverick-201007310613
  3. Merge into maverick
Proposed by James Westby
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/maverick/gnome-games-extra-data/maverick-201007310613
Merge into: lp:ubuntu/maverick/gnome-games-extra-data
Diff against target: 37 lines (+26/-0) (has conflicts)
1 file modified
debian/control (+26/-0)
Text conflict in debian/control
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/maverick/gnome-games-extra-data/maverick-201007310613

Description of the change

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/maverick/gnome-games-extra-data now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/gnome-games-extra-data/maverick-201007310613. A merge should be performed if necessary.

To post a comment you must log in.

Unmerged revisions

18. By Andrew Starr-Bochicchio

debian/control{.in}: Add misc:Depends.

17. By Andrew Starr-Bochicchio

* Merge from Debian Unstable. Remaining Ubuntu changes:
 - debian/control{.in}:
  + Remove Replaces fields from gnome-games-extra-data as these conflict
    with split GNOME Games package
  + Add BZR link

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2010-07-30 22:59:34 +0000
3+++ debian/control 2010-07-31 06:17:40 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 # This file is autogenerated. DO NOT EDIT!
7 #
8 # Modifications should be made to debian/control.in instead.
9@@ -21,3 +22,28 @@
10 This package contains extra data files for the gnome-games package. At
11 the moment this is almost entirely extra themes and artwork for the
12 games.
13+=======
14+# This file is autogenerated. DO NOT EDIT!
15+#
16+# Modifications should be made to debian/control.in instead.
17+# This file is regenerated automatically in the clean target.
18+
19+Source: gnome-games-extra-data
20+Section: gnome
21+Priority: optional
22+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
23+XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org>
24+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Sebastian Dröge <slomo@debian.org>
25+Build-Depends: cdbs, debhelper (>= 7), gnome-pkg-tools
26+Standards-Version: 3.8.4
27+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-games-extra-data/ubuntu
28+
29+Package: gnome-games-extra-data
30+Architecture: all
31+Depends: ${misc:Depends}
32+Recommends: gnome-games-data
33+Description: games for the GNOME desktop (extra artwork)
34+ This package contains extra data files for the gnome-games package. At
35+ the moment this is almost entirely extra themes and artwork for the
36+ games.
37+>>>>>>> MERGE-SOURCE

Subscribers

People subscribed via source and target branches

to all changes: