Merge lp:~libavg-team/multitetris/packaging.cleanup into lp:~libavg-team/multitetris/packaging

[OXullo Intersecans]

Cleanup rfr

[Chase Douglas (chasedouglas)]

Add a reference to the common debian gpl license file. Otherwise, everything looks good!

review: Needs Fixing

[lp:~libavg-team/multitetris/packaging.cleanup]

40. By OXullo Intersecans on 2011-03-18

Fix debian common licenses statement on copyright file

[OXullo Intersecans (oxullo)]

Fixed!

review: Needs Resubmitting

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-10 19:31:55 +0000
+++ debian/changelog	2011-03-18 11:33:29 +0000
@@ -1,5 +1,5 @@
 multitetris (1.0+svn5599-0ubuntu1) UNRELEASED; urgency=low
 
-  * Initial release. (LP: #XXXXXX)
+  * Initial release. (LP: #735777)
 
- -- OXullo Intersecans <[e-mail]>  Sun, 20 Feb 2011 15:24:17 +0100
+ -- OXullo Intersecans <[e-mail]>  Tue, 15 Mar 2011 23:22:47 +0100

=== modified file 'debian/copyright'
--- debian/copyright	2011-03-10 19:31:55 +0000
+++ debian/copyright	2011-03-18 11:33:29 +0000
@@ -1,25 +1,51 @@
-This package was debianized by OXullo Intersecans <[e-mail]> on Wed, 20 Feb 2011 15:28:30 +0100
-
-It was downloaded from: www.libavg.de 
-
-Upstream Author(s): Ka-Ping Yee, Martin Heistermann, Ulrich von Zadow
-
-Copyright:
- Copyright (C) 2009
- Ka-Ping Yee <[e-mail]>
-
-License:
- multitet is free software: you can redistribute and/or modify it under the
- terms of the GNU General Public License as published by the Free Software
- Foundation (either version 3, or, at your option, any later version).
-
- multitet 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 details.
- You should have received a copy of the GNU General Public License along
- with multitet.  If not, see <http://www.gnu.org/licenses/>  or
- /usr/share/common-licenses/GPL-3
-
-Packaging:
-        Copyright (C) 2011 by OXullo Intersecans <[e-mail]>
-        released under BSD license
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: multitetris
+Upstream-Contact: Ka-Ping Yee <[e-mail]>
+Source: https://www.libavg.de/svn/trunk/avg_media/mtc/multitet
+
+Files: *
+Copyright: 2009 Ka-Ping Yee <[e-mail]>
+           2009 Martin Heistermann <[e-mail]>
+           2011 Ulrich von Zadow <[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.
+

=== modified file 'debian/rules'
--- debian/rules	2011-03-10 19:31:55 +0000
+++ debian/rules	2011-03-18 11:33:29 +0000
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-DH_VERBOSE=1
-
 override_dh_auto_install:
 	dh_auto_install -- --install-lib /usr/share/games --install-script /usr/games/