Ubuntu
weston package

Merge lp:~bkerensa/ubuntu/quantal/weston/fix-control into lp:ubuntu/quantal/weston

  1. Quantal (12.10)
  2. fix-control
  3. Merge into quantal
Proposed by Benjamin Kerensa
Status: Merged
Merge reported by: Bryce Harrington
Merged at revision: not available
Proposed branch: lp:~bkerensa/ubuntu/quantal/weston/fix-control
Merge into: lp:ubuntu/quantal/weston
Diff against target: 27 lines (+9/-1)
2 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
To merge this branch: bzr merge lp:~bkerensa/ubuntu/quantal/weston/fix-control
Reviewer Review Type Date Requested Status
Bryce Harrington Approve
Ubuntu branches Pending
Review via email: mp+124143@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Maybe it'd be better to send the fix to Debian instead?

Revision history for this message
Benjamin Kerensa (bkerensa) wrote :

There branch is messed up.... When I tried debcheckout it gave me an error saying something about a non-existant HEAD ref so then I tried git clone via the Vcs and same error and when I browse their Vcs manually I do not even see the source so idk?

Revision history for this message
Bryce Harrington (bryce) wrote :

Hi Benjamin, thanks for tending to weston!

Wayland and weston are maintained in Ubuntu using the Ubuntu-X git system, see https://wiki.ubuntu.com/X/GitUsage for paint-by-numbers directions on getting and using the git branch for packaging. We maintain a 'ubuntu' branch in debian's git tree, which makes it simpler for debian to pull our changes upstream, but it does require having a git account on alioth in order to push changes.

I've incorporated your changes into the ubuntu branch, pushed it to alioth and uploaded it. You don't need to do anything further, although you might want to drop Debian a note (kibi in particular) to pull your change from the ubuntu git branch.

Thanks again, and please do feel welcome to send more fixes for weston!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-08-23 18:02:55 +0000
3+++ debian/changelog 2012-09-13 09:41:20 +0000
4@@ -1,3 +1,10 @@
5+weston (0.95.0-0ubuntu2) quantal; urgency=low
6+
7+ * debian/control: added Homepage field
8+ * debian/control: bump Standards-Version to 3.9.3
9+
10+ -- Benjamin Kerensa <bkerensa@ubuntu.com> Thu, 13 Sep 2012 02:33:39 -0700
11+
12 weston (0.95.0-0ubuntu1) quantal; urgency=low
13
14 * Merge from unreleased debian git.
15
16=== modified file 'debian/control'
17--- debian/control 2012-08-23 18:02:55 +0000
18+++ debian/control 2012-09-13 09:41:20 +0000
19@@ -30,7 +30,8 @@
20 libmtdev-dev,
21 libpam0g-dev,
22 libvpx-dev,
23-Standards-Version: 3.9.2
24+Standards-Version: 3.9.3
25+Homepage: http://wayland.freedesktop.org/
26 Vcs-Git: git://git.debian.org/git/pkg-xorg/wayland/weston
27 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/wayland/weston.git
28

Subscribers

People subscribed via source and target branches