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

[Chase Douglas]

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 :).

[OXullo Intersecans (oxullo)]

Nifty! thanks as usual!

review: Approve

=== 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 @@
+magictouch (0.1+svn6821+dfsg-0ubuntu2) UNRELEASED; urgency=low
+
+  * Remove DFSG incompatible fonts
+  * Rename debian/rules rule get-orig-source to get-packaged-orig-source
+
+ -- Chase Douglas <[e-mail]>  Sat, 21 Jan 2012 17:04:03 -0800
+
+magictouch (0.1+svn6821-0ubuntu1) precise; urgency=low
+
+  * Initial release. (LP: #735764)
+
+ -- OXullo Intersecans <[e-mail]>  Wed, 07 Dec 2011 23:06:29 +0100

=== 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 @@
+7

=== 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 @@
+Source: magictouch
+Section: games
+Priority: optional
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: OXullo Intersecans <[e-mail]>
+Vcs-Bzr: http://bazaar.launchpad.net/~libavg-team/magictouch/packaging
+Vcs-Browser: http://bazaar.launchpad.net/~libavg-team/magictouch/packaging/files
+Build-Depends: debhelper (>= 7.0.50~), python-support, python (>=2.6)
+Standards-Version: 3.9.2
+XS-Python-Version: >= 2.6
+
+Package: magictouch
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}, python-libavg (>= 1.7.0), ttf-dejavu-extra
+Description: Retro game goes multitouch: use two knobs to paint a picture
+ Very simple but challenging game: you only have two knobs to control the pen.
+ turn the knobs left knob to make the pen go up and down, use the right one
+ to make the pen go left and right. you already figured it out: complex figures
+ need complex turning.
+

=== 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 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: magictouch
+Upstream-Contact: Benedikt Seidl <[e-mail]>
+Source: https://www.libavg.de/svn/trunk/avg_media/mtc/magictouch
+
+Files: *
+Copyright: 2011 Benedikt Seidl <[e-mail]>
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+
+Files: debian/*
+Copyright: 2011 OXullo Intersecans <[e-mail]>
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without modification, are
+ permitted provided that the following conditions are met:
+ . 
+ 1. Redistributions of source code must retain the above copyright notice, this list of
+    conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright notice, this list
+    of conditions and the following disclaimer in the documentation and/or other
+    materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY OXullo Intersecans ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL OXullo Intersecans OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ .
+ The views and conclusions contained in the software and documentation are those of the
+ authors and should not be interpreted as representing official policies, either 
+ expressed or implied, of OXullo Intersecans.
+

=== 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 @@
+.\"Created with GNOME Manpages Editor Wizard
+.\"http://sourceforge.net/projects/gmanedit2
+.TH magictouch 6 "January 23, 2011" "" "TROff"
+
+.SH NAME
+magictouch \- A libavg based multitouch TRON clone
+
+.SH SYNOPSIS
+.B magictouch
+.RI [ options ]
+.br
+
+.SH DESCRIPTION
+Another old arcade classic.
+
+This is a multitouch version of TRON for up to four players.
+Each player commands a line of light. It's speed is fixed, but turns left and right are
+possible by pressing one of two buttons. If you run into another line, you lose.
+
+.SH OPTIONS
+.B
+.TP
+\fB\-r \fIWIDTHxHEIGHT\fR
+Explicitly set a resolution. The default behavior is to use the screen's resolution
+.TP
+\fB\-w\fR
+Run in window mode. Default is fullscreen
+
+

=== 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 @@
+[Desktop Entry]
+Version=0.1
+Type=Application
+Terminal=false
+Name=MagicTouch
+Icon=magictouch
+GenericName=MagicTouch
+Exec=magictouch
+Categories=Game;
+Comment=Retro game goes multitouch: use two knobs to paint a picture

=== 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 @@
+debian/magictouch.xpm   /usr/share/pixmaps
+debian/magictouch.desktop   /usr/share/applications

=== 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 @@
+/* XPM */
+static char * magictouch_xpm[] = {
+"32 32 209 2",
+"  	c None",
+". 	c #A21818",
+"+ 	c #A01414",
+"@ 	c #950E0E",
+"# 	c #A31515",
+"$ 	c #9F1313",
+"% 	c #A21414",
+"& 	c #9D1212",
+"* 	c #970F0F",
+"= 	c #A31414",
+"- 	c #9A1111",
+"; 	c #940E0E",
+"> 	c #A21A1A",
+", 	c #9B1111",
+"' 	c #B01717",
+") 	c #A61313",
+"! 	c #A61515",
+"~ 	c #A71616",
+"{ 	c #A81919",
+"] 	c #A91C1C",
+"^ 	c #AA1E1E",
+"/ 	c #AB2222",
+"( 	c #A42424",
+"_ 	c #AF2D2D",
+": 	c #B03232",
+"< 	c #B23838",
+"[ 	c #B54040",
+"} 	c #AC4141",
+"| 	c #B94C4C",
+"1 	c #BC5252",
+"2 	c #BE5858",
+"3 	c #C05F5F",
+"4 	c #C16161",
+"5 	c #C96666",
+"6 	c #B76060",
+"7 	c #B76161",
+"8 	c #C26767",
+"9 	c #C16666",
+"0 	c #C46969",
+"a 	c #B86565",
+"b 	c #A41414",
+"c 	c #A51111",
+"d 	c #A51010",
+"e 	c #AB1111",
+"f 	c #9C0F0F",
+"g 	c #AD1111",
+"h 	c #C26565",
+"i 	c #C26969",
+"j 	c #A41212",
+"k 	c #A41D1D",
+"l 	c #A23535",
+"m 	c #A13636",
+"n 	c #A23636",
+"o 	c #9A3333",
+"p 	c #9E3535",
+"q 	c #A03636",
+"r 	c #A03535",
+"s 	c #A53737",
+"t 	c #AD4E4E",
+"u 	c #A34A4A",
+"v 	c #AC4E4E",
+"w 	c #AD4D4D",
+"x 	c #AE3838",
+"y 	c #9B1414",
+"z 	c #AF1C1C",
+"A 	c #A81212",
+"B 	c #9D0F0F",
+"C 	c #A32E2E",
+"D 	c #AB3939",
+"E 	c #7C6C6C",
+"F 	c #7C7575",
+"G 	c #7B7474",
+"H 	c #766E6E",
+"I 	c #7B7373",
+"J 	c #827A7A",
+"K 	c #766F6F",
+"L 	c #A74B4B",
+"M 	c #AD4747",
+"N 	c #B86262",
+"O 	c #A31616",
+"P 	c #9B0F0F",
+"Q 	c #A61E1E",
+"R 	c #7C7474",
+"S 	c #939393",
+"T 	c #9C9C9C",
+"U 	c #999999",
+"V 	c #9B9B9B",
+"W 	c #B76262",
+"X 	c #9A9A9A",
+"Y 	c #989898",
+"Z 	c #9D9D9D",
+"` 	c #969696",
+" .	c #7B7B7B",
+"..	c #A34949",
+"+.	c #B11B1B",
+"@.	c #9E9E9E",
+"#.	c #848383",
+"$.	c #7D7C7C",
+"%.	c #A4A4A4",
+"&.	c #B65252",
+"*.	c #C86969",
+"=.	c #797171",
+"-.	c #A1A1A1",
+";.	c #959595",
+">.	c #AA4D4D",
+",.	c #A31010",
+"'.	c #B66060",
+").	c #9F9F9F",
+"!.	c #868585",
+"~.	c #979797",
+"{.	c #B65D5D",
+"].	c #B01A1A",
+"^.	c #A01313",
+"/.	c #9F3535",
+"(.	c #807F7F",
+"_.	c #7E7D7D",
+":.	c #7A7272",
+"<.	c #A71010",
+"[.	c #B55C5C",
+"}.	c #980F0F",
+"|.	c #A01010",
+"1.	c #A43737",
+"2.	c #8B8A8A",
+"3.	c #AB4D4D",
+"4.	c #818080",
+"5.	c #7A7373",
+"6.	c #AF1313",
+"7.	c #8A8989",
+"8.	c #949494",
+"9.	c #837B7B",
+"0.	c #B14C4C",
+"a.	c #828181",
+"b.	c #A0A0A0",
+"c.	c #7F7777",
+"d.	c #A71111",
+"e.	c #9D3434",
+"f.	c #858484",
+"g.	c #B74545",
+"h.	c #A81717",
+"i.	c #AB3B3B",
+"j.	c #A11010",
+"k.	c #A2A2A2",
+"l.	c #797272",
+"m.	c #888787",
+"n.	c #898888",
+"o.	c #A3A3A3",
+"p.	c #A73838",
+"q.	c #A93030",
+"r.	c #838282",
+"s.	c #787171",
+"t.	c #A21010",
+"u.	c #7D6D6D",
+"v.	c #827171",
+"w.	c #9A3232",
+"x.	c #A62525",
+"y.	c #807777",
+"z.	c #A11F1F",
+"A.	c #A61010",
+"B.	c #A62F2F",
+"C.	c #766666",
+"D.	c #817979",
+"E.	c #807878",
+"F.	c #9F0F0F",
+"G.	c #A51515",
+"H.	c #A21D1D",
+"I.	c #A83838",
+"J.	c #9B1C1C",
+"K.	c #AE1111",
+"L.	c #AC1111",
+"M.	c #9E0F0F",
+"N.	c #A91010",
+"O.	c #9E1616",
+"P.	c #A74343",
+"Q.	c #D9CCCC",
+"R.	c #CEC1C1",
+"S.	c #DDBABA",
+"T.	c #9F1010",
+"U.	c #E3D5D5",
+"V.	c #D8B6B6",
+"W.	c #A41010",
+"X.	c #6C5454",
+"Y.	c #AAAAAA",
+"Z.	c #E0D2D2",
+"`.	c #A81010",
+" +	c #6D5555",
+".+	c #A91111",
+"++	c #695252",
+"@+	c #A81414",
+"#+	c #652828",
+"$+	c #6B5353",
+"%+	c #725959",
+"&+	c #A14141",
+"*+	c #AA1111",
+"=+	c #6A2A2A",
+"-+	c #A34242",
+";+	c #AE1212",
+">+	c #990F0F",
+",+	c #A81515",
+"'+	c #9E1111",
+")+	c #9A0F0F",
+"!+	c #A21111",
+"~+	c #9E1010",
+"{+	c #AE1313",
+"]+	c #A61111",
+"^+	c #9C1515",
+"/+	c #AB1919",
+"(+	c #9A1010",
+"_+	c #9B1212",
+":+	c #A41919",
+"      . + @ # # # # # @ @ @ $ # # % # @ # & * = $ # - ; .       ",
+"  > , ' ) ! ~ { ] ^ / ( _ : < [ } | 1 2 3 4 5 6 7 8 9 0 a b >   ",
+"  # 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 &   ",
+". 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 ",
+"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 ",
+"# 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 # ",
+"# 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 +.",
+"# c f n F S T @.T #.#.#.$.T S S S T S U S T T T T %.T F &.f *.# ",
+"# c f r =.-.T T #.#.S T #.#.T %.;.U #.#.Y @.T T T T U F >.,.'.# ",
+"# B d n R T T $.#.T -.Z Y $.S T #.#.T ).!.T ~.T T T T F u d {.].",
+"^.c ,./.F T T S (.#.S T S #._.~.T #.S T #.T T T ` %.S :.t <.[.}.",
+"# |.d 1.F T T T T #.#.#.;.S T T Y #.Y T 2.Y S T T T T F 3.d 3 # ",
+"# 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 # ",
+"# 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.# ",
+"# c d o F T T T T S T ~.#.Y U T T #.a.#.T b.T T %.T T c.n d | @ ",
+"# d.d e.R T T S @.T ` ).#.).T T f.T T T ` ` @.S T T T F o d g.h.",
+"@ P d n R T 8.%.;.V S @.#.T %.).#.2.S U T %.b.S T T T I n d i.^.",
+"# c j.n F T @.%.S T 8.T f.#.T b.U (.#.#.U T T T ;.k.T F n d < # ",
+"# c |.D l.S T S T ).T T ~.#.m.T S T n.#.T o.T T S T ;.I p.d q.# ",
+"# 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 _ # ",
+"# c t.l u.F ;.S X T T ;.T ~.S ` T T T T T %.Y ~.Z T 9.v.w.d x.# ",
+"# 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.@ ",
+"# 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.^ # ",
+"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 ] # ",
+"# 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.# ",
+"+.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 ~ # ",
+"# c d W.d X.%.Y.Z.|.K.d ,.d d d d f `.d W.d d  +%.Y.Q.d F.T.! # ",
+"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 ",
+". j d K.d #+$+%+&+*+f d d d d d d g K.d f ,.d =+X.X.-+f d ;+>+. ",
+"  + c W.d .+d <.d d f `.`.e d d f f d d ,.d `.f d d d d d c #   ",
+"  > ,+'+)+!+.+c ~+c 6.c P T.c T.f {+P P c c !+c c c c ]+j b >   ",
+"      ^+; # & - @ # # # # # /+# # }.@ # (+# # # _+# # O :+      "};

=== 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 @@
+2.6-

=== 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 @@
+#!/usr/bin/make -f
+
+override_dh_auto_install:
+	dh_auto_install -- --install-lib /usr/share/games --install-script /usr/games/
+
+override_dh_installman:
+	dh_installman debian/magictouch.6
+
+REV=$(shell dpkg-parsechangelog | sed -rne 's,^Version: .*[+~]svn([0-9]+).*,\1,p')
+VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
+get-packaged-orig-source:
+	rm -rf magictouch-$(VER).orig
+	svn -q export -r $(REV) https://www.libavg.de/svn/trunk/avg_media/mtc/magictouch \
+                      magictouch-$(VER).orig
+	# Delete DFSG incompatible fonts
+	rm -r magictouch-$(VER).orig/magictouch/fonts
+	GZIP=--best tar -cz --owner root --group root --mode a+rX \
+                        -f magictouch_$(VER).orig.tar.gz \
+                        magictouch-$(VER).orig
+	rm -r magictouch-$(VER).orig
+
+%:
+	dh $@

=== 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 @@
+3.0 (quilt)

=== 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 @@
+# This package has no upstream releases

=== removed directory 'magictouch/fonts'
=== removed file 'magictouch/fonts/DejaVuSans-ExtraLight.ttf'
Binary 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