GNOME media utilities

Merge lp:~noskcaj/gnome-media/merge into lp:~ubuntu-desktop/gnome-media/ubuntu

  1. merge
  2. Merge into ubuntu
Proposed by Jackson Doak
Status: Merged
Merged at revision: 82
Proposed branch: lp:~noskcaj/gnome-media/merge
Merge into: lp:~ubuntu-desktop/gnome-media/ubuntu
Diff against target: 222 lines (+40/-99)
8 files modified
debian/changelog (+34/-0)
debian/control (+3/-4)
debian/control.in (+2/-3)
debian/gnome-grecord.xpm (+0/-48)
debian/gnome-media.install (+0/-1)
debian/gnome-media.menu (+0/-2)
debian/gnome-sound-recorder.1 (+0/-40)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~noskcaj/gnome-media/merge
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+241214@code.launchpad.net

Description of the change

Merge from debian. Drops gnome-sound-recorder binary to stop conflicts with new (working) gnome-sound-recorder package

To post a comment you must log in.

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 2014-10-01 01:18:19 +0000
3+++ debian/changelog 2014-11-09 19:37:36 +0000
4@@ -1,3 +1,37 @@
5+gnome-media (3.4.0-2ubuntu1) vivid; urgency=medium
6+
7+ * Merge from debian. Remaining changes:
8+ * debian/control:
9+ - Updated the dpkg build-depends, use "Pre-Depends: ${misc:Pre-Depends}"
10+ - Update VCS fields
11+ - Recommend gnome-control-center | unity-control-center
12+ * debian/gnome-media.maintscript:
13+ - Clean the deprecated autostart for the sound control
14+ * debian/patches/02_better_record_titles.patch:
15+ - "Use names based on date instead of wort "Untitled"."
16+ * debian/patches/03_set_pulse_role.patch:
17+ - Set the pulse media role for the indicator sound controls
18+ * debian/patches/04_unity_control_center.patch:
19+ - Use Unity control center in Unity
20+ * debian/patches/git_play_after_second_record.patch:
21+ - "Properly reinitialize when starting a new recording"
22+
23+ -- Jackson Doak <noskcaj@ubuntu.com> Sun, 09 Nov 2014 19:41:48 +1100
24+
25+gnome-media (3.4.0-2) unstable; urgency=low
26+
27+ [ Jeremy Bicha ]
28+ * Update homepage
29+
30+ [ Laurent Bigonville ]
31+ * Disable GNOME Sound Recorder. The binary is now built from its own source
32+ package. This package only ships gstreamer-properties starting from now.
33+ * debian/control.in:
34+ - Update VCS-* fields, gnome-media is archived in the attic.
35+ - Bump Standards-Version to 3.9.5 (no further changes)
36+
37+ -- Laurent Bigonville <bigon@debian.org> Thu, 11 Sep 2014 08:54:15 +0200
38+
39 gnome-media (3.4.0-1ubuntu3) utopic; urgency=medium
40
41 * debian/control.in: Recommend gnome-control-center | unity-control-center
42
43=== modified file 'debian/control'
44--- debian/control 2014-10-01 01:18:19 +0000
45+++ debian/control 2014-11-09 19:37:36 +0000
46@@ -7,8 +7,8 @@
47 Priority: optional
48 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
49 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
50-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Michael Biebl <biebl@debian.org>
51-Standards-Version: 3.9.3
52+Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Jordi Mallach <jordi@debian.org>, Josselin Mouette <joss@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>, Sebastian Dröge <slomo@debian.org>
53+Standards-Version: 3.9.5
54 Build-Depends: cdbs (>= 0.4.41),
55 dh-autoreconf,
56 gnome-pkg-tools (>= 0.11.3),
57@@ -30,7 +30,7 @@
58 gstreamer0.10-plugins-base,
59 gstreamer0.10-plugins-good,
60 libgnome-media-profiles-dev
61-Homepage: http://live.gnome.org/GnomeMedia
62+Homepage: https://wiki.gnome.org/GnomeMedia
63 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/gnome-media/ubuntu
64
65 Package: gnome-media
66@@ -51,5 +51,4 @@
67 Breaks: gnome-control-center (<< 1:3.0)
68 Description: GNOME media utilities
69 This package contains a few media utilities for the GNOME desktop:
70- * the GNOME Sound Recorder;
71 * the GStreamer properties capplet.
72
73=== modified file 'debian/control.in'
74--- debian/control.in 2014-10-01 01:18:19 +0000
75+++ debian/control.in 2014-11-09 19:37:36 +0000
76@@ -4,7 +4,7 @@
77 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
78 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
79 Uploaders: @GNOME_TEAM@
80-Standards-Version: 3.9.3
81+Standards-Version: 3.9.5
82 Build-Depends: cdbs (>= 0.4.41),
83 dh-autoreconf,
84 gnome-pkg-tools (>= 0.11.3),
85@@ -26,7 +26,7 @@
86 gstreamer0.10-plugins-base,
87 gstreamer0.10-plugins-good,
88 libgnome-media-profiles-dev
89-Homepage: http://live.gnome.org/GnomeMedia
90+Homepage: https://wiki.gnome.org/GnomeMedia
91 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/gnome-media/ubuntu
92
93 Package: gnome-media
94@@ -47,5 +47,4 @@
95 Breaks: gnome-control-center (<< 1:3.0)
96 Description: GNOME media utilities
97 This package contains a few media utilities for the GNOME desktop:
98- * the GNOME Sound Recorder;
99 * the GStreamer properties capplet.
100
101=== removed file 'debian/gnome-grecord.xpm'
102--- debian/gnome-grecord.xpm 2009-03-03 22:22:58 +0000
103+++ debian/gnome-grecord.xpm 1970-01-01 00:00:00 +0000
104@@ -1,48 +0,0 @@
105-/* XPM */
106-static char * gnome_grecord_xpm[] = {
107-"32 32 13 1",
108-" c None",
109-". c #333333",
110-"+ c #4C4C4C",
111-"@ c #191919",
112-"# c #666667",
113-"$ c #7F7F7F",
114-"% c #000000",
115-"& c #999999",
116-"* c #B2B2B2",
117-"= c #007F7F",
118-"- c #CCCCCC",
119-"; c #00007F",
120-"> c #0000FF",
121-" ",
122-" ",
123-" ",
124-" $$#++ ",
125-" #++++ ",
126-" #+++. ",
127-" .@ &*** ",
128-" &+ +. $++.#&& ",
129-" $++ &$+ $..@..+&& ",
130-" +## .. #++ #..@.@..+&$ ",
131-" +++ . #.@@@.@...$$ ",
132-" ##.. #.@.@.@....#$ ",
133-" +++ $.@@.@@.@...+# ",
134-" +. +.@@.@......+# ",
135-" $#. #@@.@.@.+=.+.+# ",
136-" *#. +@@@@..#$#=+.## ",
137-" .. $....@.=$$#++.=# ",
138-" + #.@.>..&&$=+++### ",
139-" +++ +.....#&$#++#=#++ ",
140-" #+ @ #.+.+++#$=++#$#++++ ",
141-" $$++ #+++.+=++..+&$=... ",
142-" ##++ =+.=++#$#+=&&#.@.. ",
143-" +.+ ##++#$&*-*-*$+.;.. ",
144-" $+#=&&*---&$..@@@ ",
145-" &#+$**---*$..;@@ ",
146-" &$=$**-**=.@@%%% ",
147-" $#&***$+.;@%%%%%% ",
148-" .+.=..@@@%%%%%%%% ",
149-" @@@@@@;%%@%@%%% ",
150-" ;%%%%%%%%% ",
151-" ",
152-" "};
153
154=== removed file 'debian/gnome-media.install'
155--- debian/gnome-media.install 2011-11-22 10:11:28 +0000
156+++ debian/gnome-media.install 1970-01-01 00:00:00 +0000
157@@ -1,1 +0,0 @@
158-debian/*.xpm /usr/share/pixmaps/
159
160=== removed file 'debian/gnome-media.menu'
161--- debian/gnome-media.menu 2011-01-07 05:50:33 +0000
162+++ debian/gnome-media.menu 1970-01-01 00:00:00 +0000
163@@ -1,2 +0,0 @@
164-?package(gnome-media):needs="X11" section="Applications/Sound" \
165- title="grecord (GNOME 2.0 Recorder)" icon="/usr/share/pixmaps/gnome-grecord.xpm" command="/usr/bin/gnome-sound-recorder"
166
167=== removed file 'debian/gnome-sound-recorder.1'
168--- debian/gnome-sound-recorder.1 2009-03-03 22:22:58 +0000
169+++ debian/gnome-sound-recorder.1 1970-01-01 00:00:00 +0000
170@@ -1,40 +0,0 @@
171-.\" Copyright (C) 2006 Sven Arvidsson <sa@whiz.se>
172-.\"
173-.\" This is free software; you may redistribute it and/or modify
174-.\" it under the terms of the GNU General Public License as
175-.\" published by the Free Software Foundation; either version 2,
176-.\" or (at your option) any later version.
177-.\"
178-.\" This is distributed in the hope that it will be useful, but
179-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
180-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
181-.\" GNU General Public License for more details.
182-.\"
183-.\"You should have received a copy of the GNU General Public License along
184-.\"with this program; if not, write to the Free Software Foundation, Inc.,
185-.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
186-.TH gnome-sound-recorder 1 "2007\-05\-05" "GNOME"
187-.SH NAME
188-gnome-sound-recorder \- simple sound recorder
189-.SH SYNOPSIS
190-.B gnome-sound-recorder
191-.RI [ OPTION... ]
192-.SH DESCRIPTION
193-.B gnome-sound-recorder
194-enables you to record and play .flac, .ogg, and .wav sound files.
195-.SH OPTIONS
196-.B gnome-sound-recorder
197-only accepts the standard GNOME and GTK options.
198-.SH AUTHORS
199-.B gnome-sound-recorder
200-was written by Iain Holmes <iain@prettypeople.org> and others.
201-.P
202-This manual page was written by Sven Arvidsson <sa@whiz.se>,
203-for the Debian project (but may be used by others).
204-.SH SEE ALSO
205-.BR "gtk-options" (7),
206-.BR "gnome-options" (7)
207-.P
208-The online documentation available through the program's
209-.I Help
210-menu.
211
212=== modified file 'debian/rules'
213--- debian/rules 2011-05-17 09:10:07 +0000
214+++ debian/rules 2014-11-09 19:37:36 +0000
215@@ -8,7 +8,7 @@
216 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
217 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
218
219-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
220+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --disable-grecord --enable-gstprops
221
222 LDFLAGS += -Wl,-z,defs -Wl,--as-needed -Wl,-O1
223

Subscribers

People subscribed via source and target branches