Ubuntu

Merge lp:~israeldahl/ubuntu/raring/lmms/lmms_0.4.13_raring into lp:ubuntu/raring/lmms

Proposed by Israel Dahl on 2013-02-26
Status: Work in progress
Proposed branch: lp:~israeldahl/ubuntu/raring/lmms/lmms_0.4.13_raring
Merge into: lp:ubuntu/raring/lmms
Diff against target: 65 lines (+17/-3) 5 files modified
To merge this branch: bzr merge lp:~israeldahl/ubuntu/raring/lmms/lmms_0.4.13_raring
Reviewer Review Type Date Requested Status
Barry Warsaw Needs Fixing on 2013-02-26
Ubuntu branches 2013-02-26 Pending
Review via email: mp+150566@code.launchpad.net
To post a comment you must log in.
Israel Dahl (israeldahl) wrote :

Since the feature freeze is coming next week, I decided to get the fixes for lmms merged in so I can start testing it in Raring, to make sure I don't need to propse any other merges after it is too late.

The purpose of this merge request is to get the debian/lmms.install fix in and fix the last remaining Lintian errors. I will address some of the other issues before 13.10 (as LMMS will be getting a new icon anyway)

Thanks!

Barry Warsaw (barry) wrote :

debian/changelog:
 - should name raring instead of precise
 - should clean up weird formatting of entries (too many blank lines in the wrong place, need a blank line before first entry)

debian/control:
 - is there any reason why Standards-Version: 3.9.4 can't be used?

http://lists.debian.org/debian-devel-announce/2012/09/msg00006.html

Barry Warsaw (barry) wrote :

Thanks for fixing the lintian warnings.

Why did you moved /usr/share/applications from lmms-common to lmms? That moves lmms.desktop from one binary package to another. Without Breaks/Replaces, won't that cause problems for folks upgrading from 0.4.13-0ubuntu1 (which admittedly is a raring->raring upgrade, so maybe not that bad, but still).

review: Needs Fixing
Israel Dahl (israeldahl) wrote :

Sorry... about the naming... you are right. I am on precise right now, so I will fix that.

I moved it to the correct binary. if you test raring, it doesn't install correctly. (or it didin't when I tested installing it from the repos in raring). You effectively get no lmms. I originally put it in lmms-common.desktop because I am new to this and just wanted to fix the lack of desktop file problem. so I am fixing it by putting it in the correct place.

people keep complaining about my changelog formatting for different reasons. There needs to be some standard format that can be explained logically with real parameters/guidelines. I will look at it and try to get that right and resubmit it.

Bryce Harrington (bryce) wrote :

[Setting to WIP to remove this from sponsor queue; please set back to Needs Review once it's ready for review again.]

Israel Dahl (israeldahl) wrote :

I just received 0.4.14, so I will start a new request once I merge that source with the current Raring, and I will propose the merge then. I will start a different branch and propose that one for merger. Thanks

Unmerged revisions

36. By Israel Dahl on 2013-02-26

* debian/lmms.install debain/lmms-common.install
  - moved line /usr/share/applications to lmms.install
* debian/control
  - Updated standards to 3.9.3

* debian/rules fixed Lintian errors
  - related to build: build-arch build-indep, etc..

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2012-12-05 22:07:51 +0000
3+++ debian/changelog 2013-02-26 14:12:23 +0000
4@@ -1,3 +1,15 @@
5+lmms (0.4.13-0ubuntu2) precise; urgency=low
6+ * debian/lmms.install debain/lmms-common.install
7+ - moved line /usr/share/applications to lmms.install
8+ * debian/control
9+ - Updated standards to 3.9.3
10+
11+ * debian/rules fixed Lintian errors
12+ - related to build: build-arch build-indep, etc..
13+
14+
15+ -- Israel Dahl <israeldahl@gmail.com> Tue, 26 Feb 2013 08:04:37 -0600
16+
17 lmms (0.4.13-0ubuntu1) raring; urgency=low
18
19 * New Upstream release.
20
21=== modified file 'debian/control'
22--- debian/control 2012-10-01 20:30:17 +0000
23+++ debian/control 2013-02-26 14:12:23 +0000
24@@ -4,7 +4,7 @@
25 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
26 XSBC-Original-Maintainer: Patrick Winnertz <winnie@debian.org>
27 Build-Depends: debhelper (>= 5.0.0), libsdl-sound1.2-dev, libsamplerate0-dev, libsndfile1-dev, libvorbis-dev, libjack-dev, libstk0-dev, ladspa-sdk, libflac-dev, wine1.4-dev [i386], libasound2-dev [linux-any], festival-dev, imagemagick, cmake, qt4-qmake, libqt4-dev, libpulse-dev, libfluidsynth-dev, libfftw3-dev, libfreetype6-dev, libxft-dev, portaudio19-dev, libxinerama-dev
28-Standards-Version: 3.9.1
29+Standards-Version: 3.9.3
30 Homepage: http://lmms.sf.net/
31
32 Package: lmms
33
34=== modified file 'debian/lmms-common.install'
35--- debian/lmms-common.install 2012-12-03 13:31:45 +0000
36+++ debian/lmms-common.install 2013-02-26 14:12:23 +0000
37@@ -1,4 +1,3 @@
38-usr/share/applications/*
39 usr/share/lmms/*
40 usr/share/mime/*
41
42
43=== modified file 'debian/lmms.install'
44--- debian/lmms.install 2012-12-03 13:31:45 +0000
45+++ debian/lmms.install 2013-02-26 14:12:23 +0000
46@@ -1,3 +1,4 @@
47+usr/share/applications/*
48 usr/bin/lmms
49 usr/lib/lmms
50 usr/share/man/*
51
52=== modified file 'debian/rules'
53--- debian/rules 2012-10-01 20:30:17 +0000
54+++ debian/rules 2013-02-26 14:12:23 +0000
55@@ -29,7 +29,9 @@
56 dh_testdir
57 touch ./configure
58
59-build: build-stamp
60+build: build-arch build-indep
61+build-arch: build-stamp
62+build-indep: build-stamp
63 build-stamp: patch-stamp config.status
64 dh_testdir
65 cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=1 $(EXTRA_CMAKE_ARGS)

Subscribers

People subscribed via source and target branches

to all changes: