Merge lp:~ubuntu-branches/ubuntu/quantal/tvtime/quantal-201206022209 into lp:ubuntu/quantal/tvtime

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/quantal/tvtime reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/quantal/tvtime/quantal-201206022209. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

30. By Andrew Starr-Bochicchio on 2012-06-02

* Merge from Debian unstable (LP: #996363). Remaining Ubuntu changes:
  - Retain patches:
    tvtime-1.0.1-savematte.patch, desktop_file.patch, tvtime-1.0.2-alsa.patch,
    tvtime-1.0.2-alsamixer.patch, pal_audio_mode_persistence.patch,
    tvtime-1.0.2-screensaver.patch, tvtime-1.0.2-videoinput.patch,
    tvtime-1.0.2-osd.patch, tvtime-1.0.2-usage.patch,
    tvtime-1.0.2-command.patch, tvtime-1.0.2-build.patch,
    tvtime-1.0.2-libtool.patch, tvtime-1.0.2-cursor.patch,
    tvtime-1.0.2-metacity.patch, tvtime-1.0.2-x_size_hint.patch,
    tvtime-1.0.2-menu.patch, tvtime-1.0.2-focus_mouse.patch,
    tvtime-1.0.2-icon.patch, tvtime-1.0.2-tvtimeosd.patch,
    tvtime-1.0.2-cpuid.patch, tvtime-1.0.2-xmltv.patch,
    tvtime-1.0.2-vbidata.patch, tvtime-1.0.2-verbose.patch,
    tvtime-1.0.2-vbiscreen.patch, tvtime-1.0.2-closed_caption.patch,
    tvtime-1.0.2-key_event.patch, tvtime-1.0.2-vbi.patch,
    tvtime-1.0.2-xinerama.patch, tvtime-1.0.2-volume.patch,
    tvtime-1.0.2-output_volume.patch.
  - debian/control: Build-Depends on autoconf, automake, libasound2-dev,
    libtool and libxss instead of libxtst.
  - debian/rules: Call autoreconf to re-generate the configure script.
* Droped Ubuntu changes:
  - tvtime-1.0.2-from-upstream-fullscreen-crash.patch, applied in Debian as
    fullscreen.diff
  - tvtime-1.0.2-libpng-1.5.patch, applied in Debian as libpng.diff
  - tvtime-1.0.2-xvoutput.patch, applied in Debian as typo.diff
* Droped Debian changes:
  - debian/control: Suggests: oss-compat.
  - debian/control: Build-Depends chrpath.
  - debian/rules: Fixed binary-or-shlib-defines-rpath.
* debian/patches/tvtime-1.0.2-autoconf.patch: Fix warns about files that seem
  to use datarootdir without defining it.
* debian/patches/tvtime-1.0.2-xcommon.patch: Replace deprecated function
  XKeycodeToKeysym() with XkbKeycodeToKeysym().
* Update the "Comment" and "Name" field value in debian/desktop_file.patch
* Added debian/source/format file.
* debian/patches/libpng.diff: Added. Closes: #650582.
* debian/control: Suggests: oss-compat. Closes: #506726.
* debian/control: Build-Depends: quilt, chrpath.
* debian/rules: Modified to use quilt patches.
* debian/patches/fullscreen.diff: Closes: #568318.
* debian/rules: Fixed debian-rules-missing-recommended-target.
* debian/rules: Fixed binary-or-shlib-defines-rpath.
* debian/patches/typo.diff: Closes: #671612.
* debian/po/nl.po: Closes: #657467.
* debian/po/pl.po: Closes: #666444.
* debian/po/tr.po: Closes: #667485.
* debian/templates, debian/po/.po: Replaced -19 by -20. Closes: #539669.
* debian/README.source: Added. Fixes patch-system-but-no-source-readme.
* debian/source.lintian-overrides: Added to override
  patch-system-but-direct-changes-in-diff.
* debian/patches/tvtime-1.0.2-vbi.patch: Add support for more generic VBI
  handling. Currently only tested with the HVR-950 (em28xx based), so there
  may need to be additional changes required for other boards) (LP: #961677)
* debian/patches/tvtime-1.0.2-xinerama.patch: Make it possible to disable
  xinerama manually.

=== modified file 'config.guess' (properties changed: +x to -x)
=== modified file 'config.sub' (properties changed: +x to -x)
=== added file 'debian/patches/tvtime-1.0.2-autoconf.patch'
--- debian/patches/tvtime-1.0.2-autoconf.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/tvtime-1.0.2-autoconf.patch	2012-06-02 22:14:18 +0000
@@ -0,0 +1,28 @@
+## Description: Fix warns about files that seem to use datarootdir without defining it.
+## Origin: upstream, no
+## Author: Pojar George
+## Forwarded: no
+Index: tvtime-1.0.2/po/Makefile.in.in
+===================================================================
+--- tvtime-1.0.2.orig/po/Makefile.in.in	2012-05-17 08:23:15.964417000 +0000
++++ tvtime-1.0.2/po/Makefile.in.in	2012-05-17 08:29:52.472091071 +0000
+@@ -20,6 +20,7 @@
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
++datarootdir = @datarootdir@
+ datadir = @datadir@
+ localedir = $(datadir)/locale
+ gettextsrcdir = $(datadir)/gettext/po
+Index: tvtime-1.0.2/intl/Makefile.in
+===================================================================
+--- tvtime-1.0.2.orig/intl/Makefile.in	2012-05-17 08:23:15.964417000 +0000
++++ tvtime-1.0.2/intl/Makefile.in	2012-05-17 08:32:39.564086108 +0000
+@@ -31,6 +31,7 @@
+ transform = @program_transform_name@
+ libdir = @libdir@
+ includedir = @includedir@
++datarootdir = @datarootdir@
+ datadir = @datadir@
+ localedir = $(datadir)/locale
+ gettextsrcdir = $(datadir)/gettext/intl

=== renamed file 'debian/patches/tvtime-1.0.2-autoconf.patch' => 'debian/patches/tvtime-1.0.2-autoconf.patch.moved'
=== added file 'debian/patches/tvtime-1.0.2-xcommon.patch'
--- debian/patches/tvtime-1.0.2-xcommon.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/tvtime-1.0.2-xcommon.patch	2012-06-02 22:14:18 +0000
@@ -0,0 +1,28 @@
+## Description: Replace deprecated function XKeycodeToKeysym with XkbKeycodeToKeysym
+## Origin: upstream, no
+## Author: Pojar George
+## Forwarded: no
+Index: tvtime-1.0.2/src/xcommon.c
+===================================================================
+--- tvtime-1.0.2.orig/src/xcommon.c	2012-03-30 15:23:05.891875084 +0000
++++ tvtime-1.0.2/src/xcommon.c	2012-03-30 15:26:59.571868136 +0000
+@@ -43,6 +43,7 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/keysym.h>
++#include <X11/XKBlib.h>
+ #include <X11/cursorfont.h>
+ #include <X11/extensions/XShm.h>
+ #ifdef HAVE_XSSEXTENSION
+@@ -1561,9 +1562,9 @@
+             /* if( event.xkey.state & ShiftMask ) arg |= I_SHIFT; */
+             /* this alternate approach allows handling of keys like '<' and '>' -- mrallen */
+             if( event.xkey.state & ShiftMask ) {
+-                mykey = XKeycodeToKeysym( display, event.xkey.keycode, 1 );
++                mykey = XkbKeycodeToKeysym( display, event.xkey.keycode, 0, 1 );
+             } else {
+-                mykey = XKeycodeToKeysym( display, event.xkey.keycode, 0 );
++                mykey = XkbKeycodeToKeysym( display, event.xkey.keycode, 0, 0 );
+             }
+             if( event.xkey.state & ControlMask ) arg |= I_CTRL;
+             if( event.xkey.state & Mod1Mask ) arg |= I_META;

=== renamed file 'debian/patches/tvtime-1.0.2-xcommon.patch' => 'debian/patches/tvtime-1.0.2-xcommon.patch.moved'
=== added file 'debian/po/eu.po.OTHER'
--- debian/po/eu.po.OTHER	1970-01-01 00:00:00 +0000
+++ debian/po/eu.po.OTHER	2012-06-02 22:14:18 +0000
@@ -0,0 +1,248 @@
+# translation of tvtime-eu.po to Euskara
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Piarres Beobide <[e-mail]>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: tvtime-eu\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2012-05-06 12:57+0000\n"
+"PO-Revision-Date: 2009-07-28 12:14+0200\n"
+"Last-Translator: Piarres Beobide <[e-mail]>\n"
+"Language-Team: Euskara <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: select
+#. Description
+#: ../templates:2001
+msgid "TV standard:"
+msgstr "TB estandarra:"
+
+#. Type: select
+#. Description
+#: ../templates:2001
+msgid ""
+"Please choose the TV standard to use. NTSC is used in North America, much of "
+"South America, and Japan; SECAM in France, the former USSR, and parts of "
+"Africa and the Middle East; and PAL elsewhere."
+msgstr ""
+"Mesedez hautatu erabili behar den TB estandarra. Ipar Ameriketan, Hego "
+"Amerika gehiengoan eta Japonian NTSC erabiltzen da; Frantzian. lehengo SESB "
+"partaideek, Afrika eta ekialde-erdi zatietan SECAM erabiltzen da; eta PAL "
+"beste tokietan."
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../templates:3001 ../templates:4001
+msgid "Cable"
+msgstr "Kablea"
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../templates:3001 ../templates:4001
+msgid "Broadcast"
+msgstr "Difusioa"
+
+#. Type: select
+#. Choices
+#: ../templates:3001
+msgid "Cable including channels 100+"
+msgstr "Kablea 100 gorako kanalak barne"
+
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#: ../templates:3002 ../templates:4002 ../templates:5002
+msgid "Default frequency table:"
+msgstr "Lehenetsiriko frekuentzia taula:"
+
+#. Type: select
+#. Description
+#: ../templates:3002
+msgid ""
+"Please choose the frequency table to use. It specifies which frequencies "
+"correspond to the familiar channel numbers. You should select \"Broadcast\" "
+"if you use an antenna for over-the-air signals."
+msgstr ""
+"Mesedez hautatu erabili behar den frekuentzia taula. Honek kanal zenbaki "
+"arruntenei dagokien frekuentziak ezartzen ditu. \"Difusioa\" hautatu beharko "
+"zenuke aire-bidezko seinaleak antena bidez jasotzen badituzu."
+
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#: ../templates:4002 ../templates:5002
+msgid ""
+"Please choose the frequency table to use. It specifies which frequencies "
+"correspond to the familiar channel numbers."
+msgstr ""
+"Mesedez hautatu erabili behar den frekuentzia taula. Honek kanal zenbaki "
+"arruntenei dagokien frekuentziak ezartzen ditu."
+
+#. Type: select
+#. Description
+#: ../templates:4002
+msgid ""
+"You should select \"Broadcast\" if you use an antenna for over-the-air "
+"signals."
+msgstr ""
+"\"Difusioa\" hautatu beharko zenuke aire-bidezko seinaleak antena bidez "
+"jasotzen badituzu."
+
+#. Type: select
+#. Choices
+#: ../templates:5001
+msgid "Europe"
+msgstr "Europa"
+
+#. Type: select
+#. Choices
+#: ../templates:5001
+msgid "France"
+msgstr "Frantzia"
+
+#. Type: select
+#. Choices
+#: ../templates:5001
+msgid "Russia"
+msgstr "Errusia"
+
+#. Type: select
+#. Choices
+#: ../templates:5001
+msgid "Australia"
+msgstr "Australia"
+
+#. Type: select
+#. Choices
+#: ../templates:5001
+msgid "New Zealand"
+msgstr "Zelanda Berria"
+
+#. Type: select
+#. Choices
+#: ../templates:5001
+msgid "China Broadcast"
+msgstr "Txinatar difusioa"
+
+#. Type: select
+#. Choices
+#: ../templates:5001
+msgid "Australia Optus"
+msgstr "Australiar Optus"
+
+#. Type: select
+#. Choices
+#: ../templates:5001
+msgid "Custom (must run tvtime-scanner first)"
+msgstr "Pertsonalizatua (tvtime-scanner abiarazi behar da aurretik)"
+
+#. Type: select
+#. Description
+#: ../templates:5002
+msgid ""
+"If you are a user of a cable company that does not use standard frequencies, "
+"you should select \"Custom\" and run the tvtime-scanner application before "
+"using tvtime."
+msgstr ""
+"Frekuentzia estandarrak erabiltzen ez dituen kable bidezko konpainia bat "
+"erabiltzen baduzu, \"Pertsonalizatua\" hautatu eta tvtime erabili aurretik "
+"tvtime-scanner aplikazioa erabili beharko duzu."
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid "Default television capture device:"
+msgstr "Lehenetsiriko telebista kapturatzeko gailua:"
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid ""
+"Please choose the video4linux device which corresponds to your capture card."
+msgstr "Mesedez hautatu zure kaptura txartelari dagokion video4linux gailua."
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid "Device to use for VBI decoding:"
+msgstr "VBI kodeketarako erabiliko den gailua:"
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid ""
+"Please choose the device that will be used in NTSC areas for decoding closed "
+"captions and XDS channel information."
+msgstr ""
+"Mesedez hautatu NTSC eremuetan itxitako titulu kodeketa eta XDS kanal "
+"argibideentzat erabiliko den gailua."
+
+#. Type: boolean
+#. Description
+#: ../templates:8001
+msgid "Allow tvtime to run with root privileges?"
+msgstr "Onartu tvtime root baimenez exekutatzea?"
+
+#. Type: boolean
+#. Description
+#: ../templates:8001
+msgid ""
+"Please choose whether tvtime should be \"setuid root\", therefore getting "
+"root privileges when running."
+msgstr ""
+"Mesedez hautatu exekutatzean root baimenak eskuratzeko tvtime-eri \"setuid "
+"root\" egin behar zaion ala ez."
+
+#. Type: boolean
+#. Description
+#: ../templates:8001
+msgid ""
+"This allows tvtime to run at a high priority to ensure smooth video and "
+"should be used for high quality video output even during high CPU load."
+msgstr ""
+"Honek tvtime-ri lehentasun handian funtzionatzeko aukera ema eta bideoa "
+"kalitate handienaz ikusteko aukera emanaz nahiz makinak lan-karga handia "
+"izan."
+
+#. Type: string
+#. Description
+#: ../templates:9001
+msgid "Process priority for the tvtime binary:"
+msgstr "Tvtime bitarraren prozesuaren lehentasuna:"
+
+#. Type: string
+#. Description
+#: ../templates:9001
+msgid ""
+"This setting controls the priority of the tvtime process relative to other "
+"processes on the system."
+msgstr ""
+"Ezarpen honek tvtime prozesuak sistemako beste prozesuekin alderatuaz izango "
+"duen lehentasuna kontrolatzen du."
+
+#. Type: string
+#. Description
+#: ../templates:9001
+msgid ""
+"Allowed values are integers between -20 and 19. Lower values indicate higher "
+"priority, and a value of 0 would give tvtime the same priority as a normal "
+"process."
+msgstr ""
+"Onartutako balioak -20 eta 19 arteko zenbaki osoak dira. Zenbaki baxuenak "
+"lehentasun handiagoa ezartzen dute eta 0 balioa erabiliaz prozesu arrunten "
+"lehentasuna izango du."

=== added directory 'debian/source'
=== renamed directory 'debian/source' => 'debian/source.moved'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2012-06-02 22:14:18 +0000
@@ -0,0 +1,1 @@
+1.0