[linuxtv-dvb-apps] 29/30: Imported Debian patch 1.1.1+rev1483-1

Tobias Grimm tiber-guest at alioth.debian.org
Tue Sep 3 07:52:12 UTC 2013


This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository linuxtv-dvb-apps.

commit a537361120f6d717bfdf2793c82d2435ee0c9126
Merge: 96bce36 5501530
Author: Mark Purcell <msp at debian.org>
Date:   Sun May 13 19:42:13 2012 +1000

    Imported Debian patch 1.1.1+rev1483-1

 .hg_archival.txt                                   |    4 +-
 Makefile                                           |    6 +
 debian/changelog                                   |   11 +
 debian/patches/09_x_zap_flush_stdout.dpatch        |   30 +-
 debian/patches/dbug606728.diff                     |   12 +
 debian/patches/series                              |    2 +
 debian/patches/uk-CrystalPalace.diff               |   28 +
 debian/rules                                       |    1 -
 util/scan/dvb-c/fi-sonera                          |   11 +
 util/scan/dvb-c/nl-UPC                             |    7 +
 util/scan/dvb-c/nl-Ziggo-Zwolle                    |   26 -
 util/scan/dvb-h/README                             |    3 -
 util/scan/dvb-h/fi-Helsinki                        |    2 -
 util/scan/dvb-h/fi-Oulu                            |    2 -
 util/scan/dvb-h/fi-Oulu-Nokia-devel                |    4 -
 util/scan/dvb-h/fi-Turku                           |    2 -
 util/scan/dvb-s/{AMC2-85w => AMC16-85.0W}          |    0
 util/scan/dvb-s/{AMC9-83w => AMC9-83.0W}           |    0
 .../{BrasilSat-B3-84.0W => BrasilsatB4-84.0W}      |    0
 .../dvb-s/{Chinastar1_C-87.5E => ChinaSat5A-87.5E} |    0
 util/scan/dvb-s/{Eurobird9-9.0E => Eutelsat9-9.0E} |    0
 util/scan/dvb-s/{Galaxy11-91w => Galaxy17-91.0W}   |    3 +-
 util/scan/dvb-s/{IA5-97w => Galaxy19-97.0W}        |    6 +-
 util/scan/dvb-s/{IA6-93w => Galaxy25-93.0W}        |    8 +-
 util/scan/dvb-s/Galaxy25-97w                       |   19 -
 util/scan/dvb-s/Galaxy26-93w                       |   58 --
 util/scan/dvb-s/{Galaxy28-89w => Galaxy28-89.0W}   |    7 +-
 util/scan/dvb-s/{Galaxy3C-95w => Galaxy3C-95.0W}   |    1 -
 util/scan/dvb-s/IA8-89w                            |   34 -
 util/scan/dvb-s/{AMC3-87w => SES2-87.0W}           |    0
 util/scan/dvb-t/auto-Italy                         |   72 --
 util/scan/dvb-t/de-Baden-Wuerttemberg              |    2 +-
 util/scan/dvb-t/de-Bayern                          |    2 -
 util/scan/dvb-t/de-Berlin                          |    4 +-
 util/scan/dvb-t/de-Bremen                          |    4 +-
 util/scan/dvb-t/de-Hamburg                         |    4 +-
 util/scan/dvb-t/de-Hessen                          |   20 +-
 util/scan/dvb-t/de-Niedersachsen                   |   10 +-
 util/scan/dvb-t/de-Nordrhein-Westfalen             |   10 +-
 util/scan/dvb-t/de-Rheinland-Pfalz                 |    1 -
 util/scan/dvb-t/de-Saarland                        |    2 +-
 util/scan/dvb-t/de-Sachsen                         |    2 +-
 util/scan/dvb-t/de-Sachsen-Anhalt                  |    2 +-
 util/scan/dvb-t/de-Schleswig-Holstein              |    4 +-
 util/scan/dvb-t/es-Huesca                          |   21 +-
 util/scan/dvb-t/fi-Espoo                           |    1 +
 util/scan/dvb-t/fi-Eurajoki                        |    1 +
 util/scan/dvb-t/fi-Jyvaskyla                       |    1 +
 util/scan/dvb-t/fi-Lahti                           |    1 +
 util/scan/dvb-t/fi-Lohja                           |    4 +-
 util/scan/dvb-t/fi-Oulu                            |    1 +
 util/scan/dvb-t/fi-Tampere                         |    1 +
 util/scan/dvb-t/fi-Turku                           |    1 +
 util/scan/dvb-t/ie-CairnHill                       |    5 +
 util/scan/dvb-t/ie-ClermontCarn                    |    5 +
 util/scan/dvb-t/ie-Dungarvan                       |    5 +
 util/scan/dvb-t/ie-HolywellHill                    |    5 +
 util/scan/dvb-t/ie-Kippure                         |    5 +
 util/scan/dvb-t/ie-Maghera                         |    5 +
 util/scan/dvb-t/ie-MountLeinster                   |    5 +
 util/scan/dvb-t/ie-Mullaghanish                    |    5 +
 util/scan/dvb-t/ie-SpurHill                        |    5 +
 util/scan/dvb-t/ie-ThreeRock                       |    5 +
 util/scan/dvb-t/ie-Truskmore                       |    5 +
 util/scan/dvb-t/ie-WoodcockHill                    |    5 +
 util/scan/dvb-t/it-All                             |  135 +++
 util/scan/dvb-t/it-Aosta                           |   21 -
 util/scan/dvb-t/it-Bari                            |   18 -
 util/scan/dvb-t/it-Bologna                         |   28 -
 util/scan/dvb-t/it-Bolzano                         |    5 -
 util/scan/dvb-t/it-Cagliari                        |   23 -
 util/scan/dvb-t/it-Caivano                         |   17 -
 util/scan/dvb-t/it-Catania                         |   27 -
 util/scan/dvb-t/it-Conero                          |    8 -
 util/scan/dvb-t/it-Firenze                         |   20 -
 util/scan/dvb-t/it-Genova                          |   12 -
 util/scan/dvb-t/it-Livorno                         |   15 -
 util/scan/dvb-t/it-Milano                          |   49 -
 util/scan/dvb-t/it-Modena                          |   50 -
 util/scan/dvb-t/it-Montevergine                    |   18 -
 util/scan/dvb-t/it-Pagnacco                        |   27 -
 util/scan/dvb-t/it-Palermo                         |   23 -
 util/scan/dvb-t/it-Pescara                         |   15 -
 util/scan/dvb-t/it-Pisa                            |   18 -
 util/scan/dvb-t/it-Roma                            |   16 -
 util/scan/dvb-t/it-S-Stefano_al_mare               |   19 -
 util/scan/dvb-t/it-Sassari                         |   33 -
 util/scan/dvb-t/it-Torino                          |   13 -
 util/scan/dvb-t/it-Trieste                         |   23 -
 util/scan/dvb-t/it-Varese                          |   16 -
 util/scan/dvb-t/it-Venezia                         |   19 -
 util/scan/dvb-t/it-Verona                          |   19 -
 util/scan/dvb-t/pl-Gdansk                          |    4 +
 util/scan/dvb-t/pl-Krakow                          |   17 +
 util/scan/dvb-t/sk-Bratislava                      |    7 +
 util/scan/dvb-t/uk-CrystalPalace                   |   27 +-
 util/scan/dvb-t/uk-EmleyMoor                       |   13 +-
 util/scan/dvb-t/uk-Tacolneston                     |   26 +-
 util/scan/scan.c                                   |   40 +
 util/szap/Makefile                                 |    7 +
 util/szap/azap.c                                   |   82 +-
 util/szap/czap.c                                   |   25 +-
 util/szap/lnb.c                                    |   11 +-
 util/szap/lnb.h                                    |    6 +-
 util/szap/szap.c                                   |  962 ++++++++++----------
 util/szap/tzap.c                                   |  232 +++--
 util/szap/util.c                                   |  153 ++--
 107 files changed, 1206 insertions(+), 1611 deletions(-)

diff --cc debian/changelog
index 1de1929,0000000..93d6452
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,536 -1,0 +1,547 @@@
++linuxtv-dvb-apps (1.1.1+rev1483-1) unstable; urgency=low
++
++  * New upstream release
++    - Fixes "updated DVB-T frequencies for Italy" (Closes: #613097)
++  * Fix "dvbscan: Infinite loop parsing arguments"
++    - patch from Vincent Pelletier (Closes: #606728)
++  * Added uk-CrystalPalace.diff
++    - Fixes "Channel/frequency/etc. updating for London" (Closes: #669715)
++
++ -- Mark Purcell <msp at debian.org>  Sun, 13 May 2012 19:42:13 +1000
++
 +linuxtv-dvb-apps (1.1.1+rev1457-4) unstable; urgency=low
 +
 +  * Add Conflicts: Provides: alevt (Closes: #654818)
 +    - Fixes "alevt and dvb-apps: error when trying to install together"
 +  * Add Conflicts: nmh (Closes: #654810)
 +    - Fixes "dvb-apps and nmh: error when trying to install together"
 +
 + -- Mark Purcell <msp at debian.org>  Mon, 27 Feb 2012 21:13:21 +1100
 +
 +linuxtv-dvb-apps (1.1.1+rev1457-3) unstable; urgency=low
 +
 +  * Build-depend on libx11-dev (Closes: #655778)
 +  * Build-depend on libzvbi-dev
 +  * Standards-Version: 3.9.2
 +
 + -- Tobias Grimm <etobi at debian.org>  Sun, 15 Jan 2012 11:11:50 +0100
 +
 +linuxtv-dvb-apps (1.1.1+rev1457-2) unstable; urgency=low
 +
 +  * Fixed upstream "be-Schoten and be-Antwerp run on 506MHz" (Closes: #566336)
 +  * Add apps_manpages.patch - Thanks Uwe (Closes: #312570)
 +  * Added & refresh alevt.patch - Thks Uwe 
 +  * Add Build-Depends: libzvbi-dev
 +
 + -- Mark Purcell <msp at debian.org>  Thu, 05 Jan 2012 22:39:17 +1100
 +
 +linuxtv-dvb-apps (1.1.1+rev1457-1) unstable; urgency=low
 +
 +  * New upstream release
 +    - Fixes "dvb-apps: missing channel for es-Sevilla" (Closes: #569077)
 +    - Fixes "Missing muxes" (Closes: #540660)
 +    - Fixes "fr-Nantes should have offset of 167000" (Closes: #564204)
 +  * "Typo in the synopsis" amended (Closes: #651812)
 +  * Switch to dh - build-depends-on-obsolete-package
 +  * Drop obsolete Uploaders
 +  * Drop me-tv obsolete Conflicts
 +  * source/format 3.0 (quilt) - patch-system-but-no-source-readme build-
 +    depends-on-obsolete-package
 +  * Minor update Description
 +  * ACK NMU - Thks Simon
 +  * bug-presubj - redirect frequency updates upstream
 +
 + -- Mark Purcell <msp at debian.org>  Thu, 05 Jan 2012 18:02:19 +1100
 +
 +linuxtv-dvb-apps (1.1.1+rev1355-1.1) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Fix FTBFS: linux/videodev.h: Remove legacy V4L1 test app as per upstream
 +    hg changeset 1424. (Closes: #621964) (LP: #756224) Thanks Daniel T Chen.
 +
 + -- Simon Paillard <spaillard at debian.org>  Sat, 10 Dec 2011 10:50:26 +0100
 +
 +linuxtv-dvb-apps (1.1.1+rev1355-1) unstable; urgency=low
 +
 +  * New upstream release 
 +
 + -- Mark Purcell <msp at debian.org>  Thu, 25 Feb 2010 21:13:46 +1100
 +
 +linuxtv-dvb-apps (1.1.1+rev1273-1) unstable; urgency=low
 +
 +  * New upstream release
 +    - (Closes: #526708): "de-Nuernberg out of date"
 +  * Drop obsolete dvb-utils (etch dummy package only)
 +  * Update debian/watch - with pointer to Hg version
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 03 May 2009 20:16:46 +1000
 +
 +linuxtv-dvb-apps (1.1.1+rev1207-5) unstable; urgency=low
 +
 +  [ Stephane Glondu ]
 +  * Add a patch to explicitly include <stdint.h> and system headers
 +    first to fix FTBFS (Closes: #525580)
 +  * Move to new section `video'
 +  * Add myself to Uploaders and DM-Upload-Allowed
 +  * Remove versioned dependencies available in oldstable, add
 +    ${misc:Depends} as complained by Lintian
 +
 +  [ Tobias Grimm ]
 +  * Increased standards version to 3.8.1
 +  * Fixed license references in debian/coypright
 +
 + -- Tobias Grimm <etobi at debian.org>  Fri, 01 May 2009 23:00:37 +0200
 +
 +linuxtv-dvb-apps (1.1.1+rev1207-4) unstable; urgency=low
 +
 +  * Switch postinst to check for /dev/MAKEDEV
 +    - /var/lib/dpkg/info/dvb-apps.postinst: line 6: /sbin/MAKEDEV: No such
 +    file or directory (Closes: #502831)
 +
 + -- Mark Purcell <msp at debian.org>  Wed, 22 Oct 2008 22:05:02 +1100
 +
 +linuxtv-dvb-apps (1.1.1+rev1207-3) unstable; urgency=medium
 +
 +  [ Tobias Grimm ]
 +  * Conflict with libxbase2.0-bin, libxdb-dev because of `/usr/bin/zap' which is
 +    also in those packages (Closes: #492141)
 +  * Added Tobias Grimm <tg at e-tobi.net> to uploaders
 +  * Urgency medium for RC bug
 +
 +  [ Mark Purcell ]
 +  * dvb-utils Decsription: mention etch to lenny transitions
 +  * Conflicts: me-tv (<< 0.5.33-2)
 +    - must conflict against me-tv (<< 0.5.33-2) (Closes: #496557)
 +
 + -- Mark Purcell <msp at debian.org>  Fri, 05 Sep 2008 19:49:21 +1000
 +
 +linuxtv-dvb-apps (1.1.1+rev1207-2) unstable; urgency=low
 +
 +  * Urgency medium for RC bug
 +  * Package: dvb-utils - Tranistional dummy package
 +    - No transitional package for dvb-utils (Closes: #494012)
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 22 Jun 2008 16:32:39 +1000
 +
 +linuxtv-dvb-apps (1.1.1+rev1207-1) unstable; urgency=low
 +
 +  [ Mark Purcell ]
 +  * New upstream mercurial (Hg) release
 +    - NEW Package: dvb-apps to match upstream name
 +    - Replaces:/ Conflicts: dvb-utils
 +  * Fixed Upstream:
 +    - fr-Paris should have an added offset of 167000 for each value
 +    (Closes: #478020)
 +    - scan fails on Eurobird 28.5E (Sky UK) (Closes: #415264)
 +    - /usr/share/doc/dvb-utils/examples/scan/dvb-t/au-Sydney_North_Shore
 +    out of date (Closes: #471829)
 +    - new file /usr/share/doc/dvb-utils/examples/scan/dvb-t/de-Leipzig
 +    (Closes: #441984)
 +    - Example file for dvb-t/de-Koeln-Bonn out of date (Closes: #485449)
 +    - Is the zap util the latest version? (Closes: #408246)
 +    - /usr/share/doc/dvb-utils/examples/scan/dvb-t/de-Frankfurt out of
 +    date (Closes: #471210)
 +    - please ship example DVB-T file for de-Dresden (Closes: #473145)
 +    - contains /usr/bin/evtest which is also in lineakd (Closes: #438696)
 +    - LP: #90752, #180332, #191233
 +  * Patches included upstream:
 +    - 02_av7110_loadkeys-BTN.dpatch 03_budget_ci_loadkeys.dpatch
 +    - 05_scanfiles_not_in_cvs_yet.dpatch 06_scan_uk-heathfield-fix.dpatch
 +    - 04_scanfiles_from_cvs.dpatch
 +  * Refresh: 01_README.scan.dpatch 09_x_zap_flush_stdout.dpatch
 +  * debian/rules: Switch to /usr/share/cdbs/1/class/makefile.mk
 +  * Update debian/copyright
 +  * debian/control update Description:
 +  * Install various READMEs
 +  * Install test/ under doc/dvb-apps/examples
 +
 +  [ Thomas Schmidt ]
 +  * Switched Build-System to cdbs, Build-Depend on cdbs
 +  * Added Homepage, Vcs-Svn and Vcs-Browser fields to debian/control
 +  * Bumped Standards-Version to 3.7.3
 +  * Do not ignore errors of "make clean"
 +
 + -- Mark Purcell <msp at debian.org>  Sun, 22 Jun 2008 11:00:40 +1000
 +
 +linuxtv-dvb-apps (1.1.1-3) unstable; urgency=low
 +
 +  [ Mark Purcell ]
 +  * Update scan files from 20070804
 +    - initial-tuning-data files duplication between dvb-utils & kaffeine
 +    (Closes: #419566)
 +  * Add myself to uploaders
 +  * Add debian/compat: lintian debian-rules-sets-DH_COMPAT
 +
 + -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Mon, 06 Aug 2007 21:41:18 +0100
 +
 +linuxtv-dvb-apps (1.1.1-2) unstable; urgency=low
 +
 +  * Added 06_scan_uk-heathfield-fix.dpatch to fix the uk-Heathfiels scanfile
 +    as reported in Ubuntu bug #55789
 +  * Bumped Standards-Version to 3.7.2
 +
 + -- Thomas Schmidt <tschmidt at debian.org>  Mon, 28 Aug 2006 23:24:20 +0200
 +
 +linuxtv-dvb-apps (1.1.1-1) unstable; urgency=low
 +
 +  * Thomas Schmidt <tschmidt at debian.org>
 +    - New upstream release, supports ATSC now (closes: #345413, #368763)
 +      + Removed 06_freeview_channel_numbers.dpatch
 +      + Removed 07_vdr_output.dpatch
 +      + Removed 08_debug_minor_fixes.dpatch
 +
 + -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sat,  3 Jun 2006 13:12:54 +0200
 +
 +linuxtv-dvb-apps (1.1.0-11) unstable; urgency=low
 +
 +  * Thomas Schmidt <tschmidt at debian.org>
 +    - Added 09_x_zap_flush_stdout.dpatch - make [stc]zap flush stdout
 +      after writing status line (closes: #357126)
 +    - Fixed spelling mistake in package description (closes: #363364)
 +    - Fixed debian/watch
 +
 + -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sat, 29 Apr 2006 21:42:54 +0200
 +
 +linuxtv-dvb-apps (1.1.0-10) unstable; urgency=low
 +
 +  * Thomas Schmidt <tschmidt at debian.org>
 +    - Depend on makedev | udev
 +
 + -- Thomas Schmidt <tschmidt at debian.org>  Thu, 29 Dec 2005 14:33:17 +0100
 +
 +linuxtv-dvb-apps (1.1.0-9) unstable; urgency=low
 +
 +  * Thomas Schmidt <tschmidt at debian.org>
 +    - Added 05_scanfiles_not_in_cvs_yet.dpatch, containing:
 +      + de-Schwerin from Michael Meyer <mimesn at web.de>
 +      + de-Rostock from Oliver Beyer <musketaquid at web.de>
 +
 + -- Thomas Schmidt <tschmidt at debian.org>  Thu, 15 Dec 2005 13:26:37 +0100
 +
 +linuxtv-dvb-apps (1.1.0-8) unstable; urgency=low
 +
 +  * Darren Salt <linux at youmustbejoking.demon.co.uk>:
 +    - New patch 06_freeview_channel_numbers:
 +      + fix Freeview channel number extraction (was losing the top two bits).
 +    - New patch 07_vdr_output:
 +      + correct format - output "channel;provider", not "provider - channel";
 +      + output audio language information (assume that the AC3 PID is in the
 +        same language as the first 'plain' audio channel);
 +      + ensure that the transport stream ID is set for every service (else
 +        there may be an apparent lack of EPG data for some channels).
 +    - New patch 08_debug_minor_fixes:
 +      + remove duplicate "0x".
 +    - Modified patch 03_budget_ci_loadkeys, removing *.orig.
 +  * Thomas Schmidt <tschmidt at debian.org>
 +    - Updated scan files from linuxtv.org cvs (20051210)
 +    - Bumped Standards-Version to 3.6.2.1
 +
 + -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sun, 11 Dec 2005 13:37:12 +0100
 +
 +linuxtv-dvb-apps (1.1.0-7) unstable; urgency=low
 +
 +  * Thomas Schmidt <tschmidt at debian.org>
 +    - Updated scan files from linuxtv.org cvs
 +    - Added de-Hamburg scan file from Stephan Poehlsen 
 +      (closes: #303183)
 +
 + -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Wed,  9 Mar 2005 21:09:49 +0100
 +
 +linuxtv-dvb-apps (1.1.0-6) unstable; urgency=low
 +
 +  * Thomas Schmidt <tschmidt at debian.org>
 +    - Added dvbnet and dvbtraffic bins to dvb-utils (closes: #298707)
 +    - Changed debian/watch and all other references to the new 
 +      download-directory on www.linuxtv.org
 +    - Removed Andreas Müller from uploaders - he does not intend 
 +      to do uploads anymore
 +
 + -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Wed, 23 Feb 2005 12:09:16 +0100
 +
 +linuxtv-dvb-apps (1.1.0-5) unstable; urgency=low
 +
 +  * The "This is my first upload." release
 +  * Thomas Schmidt <tschmidt at debian.org>
 +    - Added the new frequency-definitions for the scan-utility from 
 +      the cvs-repository to dvb-utils (closes: #294325)
 +    - Changed my email-address to new debian one
 +
 + -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Wed,  9 Feb 2005 11:38:10 +0100
 +
 +linuxtv-dvb-apps (1.1.0-4) unstable; urgency=low
 +
 +  * Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>
 +    - Build-depend on dpatch (>= 2.0.9) to fix FTBFS on sparc,
 +      caused by the new dpatch-file-format
 +    - Applied patch from Darren Salt <linux at youmustbejoking.demon.co.uk>
 +      to add budget_ci_loadkeys-utility (closes: #276082)
 +
 + -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sat, 16 Oct 2004 10:01:14 +0200
 +
 +linuxtv-dvb-apps (1.1.0-3) unstable; urgency=low
 +
 +  * Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>
 +    - Applied patch from Darren Salt <linux at youmustbejoking.demon.co.uk>
 +      to allow key names that begin with BTN_* in av7110_loadkeys
 +      (closes: #273733)
 +
 + -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Tue, 28 Sep 2004 15:50:41 +0200
 +
 +linuxtv-dvb-apps (1.1.0-2) unstable; urgency=low
 +
 +  * Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>
 +    + New upstream version (closes: Bug#242701)
 +    + Cleanup of complete debian-directory
 +    + Use dh_install
 +    + Include README for szap (closes: Bug#254518)
 +    + Include hauppauge2.rc5 for Hauppauge Nexus-S 2.2 from 
 +      Uwe Maier <uwe.maier at hp.com>
 +    + Changed Maintainer to Debian VDR Team
 +      <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 +    + Cleaned up Build-Deps
 +
 + -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Fri, 30 Jul 2004 14:09:15 +0200
 +
 +linuxtv-dvb-apps (1.1.0-1) experimental; urgency=low
 +
 +  * Thomas Schmidt:
 +    + Split apps from linuxtv-dvb-package, because upstream did this too
 +    + Create DVB-Devices in dvb-utils, as suggested by Mark Purcell
 +    + Added correct watch-file
 +
 + -- Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>  Sun,  7 Mar 2004 15:08:27 +0100
 +
 +linuxtv-dvb (1.0.1-7) unstable; urgency=low
 +
 +  * Make dvb-dev a dummy package - move the dvb-api-documentation to 
 +    dvb-utils (closes: Bug#226985)
 +  * Include the datafiles for scan under /usr/share/doc/examples/scan/
 +    and changed README.scan accordingly. (closes: Bug#225596)
 +  * Do not package as debian-native-package anymore (closes: Bug#223855)
 +
 + -- Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>  Sun, 11 Jan 2004 11:37:42 +0100
 +
 +linuxtv-dvb (1.0.1-6) unstable; urgency=low
 +
 +  * Change dvb-dev to depend only on linux-kernel-headers
 +  * Remove header-files from dvb-dev, because they are included in
 +    linux-kernel-headers (closes: Bug#214502)
 +
 + -- Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>  Fri, 31 Oct 2003 12:09:04 +0100
 +
 +linuxtv-dvb (1.0.1-5) unstable; urgency=low
 +
 +  * Add linux-kernel-headers as alternative depend to dvb-dev to the
 +    dvb-driver-source package
 +
 + -- Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>  Fri, 31 Oct 2003 00:28:45 +0100
 +
 +linuxtv-dvb (1.0.1-4) unstable; urgency=low
 +
 +  * changed build-system to dpatch
 +  * corrected build-depends, as suggested by Santiago Vila
 +    (closes: Bug#217531)
 +
 + -- Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>  Sun, 19 Oct 2003 00:19:30 +0200
 +
 +linuxtv-dvb (1.0.1-3) unstable; urgency=low
 +
 +  * cleaned up debian/rules a little bit
 +  * changed "Source: dvb" to "Source: linuxtv-dvb" in control.template of the
 +    dvb-driver-source
 +  * changed symbolic link "linux" in the dvb-driver-source-package to 
 +    /usr/include and rename it to "include" (closes: Bug#216192)
 +  * changed section of dvb-dev to devel
 +
 + -- Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>  Fri, 17 Oct 2003 12:32:51 +0200
 +
 +linuxtv-dvb (1.0.1-2) unstable; urgency=low
 +
 +  * added Thomas as a co maintainer
 +
 + -- Andreas Mueller <amu at tr.debian.net>  Sun, 12 Oct 2003 16:50:12 +0200
 +
 +linuxtv-dvb (1.0.1-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * renamed source from dvb to upstream's linuxtv-dvb
 +  * removed em8300.h since driver isnt supported :)  
 +    (closes: Bug#211933)
 +    
 + -- Andreas Mueller <amu at tr.debian.net>  Mon, 29 Sep 2003 14:36:56 +0200
 +
 +dvb (1.0.0-3) unstable; urgency=low
 +
 +  * dvb-dev: trying to overwrite `/usr/include/linux/em8300.h', which 
 +    is also in package em8300-headers see bug: #211883. Added a
 +    Conflicts. Notified upstream.
 +  * finally close: bug #211933 added kernel-sources as a dependence 
 +    (closes: Bug#211933)
 +
 + -- Andreas Mueller <amu at tr.debian.net>  Fri, 26 Sep 2003 21:38:44 +0200
 +
 +dvb (1.0.0-2) unstable; urgency=low
 +
 +  * Moved to Standarts-Version: 3.6.1
 +  * close: bug #211933
 +    Added missing build dep kernel-headers for 
 +    dvb-driver-source
 +  * testing now with precompiled modules    
 +  
 + -- Andreas Mueller <amu at tr.debian.net>  Sun, 21 Sep 2003 12:07:02 +0200
 +
 +dvb (1.0.0-1) unstable; urgency=low
 +
 +  * Updated to 1.0.0 release 
 +  * fixed the dvb-driver-source package
 +  * close bug #186207
 +    (closes: Bug#186207)
 +  * close bug #172173
 +    (closes: Bug#172173)
 +  * close bug #166818
 +    (closes: Bug#166818)
 +  * close bug #166829
 +    (closes: Bug#166829)
 +  * close bug #199845
 +    (closes: Bug#199845)
 +
 + -- Andreas Mueller <amu at tr.debian.net>  Tue, 9 Sep 2003 12:00:00 +0200
 +
 +dvb (0.9.4.20020803-6.1) unstable; urgency=low
 +
 +  * NMU (sponsored by Joey Hess)
 +  * debian/patches/02_strstream-gcc3.3-fix_diff:
 +    - Change all references to 'strstream.h' to 'strstream', so the package
 +      can be successfully built with GCC 3.3, closes: #198286.
 +
 + -- Tore Anderson <tore at linpro.no>  Sun, 13 Jul 2003 20:05:32 +0200
 +
 +dvb (0.9.4.20020803-6) unstable; urgency=low
 +  
 +  * close bug 157436 
 +    (closes: Bug#157436)
 +  * set architecture to "any"
 +    (closes: Bug#148272)
 +  * Added autoconf2.13 as build-dep and modified autogen.sh to run
 +    autoconf2.13. Added a patch file 01_auto_sh_diff for this.
 +    thanks to Francesco 
 +    (closes: #157198)
 + 
 + -- Andreas Mueller <amu at tr.debian.net>  Sat, 15 Mar 2003 21:22:00 +0100
 +
 +dvb (0.9.4.20020803-5) unstable; urgency=low
 +
 +  * some cosmetic changes 
 +
 + -- Andreas Mueller <amu at tr.debian.net>  Sat,  4 Jan 2003 16:27:00 +0100
 +
 +
 +dvb (0.9.4.20020803-4) unstable; urgency=low
 +
 +  * took package from Eduard/QA
 +    (closes: Bug#117995)
 +
 + -- Andreas Mueller <amu at tr.debian.net>  Sat,  4 Jan 2003 16:27:00 +0100
 +
 +dvb (0.9.4.20020803-3) unstable; urgency=low
 +
 +  * Too bad, my own scripts reverted the changes in control.  Now fixes
 +    Build-Dependencies and Arch, thanks to Lamont, closes: #155364
 +  * separated Debian changes from CVS snapshot, now patching like with DBS
 +
 + -- Eduard Bloch <blade at debian.org>  Sun,  4 Aug 2002 11:26:12 +0200
 +
 +dvb (0.9.4.20020803-2) unstable; urgency=low
 +
 +  * Arch: all, now really :(
 +
 + -- Eduard Bloch <blade at debian.org>  Sat,  3 Aug 2002 12:00:46 +0200
 +
 +dvb (0.9.4.20020803-1) unstable; urgency=low
 +
 +  * Updated CVS snapshot
 +  * Fixed devfsd integration, thanks to Kay Sievers <kay at vrfy.org>
 +  * Removed KDREV dependency, -DMODVERSIONS fixed this
 +
 + -- Eduard Bloch <blade at debian.org>  Sat,  3 Aug 2002 10:03:36 +0200
 +
 +dvb (0.9.4.20020709-1) unstable; urgency=low
 +
 +  * Updated CVS snapshot, works with 2.4.19-rc1
 +  * Better dependency on automake, closes: #151685
 +  * Defined MODVERSIONS, closes: #145006
 +  * Devfs optimisations, closes: #133755. Symlinks may need some improvement,
 +    cannot test yet.
 +  * Changed misleading debconf message
 +  * Arch: all, let's see how far this go.
 +
 + -- Eduard Bloch <blade at debian.org>  Tue,  9 Jul 2002 22:45:52 +0200
 +
 +dvb (0.9.4.20020321-1) unstable; urgency=low
 +
 +  * Updated CVS snapshot
 +  * creating missing symlinks in mpegtools
 +
 + -- Eduard Bloch <blade at debian.org>  Wed, 20 Mar 2002 17:31:48 +0100
 +
 +dvb (0.9.4.20020308-1) unstable; urgency=medium
 +
 +  * New CVS snapshot, follows new main release
 +  * Setting exact kernel version dependency, and Firmware files are installed
 +    with the particular modules package. I am fed up with unresolved symbols
 +    and ARM crashes.
 +  * including Dpram and Root now. If someone tries to argument with GPL
 +    violatons, they shold first explain how the various firmware files can be
 +    distributed with the Linux kernel while Convergence gives the same
 +    permissions for distribution
 +  * Set DVB_FIRM_PATH to Debian's storage directory and removed other cludges
 +  * Rewrotten a Makefile to make it work with kernel-headers only
 +  * added changes from VDR author to make the driver act more smooth with
 +    still frames
 +
 + -- Eduard Bloch <blade at debian.org>  Mon, 11 Mar 2002 15:57:39 +0100
 +
 +dvb (0.9.3.20011227-1) unstable; urgency=low
 +
 +  * New CVS snapshot
 +    - 2.4.17 ready
 +    - new module, included in the init script. Closes: #126422
 +  * removed the patch from fimrware searching routine, making symlinks instead
 +  * fixed spelling errors, closes: #124584
 +  * fixed paths in dvb-driver-source, using dvb-dev package now
 +  * used gtvscreen2.c from the previous version, the new is broken
 +  * New example files apps/szap/channels.conf-dvbt*
 +
 + -- Eduard Bloch <blade at debian.org>  Tue, 27 Dec 2001 15:12:27 +0100
 +
 +dvb (0.9.3.20011107-1) unstable; urgency=low
 +
 +  * New CVS snapshot
 +    - driver-source: fixes compilation problems with kernel >> 2.4.10
 +    - zapping, mpegtools: various improvements and fixes
 +  * improved description and README.Debian, upstream's hints
 +
 + -- Eduard Bloch <blade at debian.org>  Tue,  7 Nov 2001 09:36:27 +0100
 +
 +dvb (0.9.3.20011003-1) unstable; urgency=low
 +
 +  * New CVS snapshot, minor fix in mpegtools
 +  * typos in manpages fixed
 +  * included forgotten README in the mpegtools
 +  * combined both rules files to build multiple modules packages.
 +  * changed location of firmware to /lib/dvb
 +
 + -- Eduard Bloch <blade at debian.org>  Wed,  3 Oct 2001 23:11:23 +0200
 +
 +dvb (0.9.3.20010921-1) unstable; urgency=low
 +
 +  * Initial Release. Closes: #112463, Closes: #112464
 +  * removed firmware from the source, unclear license.
 +  * Hacked Makefile and dvb.c to compile w/o firmware files and load external
 +    firmware from Debian conform locations.
 +
 + -- Eduard Bloch <blade at debian.org>  Fri, 21 Sep 2001 21:21:14 +0200
 +
 +Local variables:
 +mode: debian-changelog
 +End:
diff --cc debian/patches/09_x_zap_flush_stdout.dpatch
index 82fac8d,0000000..8aa740d
mode 100755,000000..100755
--- a/debian/patches/09_x_zap_flush_stdout.dpatch
+++ b/debian/patches/09_x_zap_flush_stdout.dpatch
@@@ -1,34 -1,0 +1,36 @@@
 +#! /bin/sh /usr/share/dpatch/dpatch-run
 +
 +## 09_x_zap_flush_stdout.dpatch by Sebastian Schmidt <yath at yath.de>
 +##
 +## All lines beginning with `## DP:' are a description of the patch.
 +## DP: Make [stc]zap flush stdout after writing status line
 +
 + at DPATCH@
- diff -urNad linuxtv-dvb-apps-1.1.1+rev1207~/util/szap/czap.c linuxtv-dvb-apps-1.1.1+rev1207/util/szap/czap.c
- --- linuxtv-dvb-apps-1.1.1+rev1207~/util/szap/czap.c	2008-06-17 01:44:38.000000000 +1000
- +++ linuxtv-dvb-apps-1.1.1+rev1207/util/szap/czap.c	2008-06-17 20:44:19.000000000 +1000
- @@ -252,9 +252,10 @@
++Index: linuxtv-dvb-apps-1.1.1+rev1483/util/szap/czap.c
++===================================================================
++--- linuxtv-dvb-apps-1.1.1+rev1483.orig/util/szap/czap.c	2012-04-11 00:44:06.000000000 +1000
+++++ linuxtv-dvb-apps-1.1.1+rev1483/util/szap/czap.c	2012-05-13 20:28:36.000000000 +1000
++@@ -229,9 +229,10 @@
 + 		if (status & FE_HAS_LOCK)
 + 			printf("FE_HAS_LOCK");
 + 
 +-		usleep(1000000);
 + 
 + 		printf("\n");
 ++		fflush(stdout);
 ++		usleep(1000000);
 + 
 + 		if (exit_after_tuning && (status & FE_HAS_LOCK))
 + 			break;
- diff -urNad linuxtv-dvb-apps-1.1.1+rev1207~/util/szap/szap.c linuxtv-dvb-apps-1.1.1+rev1207/util/szap/szap.c
- --- linuxtv-dvb-apps-1.1.1+rev1207~/util/szap/szap.c	2008-06-17 01:44:38.000000000 +1000
- +++ linuxtv-dvb-apps-1.1.1+rev1207/util/szap/szap.c	2008-06-17 20:44:19.000000000 +1000
- @@ -287,6 +287,7 @@
-        if (status & FE_HAS_LOCK)
-  	 printf("FE_HAS_LOCK");
-        printf("\n");
- +      fflush(stdout);
++Index: linuxtv-dvb-apps-1.1.1+rev1483/util/szap/szap.c
++===================================================================
++--- linuxtv-dvb-apps-1.1.1+rev1483.orig/util/szap/szap.c	2012-04-11 00:44:06.000000000 +1000
+++++ linuxtv-dvb-apps-1.1.1+rev1483/util/szap/szap.c	2012-05-13 20:28:51.000000000 +1000
++@@ -204,6 +204,7 @@
++ 		if (exit_after_tuning && ((status & FE_HAS_LOCK) || (++timeout >= 10)))
++ 			break;
++ 
+++		fflush(stdout);
++ 		usleep(1000000);
++ 	} while (1);
 + 
-        if (exit_after_tuning && ((status & FE_HAS_LOCK) || (++timeout >= 10)))
-           break;
diff --cc debian/patches/dbug606728.diff
index 0000000,0000000..6704acc
new file mode 100644
--- /dev/null
+++ b/debian/patches/dbug606728.diff
@@@ -1,0 -1,0 +1,12 @@@
++Index: linuxtv-dvb-apps-1.1.1+rev1483/util/dvbscan/dvbscan.c
++===================================================================
++--- linuxtv-dvb-apps-1.1.1+rev1483.orig/util/dvbscan/dvbscan.c	2012-04-11 00:44:06.000000000 +1000
+++++ linuxtv-dvb-apps-1.1.1+rev1483/util/dvbscan/dvbscan.c	2012-05-13 20:14:41.000000000 +1000
++@@ -225,6 +225,7 @@
++ 			output_filename = argv[argpos+2];
++ 			if (!strcmp(output_filename, "-"))
++ 				output_filename = NULL;
+++			argpos+=3;
++ 		} else {
++ 			if ((argc - argpos) != 1)
++ 				usage();
diff --cc debian/patches/series
index 305bd2c,0000000..f96b9e5
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,7 @@@
++uk-CrystalPalace.diff
 +01_README.scan.dpatch
 +09_x_zap_flush_stdout.dpatch
 +15_stdint_include.dpatch
 +apps_manpages.patch
 +alevt.patch
++dbug606728.diff
diff --cc debian/patches/uk-CrystalPalace.diff
index 0000000,0000000..b67aafb
new file mode 100644
--- /dev/null
+++ b/debian/patches/uk-CrystalPalace.diff
@@@ -1,0 -1,0 +1,28 @@@
++Index: linuxtv-dvb-apps-1.1.1+rev1483/util/scan/dvb-t/uk-CrystalPalace
++===================================================================
++--- linuxtv-dvb-apps-1.1.1+rev1483.orig/util/scan/dvb-t/uk-CrystalPalace	2012-04-11 00:44:06.000000000 +1000
+++++ linuxtv-dvb-apps-1.1.1+rev1483/util/scan/dvb-t/uk-CrystalPalace	2012-05-13 20:38:53.000000000 +1000
++@@ -4,14 +4,14 @@
++ #! <w_scan> 20120112 1 0 TERRESTRIAL GB </w_scan>
++ #------------------------------------------------------------------------------
++ # location and provider: Crystal Palace, UK
++-# date (yyyy-mm-dd)    : 2012-02-12
+++# date (yyyy-mm-dd)    : 2012-04-18
++ #
++-# T[2] [plp_id] [system_id] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
+++# T[2] [plp_id] [system_id] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> 
+++<guard> <hi> [# comment]
++ #------------------------------------------------------------------------------
++-T 481833330 8MHz  2/3 NONE    QAM64   2k 1/32 NONE    # London.
++-T 537833330 8MHz  3/4 NONE    QAM16   2k 1/32 NONE    # London.
++-T 505833330 8MHz  3/4 NONE    QAM16   2k 1/32 NONE    # London.
++-T 561833330 8MHz  2/3 NONE    QAM64   2k 1/32 NONE    # London.
++-T 529833330 8MHz  3/4 NONE    QAM16   2k 1/32 NONE    # London.
++-T 578166670 8MHz  3/4 NONE    QAM16   2k 1/32 NONE    # London.
++-T2 0 16435 554000000 8MHz AUTO AUTO     AUTO AUTO AUTO AUTO    # London.
+++T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # London .
+++T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # London .
+++T 545833330 8MHz 2/3 NONE QAM256 AUTO AUTO AUTO # London .
+++T 482000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # London .
+++T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # London .
+++T 529833330 8MHz 3/4 NONE QAM64 8k 1/32 NONE # London .
diff --cc debian/rules
index 87f25e5,0000000..5bbad86
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,13 -1,0 +1,12 @@@
 +#!/usr/bin/make -f
 +
 +%:
 +	dh $@
 +
 +override_dh_installdocs:
 +	dh_installdocs
 +	# install READMEs into doc/dvb-apps
 +	cp -a util/av7110_loadkeys/README debian/dvb-apps/usr/share/doc/dvb-apps/README.av7110_loadkeys
 +	cp -a util/scan/README debian/dvb-apps/usr/share/doc/dvb-apps/README.scan
 +	cp -a util/szap/README debian/dvb-apps/usr/share/doc/dvb-apps/README.szap
- 	cp -a util/scan/dvb-h/README debian/dvb-apps/usr/share/doc/dvb-apps/README.dvb-h
 +	cp -a util/ttusb_dec_reset/README debian/dvb-apps/usr/share/doc/dvb-apps/README.ttusb_dec_reset

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/linuxtv-dvb-apps.git



More information about the pkg-vdr-dvb-changes mailing list