r16012 - in packages/trunk/funguloids/debian: . source

Markus Koschany apo at moszumanska.debian.org
Thu Aug 17 23:04:36 UTC 2017


Author: apo
Date: 2017-08-17 23:04:35 +0000 (Thu, 17 Aug 2017)
New Revision: 16012

Added:
   packages/trunk/funguloids/debian/source/lintian-overrides
Removed:
   packages/trunk/funguloids/debian/funguloids.menu
   packages/trunk/funguloids/debian/funguloids.xpm
Modified:
   packages/trunk/funguloids/debian/changelog
   packages/trunk/funguloids/debian/compat
   packages/trunk/funguloids/debian/control
   packages/trunk/funguloids/debian/copyright
   packages/trunk/funguloids/debian/funguloids.install
   packages/trunk/funguloids/debian/rules
Log:
Release funguloids 1.06-13


Modified: packages/trunk/funguloids/debian/changelog
===================================================================
--- packages/trunk/funguloids/debian/changelog	2017-08-17 20:18:29 UTC (rev 16011)
+++ packages/trunk/funguloids/debian/changelog	2017-08-17 23:04:35 UTC (rev 16012)
@@ -1,3 +1,18 @@
+funguloids (1.06-13) unstable; urgency=medium
+
+  * Team upload.
+  * Declare compliance with Debian Policy 4.0.1.
+  * Switch to compat level 10.
+  * Drop deprecated menu file and xpm icon.
+  * debian/rules: Make the build reproducible.
+    Thanks to Reiner Herrmann for the report and patch. (Closes: #827124)
+  * Rebuild funguloids against the latest version of Ogre to fix the FTBFS.
+    (Closes: #853408)
+  * Clarify ConvertUTF license and link to upstream's DFSG-free license.
+  * Override Lintian error about non-free ConvertUTF license.
+
+ -- Markus Koschany <apo at debian.org>  Fri, 18 Aug 2017 00:18:07 +0200
+
 funguloids (1.06-12) unstable; urgency=low
 
   [ Fabian Greffrath ]

Modified: packages/trunk/funguloids/debian/compat
===================================================================
--- packages/trunk/funguloids/debian/compat	2017-08-17 20:18:29 UTC (rev 16011)
+++ packages/trunk/funguloids/debian/compat	2017-08-17 23:04:35 UTC (rev 16012)
@@ -1 +1 @@
-9
+10

Modified: packages/trunk/funguloids/debian/control
===================================================================
--- packages/trunk/funguloids/debian/control	2017-08-17 20:18:29 UTC (rev 16011)
+++ packages/trunk/funguloids/debian/control	2017-08-17 23:04:35 UTC (rev 16012)
@@ -6,8 +6,7 @@
  Paul Wise <pabs at debian.org>
 Build-Depends:
  autoconf-archive,
- debhelper (>= 9),
- dh-autoreconf,
+ debhelper (>= 10),
  libalut-dev,
  liblua5.1-0-dev,
  libmad0-dev,
@@ -20,9 +19,9 @@
  python
 Build-Conflicts:
  libboost-date-time1.49-dev (<< 1.49.0-4~)
-Standards-Version: 3.9.4
+Standards-Version: 4.0.1
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/funguloids/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/funguloids/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/funguloids/
 Homepage: http://funguloids.sourceforge.net
 
 Package: funguloids

Modified: packages/trunk/funguloids/debian/copyright
===================================================================
--- packages/trunk/funguloids/debian/copyright	2017-08-17 20:18:29 UTC (rev 16011)
+++ packages/trunk/funguloids/debian/copyright	2017-08-17 23:04:35 UTC (rev 16012)
@@ -69,3 +69,7 @@
 	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 	DEALINGS IN THE SOFTWARE.
+
+Copyright and License for include/SimpleIni/ConvertUTF.*
+ These files are now covered by the DFSG-free Unicode license. See
+ http://www.unicode.org/copyright.html#Exhibit1 for more information.

Modified: packages/trunk/funguloids/debian/funguloids.install
===================================================================
--- packages/trunk/funguloids/debian/funguloids.install	2017-08-17 20:18:29 UTC (rev 16011)
+++ packages/trunk/funguloids/debian/funguloids.install	2017-08-17 23:04:35 UTC (rev 16012)
@@ -1,3 +1,2 @@
 debian/funguloids.desktop usr/share/applications
-debian/funguloids.xpm usr/share/pixmaps
 usr/games

Deleted: packages/trunk/funguloids/debian/funguloids.menu
===================================================================
--- packages/trunk/funguloids/debian/funguloids.menu	2017-08-17 20:18:29 UTC (rev 16011)
+++ packages/trunk/funguloids/debian/funguloids.menu	2017-08-17 23:04:35 UTC (rev 16012)
@@ -1,6 +0,0 @@
-?package(funguloids):needs="X11" \
- section="Games/Action" \
- title="Funguloids" \
- longtitle="Those Funny Funguloids!" \
- icon="/usr/share/pixmaps/funguloids.xpm" \
- command="/usr/games/funguloids >/dev/null 2>&1"

Deleted: packages/trunk/funguloids/debian/funguloids.xpm
===================================================================
--- packages/trunk/funguloids/debian/funguloids.xpm	2017-08-17 20:18:29 UTC (rev 16011)
+++ packages/trunk/funguloids/debian/funguloids.xpm	2017-08-17 23:04:35 UTC (rev 16012)
@@ -1,248 +0,0 @@
-/* XPM */
-static char *funguloids[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 210 2 ",
-"   c #010000",
-".  c #0B0402",
-"X  c #070806",
-"o  c #0A0906",
-"O  c #0B0B09",
-"+  c #160703",
-"@  c #1D0700",
-"#  c #130B04",
-"$  c #190B04",
-"%  c #120D0B",
-"&  c #171106",
-"*  c #10120E",
-"=  c #18130D",
-"-  c #1F180A",
-";  c #0D181C",
-":  c #141511",
-">  c #1A1D17",
-",  c #270D04",
-"<  c #2C0C02",
-"1  c #240F09",
-"2  c #340E04",
-"3  c #3C0D01",
-"4  c #331407",
-"5  c #3D1006",
-"6  c #351508",
-"7  c #3E160A",
-"8  c #371C0B",
-"9  c #3C1908",
-"0  c #231C17",
-"q  c #341E16",
-"w  c #3A1E14",
-"e  c #1F221A",
-"r  c #2D291A",
-"t  c #3C3015",
-"y  c #1C2C33",
-"u  c #2A2E26",
-"i  c #312B29",
-"p  c #2E3325",
-"a  c #32362C",
-"s  c #333829",
-"d  c #273734",
-"f  c #2B3B36",
-"g  c #263639",
-"h  c #373B30",
-"j  c #400F02",
-"k  c #451102",
-"l  c #4B1505",
-"z  c #431A0B",
-"x  c #4D1A09",
-"c  c #521606",
-"v  c #541907",
-"b  c #5B1907",
-"n  c #541708",
-"m  c #531B0A",
-"M  c #5B1C09",
-"N  c #5B1E11",
-"B  c #631D0A",
-"V  c #6C1F0B",
-"C  c #43200C",
-"Z  c #56220D",
-"A  c #5C250D",
-"S  c #5A280E",
-"D  c #442113",
-"F  c #4D2216",
-"G  c #4D2219",
-"H  c #532314",
-"J  c #5C2D13",
-"K  c #572718",
-"L  c #552B18",
-"P  c #5C3216",
-"I  c #5D341A",
-"U  c #64250E",
-"Y  c #6B210C",
-"T  c #74230F",
-"R  c #7B250F",
-"E  c #682F14",
-"W  c #722410",
-"Q  c #7C2913",
-"!  c #653115",
-"~  c #633419",
-"^  c #793014",
-"/  c #552626",
-"(  c #512928",
-")  c #4E2B32",
-"_  c #532E34",
-"`  c #4F3939",
-"'  c #39483C",
-"]  c #524620",
-"[  c #564C2C",
-"{  c #404537",
-"}  c #444B38",
-"|  c #484D3F",
-" . c #56453B",
-".. c #4B533E",
-"X. c #58563E",
-"o. c #736335",
-"O. c #4E4541",
-"+. c #494C42",
-"@. c #4A4B4F",
-"#. c #574E4F",
-"$. c #4E5541",
-"%. c #525B46",
-"&. c #53574B",
-"*. c #555B4A",
-"=. c #585C4F",
-"-. c #514452",
-";. c #515250",
-":. c #566047",
-">. c #5D664D",
-",. c #5F694F",
-"<. c #5F6754",
-"1. c #5F6950",
-"2. c #7C754C",
-"3. c #636C54",
-"4. c #656D5A",
-"5. c #696F5E",
-"6. c #657054",
-"7. c #6B765B",
-"8. c #6D785B",
-"9. c #717C5F",
-"0. c #4E537A",
-"q. c #486F75",
-"w. c #607260",
-"e. c #6B7961",
-"r. c #697F6B",
-"t. c #707763",
-"y. c #727A65",
-"u. c #767C6A",
-"i. c #787E6C",
-"p. c #80260E",
-"a. c #832B12",
-"s. c #8A2D15",
-"d. c #883115",
-"f. c #8D3B1B",
-"g. c #94341A",
-"h. c #933F29",
-"j. c #993F29",
-"k. c #8D4423",
-"l. c #97512B",
-"z. c #935E2F",
-"x. c #955A33",
-"c. c #A64027",
-"v. c #A0432C",
-"b. c #A34B36",
-"n. c #AC4B30",
-"m. c #A85231",
-"M. c #A65F34",
-"N. c #8F6433",
-"B. c #896F3A",
-"V. c #99743C",
-"C. c #BF5D45",
-"Z. c #8E7A40",
-"A. c #937C43",
-"S. c #B46341",
-"D. c #BE624D",
-"F. c #B47742",
-"G. c #AB7E54",
-"H. c #D2735D",
-"J. c #768163",
-"K. c #7B8668",
-"L. c #7E886B",
-"P. c #7D8472",
-"I. c #75887A",
-"U. c #928146",
-"Y. c #93804A",
-"T. c #9D905D",
-"R. c #A08F50",
-"E. c #AE8D5B",
-"W. c #BB925D",
-"Q. c #808675",
-"!. c #818873",
-"~. c #838978",
-"^. c #898F7D",
-"/. c #8C9677",
-"(. c #8E9A7B",
-"). c #AA9A62",
-"_. c #B09B61",
-"`. c #B9A966",
-"'. c #CBA55F",
-"]. c #C19669",
-"[. c #C0A979",
-"{. c #C8B674",
-"}. c #C7B876",
-"|. c #CAB975",
-" X c #D6C27C",
-".X c #58698B",
-"XX c #5C7E9E",
-"oX c #5475AC",
-"OX c #5E819D",
-"+X c #71908C",
-"@X c #6C949F",
-"#X c #5981AE",
-"$X c #5886BC",
-"%X c #5CABF5",
-"&X c #939D83",
-"*X c #9BA38E",
-"=X c #9FA98A",
-"-X c #9FA890",
-";X c #A0AB8D",
-":X c #B0B393",
-">X c #B3BD97",
-",X c #B8C4A5",
-"<X c #CCC28F",
-"1X c #D3CB8A",
-"2X c #CCD7B5",
-"3X c #E9E2BC",
-"4X c #D4DBC7",
-"5X c #E7EED8",
-"6X c #F1F6D5",
-"7X c None",
-/* pixels */
-"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X",
-"7X7X7X7X7X7X7X7X7X7X7X7X                7X7X7X7X7X7X7X7X7X7X7X7X",
-"7X7X7X7X7X7X7X7X7X7X        . . . X         7X7X7X7X7X7X7X7X7X7X",
-"7X7X7X7X7X7X7X7X7X    . 4 7 z F D w q 0 O       7X7X7X7X7X7X7X7X",
-"7X7X7X7X7X7X7X      $ z Z J I I I G F  .;.i %       7X7X7X7X7X7X",
-"7X7X7X7X7X7X      , x S I P P J I L G #.OXXX at .u     7X7X7X7X7X7X",
-"7X7X7X7X7X    . 2 x J I I I P P J J G -.$X%X#XO.=     7X7X7X7X7X",
-"7X7X7X7X7X    4 v S I P P P J I J J K ) 0.oX.X` w X   7X7X7X7X7X",
-"7X7X7X7X7X  + m v Z P P J P I ~ A M M N / _ ( F H 1     7X7X7X7X",
-"7X7X7X7X    < c v v S J ! ! E U b b V V B B B Y W m .   7X7X7X7X",
-"7X7X7X    # l v M l x A M M b B V Y W Q a.R a.d.s.T +   7X7X7X7X",
-"7X7X7X    8 m Z S l l M b B Y Q h.b.v.g.g.M.W.E.N.S .   7X7X7X7X",
-"7X7X7X    C l x x l b b Y Q j.D.H.D.m.F.'. X}.R.] &     7X7X7X7X",
-"7X7X7X    9 l 3 j v Y R s.g.c.n.S.W.<X1X X{.Z.t X     7X7X7X7X7X",
-"7X7X7X    < 3 3 c V p.a.f.l.G.[.3X6X2X:X).o.-       7X7X7X7X7X7X",
-"7X7X7X    , j b T k.z.V.A.2.>X2X5X4X-Xi.r .     7X7X7X7X7X7X7X7X",
-"7X7X7X7X  . b R x._.`.|.T.X.&X*X&XL.4.%.>     7X7X7X7X7X7X7X7X7X",
-"7X7X7X7X    5 ^ B.U.A.A.[ r ;.3.<.7.u.y.=.:     7X7X7X7X7X7X7X7X",
-"7X7X7X7X      $ & # o o   X { <.y.P.~.P.P.+.O   7X7X7X7X7X7X7X7X",
-"7X7X7X7X7X                  a <.i.Q.P.P.i.<.d     7X7X7X7X7X7X7X",
-"7X7X7X7X7X7X7X7X7X7X7X7X    > &.5.u.t.4.1.w.q.;   7X7X7X7X7X7X7X",
-"7X7X7X7X7X7X7X7X7X7X7X7X7X  X h $.*.<.6.6.I. at Xy   7X7X7X7X7X7X7X",
-"7X7X7X7X7X7X7X7X7X7X7X7X7X    e | 4.P.y.6.e.+Xg   7X7X7X7X7X7X7X",
-"7X7X7X7X7X7X7X7X7X7X7X7X7X7X  : &.i.!.8.8.7.r.f     7X7X7X7X7X7X",
-"7X7X7X7X7X7X7X7X7X7X7X7X7X7X  O | 4.8.9.K.J.7.'     7X7X7X7X7X7X",
-"7X7X7X7X7X7X7X7X7X7X7X7X7X7X    p :.6.9.(.(.8.%.O   7X7X7X7X7X7X",
-"7X7X7X7X7X7X7X7X7X7X7X7X7X7X    > ..1.8.=X,XL.3.:   7X7X7X7X7X7X",
-"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X  o s 1.8.(.=XL.$.O   7X7X7X7X7X7X",
-"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X    O } 1.>.>.a o     7X7X7X7X7X7X",
-"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X    O : * o       7X7X7X7X7X7X7X",
-"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X            7X7X7X7X7X7X7X7X7X",
-"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X"
-};

Modified: packages/trunk/funguloids/debian/rules
===================================================================
--- packages/trunk/funguloids/debian/rules	2017-08-17 20:18:29 UTC (rev 16011)
+++ packages/trunk/funguloids/debian/rules	2017-08-17 23:04:35 UTC (rev 16012)
@@ -8,42 +8,39 @@
   CXXFLAGS += -DDISABLE_MOUSE_CAPTURE
 endif
 
-debian/funguloids.xpm: bin/funguloids.png
-	convert $^ -resize 32x32 $@
-
 %:
-	dh $@ --parallel --with autoreconf
+	dh $@
 
 override_dh_auto_configure:
 	LIBS="$(LIBS)" CXXFLAGS="$(CXXFLAGS)" dh_auto_configure -- --with-fmod=no
-	
+
 	chmod +x debian/mpak.py
-	
+
 	if test ! -e bin/bootstrap.mpk.orig ; then \
 		cp bin/bootstrap.mpk bin/bootstrap.mpk.orig ; \
 		./debian/mpak.py -e -f bin/bootstrap.mpk  -p _bootstrap ; \
 		sed -ri '/^[A-Z]/ s/(.*)/overlay \1/' _bootstrap/*.overlay ; \
-		./debian/mpak.py -c -f bin/bootstrap.mpk  _bootstrap/* ; \
+		./debian/mpak.py -c -f bin/bootstrap.mpk $$(LC_ALL=C ls _bootstrap/*) ; \
 		rm -rf _bootstrap ; \
 	fi
-	
+
 	if test ! -e bin/funguloids.mpk.orig ; then \
 		cp bin/funguloids.mpk bin/funguloids.mpk.orig ; \
 		./debian/mpak.py -e -f bin/funguloids.mpk -p _gamedata ; \
 		sed -ri '/^[A-Z]/ s/(.*)/overlay \1/' _gamedata/*.overlay ; \
 		sed -ri '/^[A-Z]/ s/(.*)/particle_system \1/' _gamedata/*.particle ; \
 		sed -ri 's/^(\t\t\t)(texture_unit) 1/\1\2\n\1{\n\1}\n\1\2/' _gamedata/materials.material ; \
-		./debian/mpak.py -c -f bin/funguloids.mpk _gamedata/* ; \
+		./debian/mpak.py -c -f bin/funguloids.mpk $$(LC_ALL=C ls _gamedata/*) ; \
 		rm -rf _gamedata ; \
 	fi
 
 override_dh_auto_clean:
 	dh_auto_clean
-	
+
 	if test -e bin/bootstrap.mpk.orig ; then \
 		mv bin/bootstrap.mpk.orig bin/bootstrap.mpk ; \
 	fi
-	
+
 	if test -e bin/funguloids.mpk.orig ; then \
 		mv bin/funguloids.mpk.orig bin/funguloids.mpk ; \
 	fi

Added: packages/trunk/funguloids/debian/source/lintian-overrides
===================================================================
--- packages/trunk/funguloids/debian/source/lintian-overrides	                        (rev 0)
+++ packages/trunk/funguloids/debian/source/lintian-overrides	2017-08-17 23:04:35 UTC (rev 16012)
@@ -0,0 +1,3 @@
+# https://bugs.debian.org/864729
+# http://www.unicode.org/copyright.html#Exhibit1
+license-problem-convert-utf-code




More information about the Pkg-games-commits mailing list