diff -u xawtv-3.95.dfsg.1/debian/changelog xawtv-3.95.dfsg.1/debian/changelog --- xawtv-3.95.dfsg.1/debian/changelog +++ xawtv-3.95.dfsg.1/debian/changelog @@ -1,3 +1,11 @@ +xawtv (3.95.dfsg.1-4ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - desktop file + - Use any instead of linux-any as Architecture in debian/control + + -- Luca Falavigna Mon, 30 Jul 2007 03:34:58 +0200 + xawtv (3.95.dfsg.1-4) unstable; urgency=low * Applied Kristof Koehler's patch for problems with recording @@ -19,6 +27,14 @@ -- Krzysztof Burghardt Sun, 29 Jul 2007 15:00:06 +0200 +xawtv (3.95.dfsg.1-3ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - desktop file + * Use any instead of linux-any as Architecture in debian/control + + -- Luca Falavigna Wed, 30 May 2007 22:38:40 +0100 + xawtv (3.95.dfsg.1-3) unstable; urgency=low * QA upload. @@ -27,6 +43,13 @@ -- Aurelien Jarno Wed, 30 May 2007 16:04:23 +0200 +xawtv (3.95.dfsg.1-2ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - desktop file + + -- Luca Falavigna Mon, 05 Mar 2007 12:46:40 +0000 + xawtv (3.95.dfsg.1-2) unstable; urgency=low * QA upload. @@ -35,6 +58,13 @@ -- Christian Perrier Sat, 3 Mar 2007 14:02:57 +0100 +xawtv (3.95.dfsg.1-1ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - Add a better desktop file. + + -- Luke Yelavich Thu, 14 Dec 2006 15:51:10 +1100 + xawtv (3.95.dfsg.1-1) unstable; urgency=medium * QA upload. @@ -42,6 +72,14 @@ -- Nelson A. de Oliveira Wed, 13 Dec 2006 02:41:20 -0200 +xawtv (3.95-6ubuntu1) feisty; urgency=low + + * Merge from debian unstable. Ubuntu changes are: + - Add a better desktop file. + - debian/control: changed Standards-Version and debhelper version. + + -- Luke Yelavich Mon, 30 Oct 2006 23:17:45 +1100 + xawtv (3.95-6) unstable; urgency=low * QA upload @@ -61,6 +99,12 @@ -- Bas Zoetekouw Fri, 29 Sep 2006 19:44:38 +0000 +xawtv (3.95-4ubuntu1) edgy; urgency=low + + * Merge from Debian unstable. + + -- Luke Yelavich Mon, 28 Aug 2006 08:51:53 +1000 + xawtv (3.95-4) unstable; urgency=low * QA upload. @@ -68,6 +112,13 @@ -- Aurelien Jarno Sun, 27 Aug 2006 12:55:35 +0200 +xawtv (3.95-3ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + * Remove dist/*, as the patches contained there are no longer needed. + + -- Luke Yelavich Fri, 25 Aug 2006 12:24:47 +1000 + xawtv (3.95-3) unstable; urgency=low * QA upload. @@ -119,6 +170,13 @@ -- Matej Vela Sun, 13 Aug 2006 04:27:51 +0200 +xawtv (3.94-1.2ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + * Remove FSlib patches, as they are applied in Debian's xorg patch. + + -- Luke Yelavich Sun, 13 Aug 2006 22:04:38 +1000 + xawtv (3.94-1.2) unstable; urgency=high * Non-maintainer upload. @@ -136,6 +194,24 @@ -- Victor Seva Tue, 10 Jan 2006 13:20:12 +0100 +xawtv (3.94-1.0ubuntu2) dapper; urgency=low + + * Add a better desktop file (From Trouilliez Vincent + ). Closes: Malone #6110. + + [ Jonathan Patrick Davies ] + * debian/control: changed Standards-Version and debhelper version. + * Sponsored upload for Baishampayan Ghose + + -- Jonathan Patrick Davies Tue, 28 Feb 2006 11:21:45 +0100 + +xawtv (3.94-1.0ubuntu1) dapper; urgency=low + + * Resynchronise with Debian (Closes: #4225): + - Don't apply patch to quicktime includes. + + -- Daniel T Chen Tue, 08 Nov 2005 10:56:21 +0000 + xawtv (3.94-1.0) unstable; urgency=low * NMU. @@ -153,6 +229,43 @@ -- Joey Hess Mon, 29 Aug 2005 10:02:16 -0400 +xawtv (3.94-1ubuntu5) breezy; urgency=low + + * Create and install desktop file + + -- Barry deFreese Tue, 27 Sep 2005 22:25:19 -0400 + +xawtv (3.94-1ubuntu4) breezy; urgency=low + + * Properly fix the location of the app-defaults file + + -- Sebastian Dröge Thu, 25 Aug 2005 20:59:12 +0200 + +xawtv (3.94-1ubuntu3) breezy; urgency=low + + * Changed Build-Depends from aalib1-dev -> libaa1-dev, xlibs-dev -> + libx11-dev + * Added a patch from Debian BTS (#300363) to fix FTBFS with gcc 4.0 + * Added a patch to link libFS to fbtv... FTBFS otherwise + * Added libxinerama-dev, libxv-dev, libxrandr-dev, libxxf86dga-dev and + libxxf86vm-dev to Build-Depends + * Fixed location of the app-defaults file + + -- Sebastian Dröge Tue, 23 Aug 2005 20:41:19 +0200 + +xawtv (3.94-1ubuntu2) breezy; urgency=low + + * Update {build-,}depends for xorg -> mesa transition. + + -- Adam Conrad Mon, 22 Aug 2005 16:28:25 +1000 + +xawtv (3.94-1ubuntu1) hoary; urgency=low + + * patched console/fs.h to find FSlib.h + * added libfs-dev build dependency + + -- Michael F. Rimbert Tue, 29 Mar 2005 15:04:53 -0500 + xawtv (3.94-1) unstable; urgency=low * new release (closes: #191044, #256860). @@ -674,0 +788 @@ + diff -u xawtv-3.95.dfsg.1/debian/control xawtv-3.95.dfsg.1/debian/control --- xawtv-3.95.dfsg.1/debian/control +++ xawtv-3.95.dfsg.1/debian/control @@ -2,13 +2,14 @@ Section: graphics Priority: extra Build-Depends: debhelper (>= 5), dpatch, libjpeg62-dev, libncurses5-dev, libx11-dev, libxext-dev, libxinerama-dev, libxmu-dev, libxpm-dev, libxrandr-dev, libxt-dev, libxv-dev, libxxf86dga-dev, libxxf86vm-dev, x-dev, liblircclient-dev, xutils, xbase-clients, libaa1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libzvbi-dev (>= 0.2.1), libxaw7-dev, libgl1-mesa-dev, libxft-dev, po-debconf, libpng12-dev, libglib1.2-dev, libfs-dev, libdv-dev -Maintainer: Krzysztof Burghardt +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Krzysztof Burghardt Standards-Version: 3.7.2 Package: xawtv Section: x11 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, v4l-conf [linux-any], xutils, scantv, xawtv-plugins (=${binary:Version}), pia +Depends: ${shlibs:Depends}, ${misc:Depends}, v4l-conf, xutils, scantv, xawtv-plugins (=${binary:Version}), pia Conflicts: xawtv-plugin-qt Suggests: tv-fonts Description: X11 TV application @@ -24,7 +25,7 @@ playback movie files which are recorded from TV. Package: fbtv -Architecture: linux-any +Architecture: any Depends: ${shlibs:Depends}, v4l-conf, xawtv-plugins (=${binary:Version}) Suggests: xawtv Description: linux console (fbcon) TV application @@ -60,14 +61,14 @@ Package: radio Section: sound -Architecture: linux-any +Architecture: any Depends: ${shlibs:Depends} Description: ncurses-based radio application This is a ncurses-based radio application. It supports the video4linux API. Package: v4l-conf -Architecture: linux-any +Architecture: any Depends: ${shlibs:Depends} Conflicts: suidmanager (<< 0.50) Replaces: xawtv (<=3.95-3) diff -u xawtv-3.95.dfsg.1/debian/rules xawtv-3.95.dfsg.1/debian/rules --- xawtv-3.95.dfsg.1/debian/rules +++ xawtv-3.95.dfsg.1/debian/rules @@ -44,6 +44,10 @@ echo "v4l-conf: setuid-binary" \ > debian/v4l-conf/usr/share/lintian/overrides/v4l-conf + # install desktop file + install -d $(CURDIR)/debian/xawtv/usr/share/applications + install -m 644 debian/xawtv.desktop $(CURDIR)/debian/xawtv/usr/share/applications + binary-indep: build install binary-arch: build install only in patch2: unchanged: --- xawtv-3.95.dfsg.1.orig/debian/xawtv.desktop +++ xawtv-3.95.dfsg.1/debian/xawtv.desktop @@ -0,0 +1,18 @@ +[Desktop Entry] +Comment=TV viewer for X11 +NoDisplay=false +Name=XawTV +Encoding=UTF-8 +Exec=xawtv +Terminal=false +GenericName=XawTV +Comment[en_GB]=TV extensions for X11 +Comment[en_US]=TV extensions for X11 +Icon[en_GB]=/usr/share/pixmaps/gnome-term-linux2.png +Icon[en_US]=/usr/share/pixmaps/gnome-term-linux2.png +Hidden=false +Name[en_GB]=XawTV +Name[en_US]=XawTV +Type=Application +Categories=Applications;AudioVideo +Icon=/usr/share/pixmaps/gnome-term-linux2.png