Merge lp:~nathandyer/vocal/vocal into lp:vocal

Proposed by Nathan Dyer
Status: Merged
Approved by: Nathan Dyer
Approved revision: 2
Merged at revision: 2
Proposed branch: lp:~nathandyer/vocal/vocal
Merge into: lp:vocal
Diff against target: 168 lines (+79/-6)
10 files modified
CMakeLists.txt (+0/-1)
CMakeLists.txt~ (+6/-2)
INSTALL (+0/-1)
INSTALL~ (+1/-2)
debian/changelog (+5/-0)
debian/compat (+1/-0)
debian/control (+29/-0)
debian/copyright (+22/-0)
debian/rules (+14/-0)
debian/source/format (+1/-0)
To merge this branch: bzr merge lp:~nathandyer/vocal/vocal
Reviewer Review Type Date Requested Status
Nathan Dyer Pending
Review via email: mp+223987@code.launchpad.net

Description of the change

Added debian control.

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 'CMakeLists.txt'
2--- CMakeLists.txt 2014-06-20 20:21:47 +0000
3+++ CMakeLists.txt 2014-06-20 20:54:55 +0000
4@@ -68,7 +68,6 @@
5 granite
6 libxml-2.0
7 libnotify
8- clutter-gtk-1.0
9 unity
10 OPTIONS
11 --thread
12
13=== modified file 'CMakeLists.txt~'
14--- CMakeLists.txt~ 2014-06-20 20:21:47 +0000
15+++ CMakeLists.txt~ 2014-06-20 20:54:55 +0000
16@@ -61,7 +61,6 @@
17 src/Utils/Player.vala
18 src/Utils/FeedParser.vala
19 src/Utils/Utils.vala
20- src/VideoPlayer.vala
21 PACKAGES
22 gstreamer-1.0
23 sqlite3
24@@ -81,4 +80,9 @@
25
26 install (TARGETS vocal RUNTIME DESTINATION bin)
27 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/vocal.desktop DESTINATION share/applications)
28-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/vocal.png DESTINATION share/icons/hicolor/48x48/apps)
29\ No newline at end of file
30+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/22/vocal.svg DESTINATION share/icons/hicolor/22x22/apps)
31+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/24/vocal.svg DESTINATION share/icons/hicolor/24x24/apps)
32+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/32/vocal.svg DESTINATION share/icons/hicolor/32x32/apps)
33+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/48/vocal.svg DESTINATION share/icons/hicolor/48x48/apps)
34+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/64/vocal.svg DESTINATION share/icons/hicolor/64x64/apps)
35+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/128/vocal.svg DESTINATION share/icons/hicolor/128x128/apps)
36\ No newline at end of file
37
38=== modified file 'INSTALL'
39--- INSTALL 2014-06-20 20:21:47 +0000
40+++ INSTALL 2014-06-20 20:54:55 +0000
41@@ -7,7 +7,6 @@
42 granite
43 gtk+-3.0
44 gstreamer-1.0
45-gthread-2.0
46 sqlite3
47
48
49
50=== modified file 'INSTALL~'
51--- INSTALL~ 2014-06-20 20:21:47 +0000
52+++ INSTALL~ 2014-06-20 20:54:55 +0000
53@@ -9,8 +9,7 @@
54 gstreamer-1.0
55 gthread-2.0
56 sqlite3
57-clutter-gtk-1.0
58-clutter-gst-2.0
59+
60
61 --------------------------------------------------------------------------------
62 BUILDING AND INSTALLING
63
64=== added directory 'debian'
65=== added file 'debian/changelog'
66--- debian/changelog 1970-01-01 00:00:00 +0000
67+++ debian/changelog 2014-06-20 20:54:55 +0000
68@@ -0,0 +1,5 @@
69+vocal (0.1) trusty; urgency=low
70+
71+ * Initial Development Release.
72+
73+ -- Nathan Dyer <mail@nathandyer.me> Fri, 20 Jun 2014 16:30:00 -0500
74\ No newline at end of file
75
76=== added file 'debian/compat'
77--- debian/compat 1970-01-01 00:00:00 +0000
78+++ debian/compat 2014-06-20 20:54:55 +0000
79@@ -0,0 +1,1 @@
80+8
81
82=== added file 'debian/control'
83--- debian/control 1970-01-01 00:00:00 +0000
84+++ debian/control 2014-06-20 20:54:55 +0000
85@@ -0,0 +1,29 @@
86+Source: vocal
87+Section: utils
88+Priority: optional
89+Maintainer: Nathan Dyer <mail@nathandyer.me>
90+Build-Depends: cmake (>= 2.8),
91+ debhelper (>= 8.0.0),
92+ libgranite-dev,
93+ libgtk-3-dev (>= 3.12),
94+ valac-0.16 | valac (>= 0.16),
95+ libunity-dev,
96+ libnotify-dev,
97+ libxml2-dev,
98+ libgstreamer1.0-dev,
99+ libsqlite3-dev
100+
101+
102+
103+
104+
105+
106+
107+
108+Standards-Version: 3.9.3
109+
110+Package: vocal
111+Architecture: all
112+Depends: ${misc:Depends}, ${shlibs:Depends}
113+Description: Vocal
114+ Simple podcast client for the modern desktop.
115\ No newline at end of file
116
117=== added file 'debian/copyright'
118--- debian/copyright 1970-01-01 00:00:00 +0000
119+++ debian/copyright 2014-06-20 20:54:55 +0000
120@@ -0,0 +1,22 @@
121+Format: http://dep.debian.net/deps/dep5
122+Upstream-Name: vocal
123+Source: https://code.launchpad.net/~nathandyer/vocal
124+Files: src/* data/* cmake/* debian/*
125+Copyright: 2014 Nathan Dyer <mail@nathandyer.me>
126+
127+License: GPL-3.0+
128+ This program is free software: you can redistribute it and/or modify
129+ it under the terms of the GNU General Public License as published by
130+ the Free Software Foundation, either version 3 of the License, or
131+ (at your option) any later version.
132+ .
133+ This package is distributed in the hope that it will be useful,
134+ but WITHOUT ANY WARRANTY; without even the implied warranty of
135+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
136+ GNU General Public License for more details.
137+ .
138+ You should have received a copy of the GNU General Public License
139+ along with this program. If not, see <http://www.gnu.org/licenses/>.
140+ .
141+ On Debian systems, the complete text of the GNU General
142+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
143
144=== added file 'debian/rules'
145--- debian/rules 1970-01-01 00:00:00 +0000
146+++ debian/rules 2014-06-20 20:54:55 +0000
147@@ -0,0 +1,14 @@
148+#!/usr/bin/make -f
149+# -*- makefile -*-
150+# Sample debian/rules that uses debhelper.
151+# This file was originally written by Joey Hess and Craig Small.
152+# As a special exception, when this file is copied by dh-make into a
153+# dh-make output file, you may use that output file without restriction.
154+# This special exception was added by Craig Small in version 0.37 of dh-make.
155+
156+# Uncomment this to turn on verbose mode.
157+#export DH_VERBOSE=1
158+
159+%:
160+ dh $@
161+
162
163=== added directory 'debian/source'
164=== added file 'debian/source/format'
165--- debian/source/format 1970-01-01 00:00:00 +0000
166+++ debian/source/format 2014-06-20 20:54:55 +0000
167@@ -0,0 +1,1 @@
168+3.0 (native)

Subscribers

People subscribed via source and target branches

to all changes: