magictouch

Merge lp:~chasedouglas/magictouch/packaging.dfsg into lp:~libavg-team/magictouch/trunk

  1. packaging.dfsg
  2. Merge into trunk
Proposed by Chase Douglas
Status: Merged
Merged at revision: 15
Proposed branch: lp:~chasedouglas/magictouch/packaging.dfsg
Merge into: lp:~libavg-team/magictouch/trunk
Diff against target: 458 lines (+393/-0)
12 files modified
debian/changelog (+12/-0)
debian/compat (+1/-0)
debian/control (+20/-0)
debian/copyright (+49/-0)
debian/magictouch.6 (+29/-0)
debian/magictouch.desktop (+10/-0)
debian/magictouch.install (+2/-0)
debian/magictouch.xpm (+244/-0)
debian/pyversions (+1/-0)
debian/rules (+23/-0)
debian/source/format (+1/-0)
debian/watch (+1/-0)
To merge this branch: bzr merge lp:~chasedouglas/magictouch/packaging.dfsg
Reviewer Review Type Date Requested Status
OXullo Intersecans Approve
Review via email: mp+89559@code.launchpad.net

Description of the change

I think in the debian/rules you are trying to get around the font licensing by removing it before building the binary package. While this means the binary package is "Debian Free Software" (http://en.wikipedia.org/wiki/Debian_Free_Software_Guidelines), the source package is not because the font is still distributed in the orig tarball.

If you need to get around the font licensing, you will need to create a modified tarball. This branch ensures that the tarball created by "debian/rules get-packaged-orig-source" will create a suitably modified tarball without the DFSG-incompatible fonts.

Also in this branch, the get-orig-source rule has been renamed to get-packaged-orig-source. get-orig-source is supposed to get the latest upstream sources, while get-packaged-orig-source is supposed to the get source code pertaining to the current version specified in debian/changelog. With this change, you can:

$ bzr branch lp:~libavg-team/magictouch/packaging
$ bzr build-deb

The second step will automatically run get-packaged-orig-source to get the tarball for you :).

To post a comment you must log in.
Revision history for this message
OXullo Intersecans (oxullo) wrote :

Nifty! thanks as usual!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog 1970-01-01 00:00:00 +0000
+++ debian/changelog 2012-01-22 01:21:23 +0000
@@ -0,0 +1,12 @@
1magictouch (0.1+svn6821+dfsg-0ubuntu2) UNRELEASED; urgency=low
2
3 * Remove DFSG incompatible fonts
4 * Rename debian/rules rule get-orig-source to get-packaged-orig-source
5
6 -- Chase Douglas <chase.douglas@ubuntu.com> Sat, 21 Jan 2012 17:04:03 -0800
7
8magictouch (0.1+svn6821-0ubuntu1) precise; urgency=low
9
10 * Initial release. (LP: #735764)
11
12 -- OXullo Intersecans <x@brainrapers.org> Wed, 07 Dec 2011 23:06:29 +0100
013
=== added file 'debian/compat'
--- debian/compat 1970-01-01 00:00:00 +0000
+++ debian/compat 2012-01-22 01:21:23 +0000
@@ -0,0 +1,1 @@
17
02
=== added file 'debian/control'
--- debian/control 1970-01-01 00:00:00 +0000
+++ debian/control 2012-01-22 01:21:23 +0000
@@ -0,0 +1,20 @@
1Source: magictouch
2Section: games
3Priority: optional
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: OXullo Intersecans <x@brainrapers.org>
6Vcs-Bzr: http://bazaar.launchpad.net/~libavg-team/magictouch/packaging
7Vcs-Browser: http://bazaar.launchpad.net/~libavg-team/magictouch/packaging/files
8Build-Depends: debhelper (>= 7.0.50~), python-support, python (>=2.6)
9Standards-Version: 3.9.2
10XS-Python-Version: >= 2.6
11
12Package: magictouch
13Architecture: all
14Depends: ${python:Depends}, ${misc:Depends}, python-libavg (>= 1.7.0), ttf-dejavu-extra
15Description: Retro game goes multitouch: use two knobs to paint a picture
16 Very simple but challenging game: you only have two knobs to control the pen.
17 turn the knobs left knob to make the pen go up and down, use the right one
18 to make the pen go left and right. you already figured it out: complex figures
19 need complex turning.
20
021
=== added file 'debian/copyright'
--- debian/copyright 1970-01-01 00:00:00 +0000
+++ debian/copyright 2012-01-22 01:21:23 +0000
@@ -0,0 +1,49 @@
1Format: http://dep.debian.net/deps/dep5
2Upstream-Name: magictouch
3Upstream-Contact: Benedikt Seidl <Benedikt.Seidl@gmx.de>
4Source: https://www.libavg.de/svn/trunk/avg_media/mtc/magictouch
5
6Files: *
7Copyright: 2011 Benedikt Seidl <Benedikt.Seidl@gmx.de>
8License: GPL-3+
9 This program is free software: you can redistribute it and/or modify
10 it under the terms of the GNU General Public License as published by
11 the Free Software Foundation, either version 3 of the License, or
12 (at your option) any later version.
13 .
14 This program is distributed in the hope that it will be useful,
15 but WITHOUT ANY WARRANTY; without even the implied warranty of
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17 GNU General Public License for more details.
18 .
19 On Debian systems, the full text of the GNU General Public
20 License version 3 can be found in the file
21 `/usr/share/common-licenses/GPL-3'.
22
23Files: debian/*
24Copyright: 2011 OXullo Intersecans <x@brainrapers.org>
25License: BSD-2-clause
26 Redistribution and use in source and binary forms, with or without modification, are
27 permitted provided that the following conditions are met:
28 .
29 1. Redistributions of source code must retain the above copyright notice, this list of
30 conditions and the following disclaimer.
31 .
32 2. Redistributions in binary form must reproduce the above copyright notice, this list
33 of conditions and the following disclaimer in the documentation and/or other
34 materials provided with the distribution.
35 .
36 THIS SOFTWARE IS PROVIDED BY OXullo Intersecans ``AS IS'' AND ANY EXPRESS OR IMPLIED
37 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
38 FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL OXullo Intersecans OR
39 CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
40 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
41 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
42 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
43 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
44 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
45 .
46 The views and conclusions contained in the software and documentation are those of the
47 authors and should not be interpreted as representing official policies, either
48 expressed or implied, of OXullo Intersecans.
49
050
=== added file 'debian/magictouch.6'
--- debian/magictouch.6 1970-01-01 00:00:00 +0000
+++ debian/magictouch.6 2012-01-22 01:21:23 +0000
@@ -0,0 +1,29 @@
1.\"Created with GNOME Manpages Editor Wizard
2.\"http://sourceforge.net/projects/gmanedit2
3.TH magictouch 6 "January 23, 2011" "" "TROff"
4
5.SH NAME
6magictouch \- A libavg based multitouch TRON clone
7
8.SH SYNOPSIS
9.B magictouch
10.RI [ options ]
11.br
12
13.SH DESCRIPTION
14Another old arcade classic.
15
16This is a multitouch version of TRON for up to four players.
17Each player commands a line of light. It's speed is fixed, but turns left and right are
18possible by pressing one of two buttons. If you run into another line, you lose.
19
20.SH OPTIONS
21.B
22.TP
23\fB\-r \fIWIDTHxHEIGHT\fR
24Explicitly set a resolution. The default behavior is to use the screen's resolution
25.TP
26\fB\-w\fR
27Run in window mode. Default is fullscreen
28
29
030
=== added file 'debian/magictouch.desktop'
--- debian/magictouch.desktop 1970-01-01 00:00:00 +0000
+++ debian/magictouch.desktop 2012-01-22 01:21:23 +0000
@@ -0,0 +1,10 @@
1[Desktop Entry]
2Version=0.1
3Type=Application
4Terminal=false
5Name=MagicTouch
6Icon=magictouch
7GenericName=MagicTouch
8Exec=magictouch
9Categories=Game;
10Comment=Retro game goes multitouch: use two knobs to paint a picture
011
=== added file 'debian/magictouch.install'
--- debian/magictouch.install 1970-01-01 00:00:00 +0000
+++ debian/magictouch.install 2012-01-22 01:21:23 +0000
@@ -0,0 +1,2 @@
1debian/magictouch.xpm /usr/share/pixmaps
2debian/magictouch.desktop /usr/share/applications
03
=== added file 'debian/magictouch.xpm'
--- debian/magictouch.xpm 1970-01-01 00:00:00 +0000
+++ debian/magictouch.xpm 2012-01-22 01:21:23 +0000
@@ -0,0 +1,244 @@
1/* XPM */
2static char * magictouch_xpm[] = {
3"32 32 209 2",
4" c None",
5". c #A21818",
6"+ c #A01414",
7"@ c #950E0E",
8"# c #A31515",
9"$ c #9F1313",
10"% c #A21414",
11"& c #9D1212",
12"* c #970F0F",
13"= c #A31414",
14"- c #9A1111",
15"; c #940E0E",
16"> c #A21A1A",
17", c #9B1111",
18"' c #B01717",
19") c #A61313",
20"! c #A61515",
21"~ c #A71616",
22"{ c #A81919",
23"] c #A91C1C",
24"^ c #AA1E1E",
25"/ c #AB2222",
26"( c #A42424",
27"_ c #AF2D2D",
28": c #B03232",
29"< c #B23838",
30"[ c #B54040",
31"} c #AC4141",
32"| c #B94C4C",
33"1 c #BC5252",
34"2 c #BE5858",
35"3 c #C05F5F",
36"4 c #C16161",
37"5 c #C96666",
38"6 c #B76060",
39"7 c #B76161",
40"8 c #C26767",
41"9 c #C16666",
42"0 c #C46969",
43"a c #B86565",
44"b c #A41414",
45"c c #A51111",
46"d c #A51010",
47"e c #AB1111",
48"f c #9C0F0F",
49"g c #AD1111",
50"h c #C26565",
51"i c #C26969",
52"j c #A41212",
53"k c #A41D1D",
54"l c #A23535",
55"m c #A13636",
56"n c #A23636",
57"o c #9A3333",
58"p c #9E3535",
59"q c #A03636",
60"r c #A03535",
61"s c #A53737",
62"t c #AD4E4E",
63"u c #A34A4A",
64"v c #AC4E4E",
65"w c #AD4D4D",
66"x c #AE3838",
67"y c #9B1414",
68"z c #AF1C1C",
69"A c #A81212",
70"B c #9D0F0F",
71"C c #A32E2E",
72"D c #AB3939",
73"E c #7C6C6C",
74"F c #7C7575",
75"G c #7B7474",
76"H c #766E6E",
77"I c #7B7373",
78"J c #827A7A",
79"K c #766F6F",
80"L c #A74B4B",
81"M c #AD4747",
82"N c #B86262",
83"O c #A31616",
84"P c #9B0F0F",
85"Q c #A61E1E",
86"R c #7C7474",
87"S c #939393",
88"T c #9C9C9C",
89"U c #999999",
90"V c #9B9B9B",
91"W c #B76262",
92"X c #9A9A9A",
93"Y c #989898",
94"Z c #9D9D9D",
95"` c #969696",
96" . c #7B7B7B",
97".. c #A34949",
98"+. c #B11B1B",
99"@. c #9E9E9E",
100"#. c #848383",
101"$. c #7D7C7C",
102"%. c #A4A4A4",
103"&. c #B65252",
104"*. c #C86969",
105"=. c #797171",
106"-. c #A1A1A1",
107";. c #959595",
108">. c #AA4D4D",
109",. c #A31010",
110"'. c #B66060",
111"). c #9F9F9F",
112"!. c #868585",
113"~. c #979797",
114"{. c #B65D5D",
115"]. c #B01A1A",
116"^. c #A01313",
117"/. c #9F3535",
118"(. c #807F7F",
119"_. c #7E7D7D",
120":. c #7A7272",
121"<. c #A71010",
122"[. c #B55C5C",
123"}. c #980F0F",
124"|. c #A01010",
125"1. c #A43737",
126"2. c #8B8A8A",
127"3. c #AB4D4D",
128"4. c #818080",
129"5. c #7A7373",
130"6. c #AF1313",
131"7. c #8A8989",
132"8. c #949494",
133"9. c #837B7B",
134"0. c #B14C4C",
135"a. c #828181",
136"b. c #A0A0A0",
137"c. c #7F7777",
138"d. c #A71111",
139"e. c #9D3434",
140"f. c #858484",
141"g. c #B74545",
142"h. c #A81717",
143"i. c #AB3B3B",
144"j. c #A11010",
145"k. c #A2A2A2",
146"l. c #797272",
147"m. c #888787",
148"n. c #898888",
149"o. c #A3A3A3",
150"p. c #A73838",
151"q. c #A93030",
152"r. c #838282",
153"s. c #787171",
154"t. c #A21010",
155"u. c #7D6D6D",
156"v. c #827171",
157"w. c #9A3232",
158"x. c #A62525",
159"y. c #807777",
160"z. c #A11F1F",
161"A. c #A61010",
162"B. c #A62F2F",
163"C. c #766666",
164"D. c #817979",
165"E. c #807878",
166"F. c #9F0F0F",
167"G. c #A51515",
168"H. c #A21D1D",
169"I. c #A83838",
170"J. c #9B1C1C",
171"K. c #AE1111",
172"L. c #AC1111",
173"M. c #9E0F0F",
174"N. c #A91010",
175"O. c #9E1616",
176"P. c #A74343",
177"Q. c #D9CCCC",
178"R. c #CEC1C1",
179"S. c #DDBABA",
180"T. c #9F1010",
181"U. c #E3D5D5",
182"V. c #D8B6B6",
183"W. c #A41010",
184"X. c #6C5454",
185"Y. c #AAAAAA",
186"Z. c #E0D2D2",
187"`. c #A81010",
188" + c #6D5555",
189".+ c #A91111",
190"++ c #695252",
191"@+ c #A81414",
192"#+ c #652828",
193"$+ c #6B5353",
194"%+ c #725959",
195"&+ c #A14141",
196"*+ c #AA1111",
197"=+ c #6A2A2A",
198"-+ c #A34242",
199";+ c #AE1212",
200">+ c #990F0F",
201",+ c #A81515",
202"'+ c #9E1111",
203")+ c #9A0F0F",
204"!+ c #A21111",
205"~+ c #9E1010",
206"{+ c #AE1313",
207"]+ c #A61111",
208"^+ c #9C1515",
209"/+ c #AB1919",
210"(+ c #9A1010",
211"_+ c #9B1212",
212":+ c #A41919",
213" . + @ # # # # # @ @ @ $ # # % # @ # & * = $ # - ; . ",
214" > , ' ) ! ~ { ] ^ / ( _ : < [ } | 1 2 3 4 5 6 7 8 9 0 a b > ",
215" # c d d e f d d e d d d d g f d f d d d d d d d d d d h i & ",
216". j d d d k l m n o p n o q n r p s o t t t u u v w x d d h a y ",
217"z A B d C D E F G H F F F F I J H F F F J F F K F E L M d f N O ",
218"# P d Q n R F S T U T U T T T T T T T T V T T T S F H t x d W # ",
219"# c d l E F T T X Y Z T T ` S T V T Y T T T U T U .F E ..d W +.",
220"# c f n F S T @.T #.#.#.$.T S S S T S U S T T T T %.T F &.f *.# ",
221"# c f r =.-.T T #.#.S T #.#.T %.;.U #.#.Y @.T T T T U F >.,.'.# ",
222"# B d n R T T $.#.T -.Z Y $.S T #.#.T ).!.T ~.T T T T F u d {.].",
223"^.c ,./.F T T S (.#.S T S #._.~.T #.S T #.T T T ` %.S :.t <.[.}.",
224"# |.d 1.F T T T T #.#.#.;.S T T Y #.Y T 2.Y S T T T T F 3.d 3 # ",
225"# c d n F X T T T Z ` T #.#.T T #.4.T T #.T T T T U T 5.t d 2 # ",
226"# 6.d n F S T S T T T T $.#.S #.T T T 7.#.T 8.V X T T 9.u B 0.# ",
227"# c d o F T T T T S T ~.#.Y U T T #.a.#.T b.T T %.T T c.n d | @ ",
228"# d.d e.R T T S @.T ` ).#.).T T f.T T T ` ` @.S T T T F o d g.h.",
229"@ P d n R T 8.%.;.V S @.#.T %.).#.2.S U T %.b.S T T T I n d i.^.",
230"# c j.n F T @.%.S T 8.T f.#.T b.U (.#.#.U T T T ;.k.T F n d < # ",
231"# c |.D l.S T S T ).T T ~.#.m.T S T n.#.T o.T T S T ;.I p.d q.# ",
232"# 6.d n F S T T Y T S T b.` $.r.#.2.$.T T S 8.X Z Y U s.o d _ # ",
233"# c t.l u.F ;.S X T T ;.T ~.S ` T T T T T %.Y ~.Z T 9.v.w.d x.# ",
234"# c d k n y.K T T ;.T Z T T T T ` S T T T S T T Z F R o k d z.@ ",
235"# P e A.B.e.C.=.F H J D.F F F K E.F F R F F F F 5.E n C d F.^ # ",
236"G.c d d d H.w.n I.n r n n n o 1.m D n 1.n n o n n l J.d f d ] # ",
237"# c K.d d d d t.d d ,.d d f L.f f d M.,.<.f d t.d d d d N.d O.# ",
238"+.c d d d P.Q.R.S.L.d ,.d t.t.e B T.d d t.M.d P.U.Q.V.j.t.d ~ # ",
239"# c d W.d X.%.Y.Z.|.K.d ,.d d d d f `.d W.d d +%.Y.Q.d F.T.! # ",
240"O T..+d d X.Y.k.Q.d B L.d d t.d d d d d f M.`.++Y.Y.Q.F.d d @+O ",
241". j d K.d #+$+%+&+*+f d d d d d d g K.d f ,.d =+X.X.-+f d ;+>+. ",
242" + c W.d .+d <.d d f `.`.e d d f f d d ,.d `.f d d d d d c # ",
243" > ,+'+)+!+.+c ~+c 6.c P T.c T.f {+P P c c !+c c c c ]+j b > ",
244" ^+; # & - @ # # # # # /+# # }.@ # (+# # # _+# # O :+ "};
0245
=== added file 'debian/pyversions'
--- debian/pyversions 1970-01-01 00:00:00 +0000
+++ debian/pyversions 2012-01-22 01:21:23 +0000
@@ -0,0 +1,1 @@
12.6-
02
=== added file 'debian/rules'
--- debian/rules 1970-01-01 00:00:00 +0000
+++ debian/rules 2012-01-22 01:21:23 +0000
@@ -0,0 +1,23 @@
1#!/usr/bin/make -f
2
3override_dh_auto_install:
4 dh_auto_install -- --install-lib /usr/share/games --install-script /usr/games/
5
6override_dh_installman:
7 dh_installman debian/magictouch.6
8
9REV=$(shell dpkg-parsechangelog | sed -rne 's,^Version: .*[+~]svn([0-9]+).*,\1,p')
10VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
11get-packaged-orig-source:
12 rm -rf magictouch-$(VER).orig
13 svn -q export -r $(REV) https://www.libavg.de/svn/trunk/avg_media/mtc/magictouch \
14 magictouch-$(VER).orig
15 # Delete DFSG incompatible fonts
16 rm -r magictouch-$(VER).orig/magictouch/fonts
17 GZIP=--best tar -cz --owner root --group root --mode a+rX \
18 -f magictouch_$(VER).orig.tar.gz \
19 magictouch-$(VER).orig
20 rm -r magictouch-$(VER).orig
21
22%:
23 dh $@
024
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format 1970-01-01 00:00:00 +0000
+++ debian/source/format 2012-01-22 01:21:23 +0000
@@ -0,0 +1,1 @@
13.0 (quilt)
02
=== added file 'debian/watch'
--- debian/watch 1970-01-01 00:00:00 +0000
+++ debian/watch 2012-01-22 01:21:23 +0000
@@ -0,0 +1,1 @@
1# This package has no upstream releases
02
=== removed directory 'magictouch/fonts'
=== removed file 'magictouch/fonts/DejaVuSans-ExtraLight.ttf'
1Binary files magictouch/fonts/DejaVuSans-ExtraLight.ttf 2011-02-04 01:30:34 +0000 and magictouch/fonts/DejaVuSans-ExtraLight.ttf 1970-01-01 00:00:00 +0000 differ3Binary files magictouch/fonts/DejaVuSans-ExtraLight.ttf 2011-02-04 01:30:34 +0000 and magictouch/fonts/DejaVuSans-ExtraLight.ttf 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches