r4698 - in packages/trunk/etw/debian: . patches

Barry deFreese bddebian-guest at alioth.debian.org
Sat Nov 17 15:24:04 UTC 2007


Author: bddebian-guest
Date: 2007-11-17 15:24:04 +0000 (Sat, 17 Nov 2007)
New Revision: 4698

Added:
   packages/trunk/etw/debian/etw-data.install
   packages/trunk/etw/debian/etw.install
Removed:
   packages/trunk/etw/debian/etw.png.uu
Modified:
   packages/trunk/etw/debian/changelog
   packages/trunk/etw/debian/control
   packages/trunk/etw/debian/etw.desktop
   packages/trunk/etw/debian/patches/200_datadir.diff
   packages/trunk/etw/debian/rules
Log:
  * New upstream release
  * Reconfigure build system
  * Add get-orig-source target in debian/rules
  * Remove deprecated encoding field from desktop file
  * Update 200_datadir.diff for new upstream
  * Add myself to uploaders
  * Remove XS- from VCS fields in control


Modified: packages/trunk/etw/debian/changelog
===================================================================
--- packages/trunk/etw/debian/changelog	2007-11-16 21:22:22 UTC (rev 4697)
+++ packages/trunk/etw/debian/changelog	2007-11-17 15:24:04 UTC (rev 4698)
@@ -1,10 +1,17 @@
-etw (3.0.svn20071018-2) UNRELEASED; urgency=low
+etw (3.2+svn125-1) UNRELEASED; urgency=low
 
   [ Barry deFreese ]
   * Add watch file
   * Bump debhelper build-dep to match compat
   * Add homepage field in control
   * Add simple man page
+  * New upstream release
+  * Reconfigure build system
+  * Add get-orig-source target in debian/rules
+  * Remove deprecated encoding field from desktop file
+  * Update 200_datadir.diff for new upstream
+  * Add myself to uploaders
+  * Remove XS- from VCS fields in control
 
  -- Barry deFreese <bddebian at comcast.net>  Mon, 29 Oct 2007 22:22:52 -0400
 

Modified: packages/trunk/etw/debian/control
===================================================================
--- packages/trunk/etw/debian/control	2007-11-16 21:22:22 UTC (rev 4697)
+++ packages/trunk/etw/debian/control	2007-11-17 15:24:04 UTC (rev 4698)
@@ -2,12 +2,12 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
+Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Barry deFreese <bddebian at comcast.net>
 Build-Depends: debhelper (>= 5.0), quilt, libgtk2.0-dev, libsdl1.2-dev, sharutils
 Standards-Version: 3.7.2
 Homepage: http://www.ggsoft.org/etw/
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/etw/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/etw/?op=log
+Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/etw/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/etw/?op=log
 
 Package: etw
 Architecture: any

Added: packages/trunk/etw/debian/etw-data.install
===================================================================
--- packages/trunk/etw/debian/etw-data.install	                        (rev 0)
+++ packages/trunk/etw/debian/etw-data.install	2007-11-17 15:24:04 UTC (rev 4698)
@@ -0,0 +1 @@
+data/* usr/share/games/etw

Modified: packages/trunk/etw/debian/etw.desktop
===================================================================
--- packages/trunk/etw/debian/etw.desktop	2007-11-16 21:22:22 UTC (rev 4697)
+++ packages/trunk/etw/debian/etw.desktop	2007-11-17 15:24:04 UTC (rev 4698)
@@ -1,13 +1,12 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
-Name=ETW
+Name=Eat The Whistle
 GenericName=Soccer Game
 GenericName[fr]=Jeu de football
 GenericName[ro]=Joc de fotbal
 Comment=Arcade Soccer Game
 Comment[ro]=Fotbal, joc de arcadă
-Icon=etw.png
+Icon=etw
 TryExec=etw
 Exec=etw
 Terminal=false

Added: packages/trunk/etw/debian/etw.install
===================================================================
--- packages/trunk/etw/debian/etw.install	                        (rev 0)
+++ packages/trunk/etw/debian/etw.install	2007-11-17 15:24:04 UTC (rev 4698)
@@ -0,0 +1,5 @@
+etw/etw usr/games/
+debian/etw.xpm usr/share/games/etw/
+debian/etw.xpm usr/share/pixmaps/
+debian/etw.desktop usr/share/applications/
+

Deleted: packages/trunk/etw/debian/etw.png.uu
===================================================================
--- packages/trunk/etw/debian/etw.png.uu	2007-11-16 21:22:22 UTC (rev 4697)
+++ packages/trunk/etw/debian/etw.png.uu	2007-11-17 15:24:04 UTC (rev 4698)
@@ -1,62 +0,0 @@
-begin 644 etw.png
-MB5!.1PT*&@H````-24A$4@```#`````P"`8```!7`OF'````!F)+1T0`_P#_
-M`/^@O:>3````"7!(67,```N)```+B0$WR<NM````!W1)344'U`4<#PP-3 at SG
-M0@``"<))1$%4>-KMF6UL)'4=QS\M(]D^F'3+SD#OQ8$TTG;_C03:2TSLA6E`
-M30![\:Z[C2]\`!+$%B(:O1!>M,.],3E]`UX+08Q&C4EW[R%W&$0D[M067GB0
-M0.CL at UKI'<C)S%SW-,=U8U;'%__]S^ZVO;MM;>$-OV0RT\[,[O?W]/T]+'PL
-M'\N6Y;9GL9JW^O*QU#$S"`+KW7?>S00U8IIF`*C#JASF#NDPM>DWLHM9RW7=
-M8".Q+*L6_$:'M<T>"!I^.`@"\W+`:R63R:SUPHXITK`"01"8P29E9GKF:DID
-MCJ6.F3NN0!`$F6"+LE8)$1?!Q/A$L,:3YHXID$@D,I9E!9G,EG4()L8G`F`C
-MX/^W$E=3(*,L9UG6EA5P73=H)'>VHL1MSQ)<CD;-[:(^7=<;>L[SO,Q6/K_Y
-M,N`SVTEWC2BAZSI!$&2V0X$I/CHQLXO935&LUI$@Z!J$<Z^!5@;_Q$?>(4S=
-M\*`T8K0;5HO0$I4WBDOR7"I"I/*_YDA4 at H]$X<+"]B+Q/&_3[_2)/@9WR?1;
-M+1*>BTL2>*D(G_I\30A%.J&C&P9WF90O\WWCX^-;4L!W_2V]-Q0WB73"!67Q
-ME:K5.[KA[=]#UV!%`>6>H;B)::XGGDPFTS"3U,K3,T]C/6'Q\,3#FW[W?E,:
-MK*-;AD^D4X*/=%:?*?ZMD@,JQB)1,$T3V[8!$''!D>DC&RIU)3F:/HIE63A9
-MIYJ9ILEH8G13K'5A26(JK=3?*ZU(Q2XL0?3FB@=6BS`D[F!J:BK\PHR=N2SX
-MC6+[:/HH_:*?1#)!X<^%^HJ>3(2&:41LVZ;L52T>Z:S$?R64ZEBHN"0?&. at R
-MPY"YFM5U76?>GJ=7].*[/HEDHL[BY7)YW3O#P\.XKMM0.,[-S5%V)6"5"XIU
-ME*A$;HYVU[M)"-&0E?::>YFWY]>!OY(,F\,-,5.MMRXLR9!1TM%=[XEF14];
-MD;>R;S4,'L#).B23R8854,Q36I$U02D4Z81OWVE5:70KO<M6Q;;M33%3J2@!
-MKU9JP)`P>?L'`?MW2Z;26J+0,OCAEEK/\\@Y.0!B1JS.:&N373'.RT]FV*V)
-M=89N+B[)*O?DRT]\>`W/%4AB;FXNO(Y$X=$[+8JI at -V:P'=]=%VORR.MUE4?
-M%OC^>#^Y;*ZR)9#6[!6]=9X8?<SDT;NF&. at RR3DY^D1?G?65!T,%7CMG[W at C
-M*N*"F2,S5?`U(>79TJJ_==-$XO#X[3/$M!B>Y]$G^O`\+P0>,V+A9S2K!FG!
-ML1D>'MY4 at B5'DYM2()U*KP._5O:),9+))+Y7[:..IX\#,&_/XWM^G:>NB0BL
-M2%0JD7]AF=.G3W.]<3U[]NRY:B)>^N`20 at B6EY>ORN_I5)KSWOFK*GG^DL?>
-M/7>P6[^)UK96:?5LCK;6-EK;6FEM:X4FN/&F&_E5_H?5 at 282A?9*;HU/C%^Q
-M]'N>Q[P]3RZ;HS_>3SJ59F9Z!A$7&X9-.I6FF<:6@">=67IT$7:SGN>QU]P;
-MYD#,B-6S$%1;T_9;0-.KI7^M517P>7N^GA(KBF3L##/3,^&]B?&)38$O>`[[
-MQ%@X%\2,6,@\"KQJT1<<:>"FCH1<3=3V&OX)*'M5Z_F>OZGA9"W5-2HGL[/\
-M:/Q(:'T%N/9\MNPP^M0PI15I^&8%7-%HJ0B?_IX$[V0=%K+VIL%L!?RD-8GK
-MNCR7?B:,>]_UPV1^Z5R*^V>2C#XU',X(`->T#V!I+:"U5)706H!NCW_]!?[1
-MMLSG;AK>,6IUL at Y'IH_P=^'P[J5E7EG.T$030W&3F!$C9L3X[HM)?O'BSUDU
-MEOE$BRR\E321"G0-0KE4:85+LG%J;H-_7RM9 at 2;HU?MW!/RAZ4F^>-\P!<]A
-M1$A:/GDZ3<%W^-U?TWSGF0G.>LM$.N'B>]6YN*53&KJI(T%0VZ*J,>[<:]25
-M]!LUP4'ST+:!G[0FB0A)&@K\*2<5,E#!<];-`)'.:NL?[9:XZG)`]=UJ?:&:
-MJ=]8&71#I^`YVP+^T,PD9PPGG#UZ=$'!=4+P94\>%Q;DJJ>VE58>4!BUL,>N
-M*-(2K=^]/'2[Q4"7R>'1ZSEX=)R\M\B^^%A#0&?3LR$MESUP'(<EY$QPQG$D
-M:$.$YUZ]G[RWR"DO1?LM4"I+'!<KT:#V5QW=<AX&T)3E0^VB]8P$D'-RY+(Y
-M.C%P79>OVP<8B2<Y8(ZMX_$W[$4<QUDWZ-QJ"MI-B'A0<)WP^=KPV9<8(^\M
-M<K>>Y-<S*2)Q*!<@]F7Y&6I_55J!(E()K79LJQTM57MQU]`=^`6?P_8DSUL9
-MGDL_0Q$/)^N02A^@[$EP/;H at E4[5QVP<>@S!&=TA4O&$RJ.7SLWR1D&&3:_>
-M#P(.VY/T&#*,VDT9/F5#AI"R?$NTLN1:`6Z&:VX8D3_W:"U07I5N&MQELO_6
-M;_"\E>&?9U=I;6LE?R;+V>6SO.K]@:_LN8^OW7T_B_R).^\9YM5EF[?;'#0#
-M6O?`?C/);?<(EG#XYCV/X'_ at TF,(8FT&KRQGH`GF<G88\[U&/QV7#'++#H9A
-MT-P&[USKX)^`_WX`UUX'UWU&,J1B(JT%/KD+FFYX4%9BE2B__&HF'!YJRW<N
-MF^,\[[.0M<-8!4FO,3W&P?1X&`HC(DG!=39,>@5:6?JX+;W6C6`L,18RE*;+
-MO%%,I0A%[88BG96]D`+?O6J2/1 at PT&7BNSY]HH\^T1>6<(!3V508O[5UX:?V
-M-*?&_Q at RB4K*$9'DH'DH!#TBDJ%2O7H_CN-0=N'QA'SFF#W+,;N:^)H.)8=P
-MY=E2L^A2:T?MWB^9/#0PQ6Y-U+4`ZKIVF.C$8,1,LI"UZ[K'?6*,[Z>_5;6R
-M(=;=5W**%#V&X*0SRQ(.^TU9O"("!()?3Z<H>Q)\>X_,`67]VNUTN!?ZR;TR
-M9-2R2M?U=2VK[_KTBEX>&[58R-H,Q<TZL#VZ+'(%KTJ+O7I_Z*V\MTB/+LA[
-MBW0C[[^>=B at Y58H];J=(I5)$A$Q^@+)6\8`KCU*Q6L#J?N#(.WGF[7GV)_:'
-MLZ;*`>6)O)/']WSVQ<=8R-K$X_%0D?.\SV%[,LR!!\R),&Q4N)S,SI)*R7A_
-M/>TPD!!T(^@U^GGAS5G*+F@&7+2EY36]LHT>DO&N&?5>4,O=)M=U at UK`ON>'
-M`[::/VNO\TX^5.IGV1]S7_P13F9GV1<?XX'T`0Z:AUAT%M$JKG_3EL6K1Q>4
-M/3A at CJ'ITBMEMYK$RA,=0[("M_=4SK?(\-(_6ZT#ZH>/Z,W0%`1!4`OT>/HX
-M??&^,/[5WZJMC>DQ?,^G2?\/B:>J7>H7=B5YZ;U4.$^TFY)95#R7O4K+4$GB
-M at NN$2EZTH2,!G)/AXY^0"H2*:56/J'Y(A=+_``_/1(KN>-,W`````$E%3D2N
-#0F""
-`
-end

Modified: packages/trunk/etw/debian/patches/200_datadir.diff
===================================================================
--- packages/trunk/etw/debian/patches/200_datadir.diff	2007-11-16 21:22:22 UTC (rev 4697)
+++ packages/trunk/etw/debian/patches/200_datadir.diff	2007-11-17 15:24:04 UTC (rev 4698)
@@ -1,7 +1,6 @@
-Index: etw-3.0.svn20071018/etw/include/os_defs.h
-===================================================================
---- etw-3.0.svn20071018.orig/etw/include/os_defs.h	2007-10-18 11:09:17.000000000 +0000
-+++ etw-3.0.svn20071018/etw/include/os_defs.h	2007-10-18 11:12:40.000000000 +0000
+diff -urN etw-3.2+svn125.orig/etw/include/os_defs.h etw-3.2+svn125/etw/include/os_defs.h
+--- etw-3.2+svn125.orig/etw/include/os_defs.h	2007-11-17 00:07:37.000000000 -0500
++++ etw-3.2+svn125/etw/include/os_defs.h	2007-11-17 00:08:33.000000000 -0500
 @@ -29,7 +29,7 @@
  #ifndef AMIGA
  extern char *TEMP_DIR;

Modified: packages/trunk/etw/debian/rules
===================================================================
--- packages/trunk/etw/debian/rules	2007-11-16 21:22:22 UTC (rev 4697)
+++ packages/trunk/etw/debian/rules	2007-11-17 15:24:04 UTC (rev 4698)
@@ -2,9 +2,6 @@
 # -*- makefile -*-
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -53,49 +50,53 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k -i 
-	dh_installdirs -i usr/share/games/etw/intro usr/share/doc/etw-data
-	cp -r data/* `pwd`/debian/etw-data/usr/share/games/etw/
-	ln -s etw-data `pwd`/debian/etw/usr/share/doc/etw
 	dh_install -i
 
 install-arch:
 	dh_testdir
 	dh_testroot
-	dh_clean -k -s 
-	dh_installdirs -s usr/games usr/share/doc
-	dh_install -petw etw/etw /usr/games
-	dh_install -petw debian/etw.xpm /usr/share/games/etw/
-	uudecode debian/etw.png.uu -o debian/etw.png
-	dh_install -petw debian/etw.png /usr/share/pixmaps/
-	rm -f debian/etw.png
-	dh_install -petw debian/etw.desktop /usr/share/applications/
-	dh_install -s
+	dh_clean -k -a
+	dh_install -a
 
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -p etw ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-	dh_installman debian/etw.6
-	dh_desktop -petw
-	dh_link
-	dh_strip
-	dh_compress 
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+binary-indep: build install
+	dh_testdir -i
+	dh_testroot -i
+	dh_installchangelogs -i ChangeLog
+	dh_installdocs -i
+	dh_strip -i
+	dh_compress -i 
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
-binary-indep: build-indep install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+binary-arch: build install
+	dh_testdir -a
+	dh_testroot -a
+	dh_installchangelogs -a ChangeLog
+	dh_installdocs -a
+	dh_installmenu -a
+	dh_desktop -a
+	dh_installman -a debian/etw.6
+	dh_strip -a
+	dh_compress -a 
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
-binary-arch: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+get-orig-source:
+	URL="https://etw.svn.sourceforge.net/svnroot/etw/trunk"
+	REV=$$(svn info $$URL | grep Revision: | cut -d\  -f2) && \
+	DIR="etw-3.2+svn$$REV" && \
+	svn export $$URL $$DIR && \
+	find ./ -name .cvsignore |xargs rm -rf && \
+	tar czf etw_3.2+svn$$REV.dfsg.orig.tar.gz $$DIR && \
+	rm -rf $$DIR
 
 binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+.PHONY: build clean binary-indep binary-arch binary install configure get-orig-source




More information about the Pkg-games-commits mailing list