diff -u kaffeine-0.8.3/debian/changelog kaffeine-0.8.3/debian/changelog
--- kaffeine-0.8.3/debian/changelog
+++ kaffeine-0.8.3/debian/changelog
@@ -1,3 +1,12 @@
+kaffeine (0.8.3-1.1) unstable; urgency=low
+
+  * Non-maintainer version
+  * Display the programmed channel number in connection to the channel
+    name in the Electronic Program Guide [kaffeine/src/input/dvb/kevents.h,
+    kaffeine/src/input/dvb/kevents.cpp]
+
+ -- Joey Schulze <joey@infodrom.org>  Thu, 19 Jun 2008 11:57:45 +0200
+
 kaffeine (0.8.3-1) unstable; urgency=low
 
   * New upstream release
only in patch2:
unchanged:
--- kaffeine-0.8.3.orig/kaffeine/src/input/dvb/kevents.h
+++ kaffeine-0.8.3/kaffeine/src/input/dvb/kevents.h
@@ -41,7 +41,7 @@
 
 public:
 
-	EListViewItem( QListView *parent, QString chanName, QString eBegin, QString eDuration, QString eTitle, EventDesc *desc );
+	EListViewItem( QListView *parent, QString chanNr, QString chanName, QString eBegin, QString eDuration, QString eTitle, EventDesc *desc );
 	virtual int compare( QListViewItem *i, int col, bool ascending ) const;
 
 	EventDesc *event;
only in patch2:
unchanged:
--- kaffeine-0.8.3.orig/kaffeine/src/input/dvb/kevents.cpp
+++ kaffeine-0.8.3/kaffeine/src/input/dvb/kevents.cpp
@@ -35,7 +35,7 @@
 
 
 
-EListViewItem::EListViewItem( QListView *parent, QString chanName, QString eBegin, QString eDuration, QString eTitle, EventDesc *desc ) : KListViewItem( parent, chanName, eBegin, eDuration, eTitle )
+EListViewItem::EListViewItem( QListView *parent, QString chanNr, QString chanName, QString eBegin, QString eDuration, QString eTitle, EventDesc *desc ) : KListViewItem( parent, chanNr, chanName, eBegin, eDuration, eTitle )
 {
 	event = desc;
 }
@@ -82,6 +82,7 @@
 	grid->addLayout( hbox, 0, 0 );
 
 	listView = new KListView( this, "listView" );
+	listView->addColumn( i18n( "Nr" ) );
 	listView->addColumn( i18n( "Channel" ) );
 	listView->addColumn( i18n( "Begin" ) );
 	listView->addColumn( i18n( "Duration" ) );
@@ -101,7 +102,7 @@
 	allBtn->setGuiItem( KGuiItem(i18n("Scheduled"), icon->loadIconSet("date", KIcon::Small) ) );
 	currentNextBtn->setGuiItem( KGuiItem(i18n("Current/Next"), icon->loadIconSet("toggle_log", KIcon::Small) ) );
 	currentChannelEpg->setGuiItem( KGuiItem(i18n("Current Channel"), icon->loadIconSet("date", KIcon::Small) ) );
-	new EListViewItem( (QListView*)listView, "Une chaine", "99/99/99  99:99 9999", "99:99 99", "un titre de programme", 0 );
+	new EListViewItem( (QListView*)listView, "1", "Une chaine", "99/99/99  99:99 9999", "99:99 99", "un titre de programme", 0 );
 
 	resize( size );
 	connect( resetBtn			, SIGNAL( clicked() ), this, SLOT( reset() ) );
@@ -227,7 +229,7 @@
 	QListViewItem *it = listView->currentItem();
 	if ( !it )
 		return;
-	setMode( 2, it->text(0) );
+	setMode( 2, it->text(1) );
 }
 
 
@@ -268,16 +270,19 @@
 void KEvents::checkNewEvent()
 {
 	int i, j, k, m, n;
+	int prog, digits;
 	DVBevents *events=0;
 	EventSourceList *slist;
 	EventTsidList *tlist;
 	EListViewItem *itt=0;
 	QString s, t, channel, begin, duration, title;
+	QString num;
 	bool ret;
 	EventDesc *desc;
 	QPixmap pix;
 	QValueList<int> sids;
 
+	digits = 0;
 	for( k=0; k<(int)dvb->count(); k++ ) {
 		events = dvb->at(k)->dvbEvents;
 		events->mutex.lock();
@@ -299,13 +304,16 @@
 							continue;
 						channel = chan->name;
 						pix = chan->pix;
+						prog = chan->num;
 					}
 					else {
 						ret = true;
+						digits = QString::number((int)channels->count()).length();
 						for ( i=0; i<(int)channels->count(); i++ ) {
 							if ( desc->source==channels->at(i)->tp.source && desc->sid==channels->at(i)->sid && desc->tsid==channels->at(i)->tp.tsid ) {
 								channel = channels->at(i)->name;
 								pix = channels->at(i)->pix;
+								prog = channels->at(i)->num;
 								ret = false;
 								sids.append( desc->sid );
 								break;
@@ -319,7 +327,12 @@
 					title = desc->title;
 					if ( title.isEmpty() )
 						continue;
-					itt = new EListViewItem( (QListView*)listView, channel, begin, duration, title, desc );
+
+					num.setNum(prog);
+					while ( num.length() < digits ) {
+					  num.prepend( "0" );
+					}
+					itt = new EListViewItem( (QListView*)listView, num, channel, begin, duration, title, desc );
 					if ( !pix.isNull() )
 						itt->setPixmap( 0, pix );
 				}