--- a/application/data/PodcastClient_common.rls	Mon Jul 26 17:36:44 2010 +0100
+++ b/application/data/PodcastClient_common.rls	Wed Sep 15 13:21:10 2010 +0100
@@ -23,4 +23,4 @@
 rls_string STRING_r_caption "Podcatcher"
 rls_string STRING_r_short_caption "Podcatcher"
 
-rls_string STRING_r_about_text_s60 "Podcatcher 1.00\n© 2007-2010 Sebastian Brannstrom, Lars Persson, Anders Fridlund, EmbedDev AB"
+rls_string STRING_r_about_text_s60 "Podcatcher 1.00(%d)\n© 2007-2010 Sebastian Brannstrom, Lars Persson, Anders Fridlund, EmbedDev AB"

--- a/application/data/PodcastStrings.ra	Mon Jul 26 17:36:44 2010 +0100
+++ b/application/data/PodcastStrings.ra	Wed Sep 15 13:21:10 2010 +0100
@@ -75,5 +75,6 @@
 RESOURCE TBUF r_reset_db_query {buf = STRING_r_podcast_setting_reset_db_query;}
 
 RESOURCE TBUF r_error_disk_full {buf = STRING_r_error_disk_full; }
+RESOURCE TBUF r_about_text {buf = STRING_r_about_text_s60;}
 RESOURCE TBUF r_error_playback_failed {buf = STRING_r_error_playback_failed; }
 RESOURCE TBUF r_podcast_searchfeed_prompt {buf = STRING_r_search_feed_prompt;}

--- a/application/group/Podcast.mmp	Mon Jul 26 17:36:44 2010 +0100
+++ b/application/group/Podcast.mmp	Wed Sep 15 13:21:10 2010 +0100
@@ -17,7 +17,7 @@
  */
   
 // MPX integration can not be enabled for self signed versions 
-#define ENABLE_MPX_INTEGRATION
+//#define ENABLE_MPX_INTEGRATION
 
 TARGET			Podcast.exe
 TARGETTYPE  	exe

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/application/inc/buildno.h	Wed Sep 15 13:21:10 2010 +0100
@@ -0,0 +1,2 @@
+// Build number generated by increment_buildno.py, do not edit manually
+#define BUILD_NO 2
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/application/sis/buildno.txt	Wed Sep 15 13:21:10 2010 +0100
@@ -0,0 +1,1 @@
+2
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/application/sis/increment_buildno.py	Wed Sep 15 13:21:10 2010 +0100
@@ -0,0 +1,54 @@
+import os;
+
+BUILDNO_FILE = 'buildno.txt'
+
+PKG_FILE_UDEB_TEMPLATE = 'podcatcher_udeb_template.pkg'
+PKG_FILE_UDEB = 'podcatcher_udeb.pkg'
+PKG_FILE_UREL_TEMPLATE = 'podcatcher_urel_template.pkg'
+PKG_FILE_UREL = 'podcatcher_urel.pkg'
+HEADER_FILE = '..\\inc\\buildno.h'
+BUILDNO_TAG = 'BUILDNO'
+
+def update_buildno(buildno_file):
+	#read previous build number
+	f = open(buildno_file, 'r')
+	buildno = int(f.read())
+	f.close()
+	
+	# increment build number and write it back to the file
+	buildno = buildno + 1
+	buildno_str = '%d' % buildno
+
+	print 'New build number is %d' % buildno
+	
+	f = open(buildno_file, 'w')
+	f.write(buildno_str)
+	f.close()
+	return buildno
+	
+def update_pkg(pkg_template, pkg_file, buildno):
+	print 'Writing %s' % pkg_file
+	#update 'build' number in PKG file
+	f = open (pkg_template, 'r')
+	g = open (pkg_file, 'w')
+	
+	buildno_str = '%d' % buildno
+
+	for line in f:
+		line = line.replace(BUILDNO_TAG, buildno_str)
+		g.write(line)
+		
+def update_header(header_file, buildno):
+	print 'Writing %s' % header_file
+	buildno_str = '// Build number generated by increment_buildno.py, do not edit manually\r\n#define BUILD_NO %d' % buildno
+	
+	f = open(header_file, 'w')
+	f.write(buildno_str)
+	f.close()
+	return buildno
+
+new_buildno = update_buildno(BUILDNO_FILE)
+update_pkg(PKG_FILE_UDEB_TEMPLATE, PKG_FILE_UDEB, new_buildno)
+update_pkg(PKG_FILE_UREL_TEMPLATE, PKG_FILE_UREL, new_buildno)
+update_header(HEADER_FILE, new_buildno)
+print 'Remember to rebuild to get the build number into the about dialog!'
\ No newline at end of file

--- a/application/sis/podcatcher_udeb.pkg	Mon Jul 26 17:36:44 2010 +0100
+++ b/application/sis/podcatcher_udeb.pkg	Wed Sep 15 13:21:10 2010 +0100
@@ -1,13 +1,18 @@
-&EN
+&EN,SP
 :"Symbian Foundation"
-%{"Podcatcher"}
-#{"Podcatcher"},(0xA0009D00), 1, 00, 0, TYPE=SA
+%{"Podcatcher","Podcatcher"}
+#{"Podcatcher","Podcatcher"},(0xA0009D00), 1, 00, 2, TYPE=SA
 
 ;Supports Symbian^3
-[0x20022E6D], 0, 0, 0, {"Series60ProductID"}
+[0x20022E6D], 0, 0, 0, {"Series60ProductID","Series60ProductID"}
 
 ; resources
-"\epoc32\data\z\resource\apps\Podcast.RSC"-"!:\resource\apps\Podcast.rsc"
+{
+"\epoc32\data\z\resource\apps\Podcast.r01"
+"\epoc32\data\z\resource\apps\Podcast.r04"
+}
+-"!:\resource\apps\Podcast.rsc"
+
 "\epoc32\data\z\resource\apps\Podcast.mif"-"!:\resource\apps\Podcast.mif"
 "\epoc32\data\z\private\10003a3f\import\apps\Podcast_reg.rsc"-"!:\private\10003a3f\import\apps\Podcast_reg.rsc"
 "..\help\podcatcher.hlp"-"!:\resource\help\podcatcher.hlp"

Binary file application/sis/podcatcher_udeb.sis has changed

Binary file application/sis/podcatcher_udeb_signed.sis has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/application/sis/podcatcher_udeb_template.pkg	Wed Sep 15 13:21:10 2010 +0100
@@ -0,0 +1,31 @@
+&EN,SP
+:"Symbian Foundation"
+%{"Podcatcher","Podcatcher"}
+#{"Podcatcher","Podcatcher"},(0xA0009D00), 1, 00, BUILDNO, TYPE=SA
+
+;Supports Symbian^3
+[0x20022E6D], 0, 0, 0, {"Series60ProductID","Series60ProductID"}
+
+; resources
+{
+"\epoc32\data\z\resource\apps\Podcast.r01"
+"\epoc32\data\z\resource\apps\Podcast.r04"
+}
+-"!:\resource\apps\Podcast.rsc"
+
+"\epoc32\data\z\resource\apps\Podcast.mif"-"!:\resource\apps\Podcast.mif"
+"\epoc32\data\z\private\10003a3f\import\apps\Podcast_reg.rsc"-"!:\private\10003a3f\import\apps\Podcast_reg.rsc"
+"..\help\podcatcher.hlp"-"!:\resource\help\podcatcher.hlp"
+
+; configuration and DB
+"../../engine/config/defaultfeeds.xml"-"c:\private\A0009D00\defaultfeeds.xml"
+"../../engine/config/podcatcher.sqlite"-"c:\private\A0009D00\podcatcher.sqlite.template"
+
+; backup
+"./backup_registration.xml" - "c:\private\A0009D00\backup_registration.xml"
+
+; app DLL
+"\epoc32\release\gcce\udeb\podcastengine.dll"-"!:\sys\bin\podcastengine.dll"
+
+; application UI - note that FR,RI does not work when SIS is self signed
+"\epoc32\release\gcce\udeb\Podcast.exe"-"!:\sys\bin\Podcast.exe",FR,RI

--- a/application/sis/podcatcher_urel.pkg	Mon Jul 26 17:36:44 2010 +0100
+++ b/application/sis/podcatcher_urel.pkg	Wed Sep 15 13:21:10 2010 +0100
@@ -1,16 +1,18 @@
-&EN
+&EN,SP
 :"Symbian Foundation"
-%{"Podcatcher"}
-#{"Podcatcher"},(0xA0009D00), 1, 00, 0, TYPE=SA
+%{"Podcatcher","Podcatcher"}
+#{"Podcatcher","Podcatcher"},(0xA0009D00), 0, 90, 2, TYPE=SA
 
-;Supports S60 3rd edition
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;Supports Symbian^1
-[0x1028315F], 0, 0, 0, {"Series60ProductID"}
+;Supports Symbian^3
+[0x20022E6D], 0, 0, 0, {"Series60ProductID","Series60ProductID"}
 
 ; resources
-"\epoc32\data\z\resource\apps\Podcast.RSC"-"!:\resource\apps\Podcast.rsc"
+{
+"\epoc32\data\z\resource\apps\Podcast.r01"
+"\epoc32\data\z\resource\apps\Podcast.r04"
+}
+-"!:\resource\apps\Podcast.rsc"
+
 "\epoc32\data\z\resource\apps\Podcast.mif"-"!:\resource\apps\Podcast.mif"
 "\epoc32\data\z\private\10003a3f\import\apps\Podcast_reg.rsc"-"!:\private\10003a3f\import\apps\Podcast_reg.rsc"
 "..\help\podcatcher.hlp"-"!:\resource\help\podcatcher.hlp"
@@ -23,7 +25,7 @@
 "./backup_registration.xml" - "c:\private\A0009D00\backup_registration.xml"
 
 ; app DLL
-;"\epoc32\release\gcce\urel\podcastengine.dll"-"!:\sys\bin\podcastengine.dll"
+"\epoc32\release\gcce\urel\podcastengine.dll"-"!:\sys\bin\podcastengine.dll"
 
 ; application UI - note that FR,RI does not work when SIS is self signed
 "\epoc32\release\gcce\urel\Podcast.exe"-"!:\sys\bin\Podcast.exe",FR,RI

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/application/sis/podcatcher_urel_template.pkg	Wed Sep 15 13:21:10 2010 +0100
@@ -0,0 +1,31 @@
+&EN,SP
+:"Symbian Foundation"
+%{"Podcatcher","Podcatcher"}
+#{"Podcatcher","Podcatcher"},(0xA0009D00), 0, 90, BUILDNO, TYPE=SA
+
+;Supports Symbian^3
+[0x20022E6D], 0, 0, 0, {"Series60ProductID","Series60ProductID"}
+
+; resources
+{
+"\epoc32\data\z\resource\apps\Podcast.r01"
+"\epoc32\data\z\resource\apps\Podcast.r04"
+}
+-"!:\resource\apps\Podcast.rsc"
+
+"\epoc32\data\z\resource\apps\Podcast.mif"-"!:\resource\apps\Podcast.mif"
+"\epoc32\data\z\private\10003a3f\import\apps\Podcast_reg.rsc"-"!:\private\10003a3f\import\apps\Podcast_reg.rsc"
+"..\help\podcatcher.hlp"-"!:\resource\help\podcatcher.hlp"
+
+; configuration and DB
+"../../engine/config/defaultfeeds.xml"-"c:\private\A0009D00\defaultfeeds.xml"
+"../../engine/config/podcatcher.sqlite"-"c:\private\A0009D00\podcatcher.sqlite.template"
+
+; backup
+"./backup_registration.xml" - "c:\private\A0009D00\backup_registration.xml"
+
+; app DLL
+"\epoc32\release\gcce\urel\podcastengine.dll"-"!:\sys\bin\podcastengine.dll"
+
+; application UI - note that FR,RI does not work when SIS is self signed
+"\epoc32\release\gcce\urel\Podcast.exe"-"!:\sys\bin\Podcast.exe",FR,RI

--- a/application/src/PodcastListView.cpp	Mon Jul 26 17:36:44 2010 +0100
+++ b/application/src/PodcastListView.cpp	Wed Sep 15 13:21:10 2010 +0100
@@ -31,6 +31,8 @@
 #include <barsread.h>
 #include <akntitle.h>
 
+#include "buildno.h"
+
 const TInt KDefaultGran = 5;
 
 CPodcastListContainer::CPodcastListContainer()
@@ -320,6 +322,11 @@
 void CPodcastListView::RunAboutDialogL()
 {
 	CAknNoteDialog* dlg = new(ELeave) CAknNoteDialog();
+	HBufC *aboutTextTemplate = iEikonEnv->AllocReadResourceLC(R_ABOUT_TEXT);
+	TBuf<255> aboutText;
+	aboutText.Format(*aboutTextTemplate, BUILD_NO);
+	dlg->SetTextL(aboutText);
+	CleanupStack::PopAndDestroy(aboutTextTemplate);
 	dlg->ExecuteLD(R_DLG_ABOUT);
 }
 

--- a/engine/group/engine.mmp	Mon Jul 26 17:36:44 2010 +0100
+++ b/engine/group/engine.mmp	Wed Sep 15 13:21:10 2010 +0100
@@ -17,7 +17,7 @@
  */
  
 // MPX integration can not be enabled for self signed versions 
-#define ENABLE_MPX_INTEGRATION
+//#define ENABLE_MPX_INTEGRATION
  
 TARGET podcastengine.dll
 TARGETTYPE DLL