lp:~ubuntu-branches/ubuntu/quantal/tvtime/quantal-201206022209
- Get this branch:
- bzr branch lp:~ubuntu-branches/ubuntu/quantal/tvtime/quantal-201206022209
Branch merges
- Ubuntu branches: Pending requested
-
Diff: 330 lines (+305/-0) (has conflicts)4 files modifieddebian/patches/tvtime-1.0.2-autoconf.patch (+28/-0)
debian/patches/tvtime-1.0.2-xcommon.patch (+28/-0)
debian/po/eu.po.OTHER (+248/-0)
debian/source/format (+1/-0)
Branch information
- Owner:
- Ubuntu branches
- Status:
- Development
Recent revisions
- 30. By Andrew Starr-Bochicchio
-
* 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_persistenc e.patch,
tvtime-1.0.2-screensav er.patch, tvtime- 1.0.2-videoinpu t.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 XkbKeycodeToKey sym().
* 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. - 29. By Pojar Geo
-
* debian/
patches/ tvtime- 1.0.2-volume. patch: Leave volume muted when decreasing
volume, this way if the volume is accidentally way too loud, you can mute
and decrease without it coming back on. (LP: #962666)
* debian/patches/ tvtime- 1.0.2-output_ volume. patch: Add option to show output
volume percentage on startup.
* Update debian/patches/ pal_audio_ mode_persistenc e.patch to declare omitted
function + added header to patch. - 28. By Daniel Holbach
-
* debian/
patches/ tvtime- 1.0.2-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-tvtime- 1.0.2-xinerama. patch: Make it possible to
disable xinerama manually.
* Update tvtime-1.0.2-alsa. patch (The xfer_align and sleep_min is the obsolete
feature now. Remove it from audiolib.c to avoid deprecated calls)
* debian/rules: Lintian reports 2 warnings about this package (build-arch and
build-indep should be provided). OK - 25. By Martin Pitt
-
* debian/
patches/ tvtime- 1.0.2-usage. patch: Fix documentation for MENU_ENTER
and MENU_BACK, remove all historic "added in tvtime 0.9.x" notes from
usage.html (LP: #372822)
* debian/patches/ tvtime- 1.0.2-xvoutput. patch: Fix typo in url in an error
message. (LP: #947845)
* debian/patches/ tvtime- 1.0.2-command. patch: Fix crash on
"tvtime-command set_input_width 720" (LP: #947850)
* debian/patches/ tvtime- 1.0.2-build. patch: Fix two warnings when autoreconf
is called
* debian/patches/ tvtime- 1.0.2-libtool. patch: Fix a few issues requested by
libtool stuff
* debian/patches/ tvtime- 1.0.2-cursor. patch: Fix nocursor using uninitialized
pixmap data
* debian/patches/ tvtime- 1.0.2-metacity. patch: Remove check for metacity, the
result isn't used anyway and the problem probably doesn't exist anymore
either
* debian/patches/ tvtime- 1.0.2-x_ size_hint. patch: Remember our XSizeHints
structure so we don't destroy all our hints next time we try to update it
* debian/patches/ tvtime- 1.0.2-menu. patch: Change default right mouse button
bind to leave menu when in menu
* debian/patches/ tvtime- 1.0.2-focus_ mouse.patch: Don't force focus follows
mouse mode for our window, that's up to the window manager to decide
* debian/patches/ tvtime- 1.0.2-icon. patch: Fix setting the _NET_WM_ICON hint
on 64-bit systems. When Xlib says '32' it actually means 'unsigned long'.
Even if that is actually 64 bits
* debian/patches/ tvtime- 1.0.2-tvtimeosd .patch: Fix a warning about printf
format not being a string literal
* debian/patches/ tvtime- 1.0.2-cpuid. patch: Update for cpuaccel.c from
http://stapelspeicher. org/tvtime/ patches/ (originally from libmpeg2)
* debian/patches/ tvtime- 1.0.2-libpng- 1.5.patch: Include zlib.h explicitly as
it isn't done for us in libpng-1.5
* debian/patches/ tvtime- 1.0.2-xmltv. patch: Implementing more xmltv features,
show TV Guide program from XMLTV listings with "tvtime-command SHOW_EPG",
see documentation
* debian/patches/ tvtime- 1.0.2-vbidata. patch: Remove a debugging printf that
snuck out
* debian/patches/ tvtime- 1.0.2-verbose. patch: Print a helpful error message if
tvtime was miscompiled without X support
* debian/patches/ tvtime- 1.0.2-vbiscreen .patch: Import patch from tvtime
sourceforge tracker related to CC multiline clearing
* debian/patches/ tvtime- 1.0.2-closed_ caption. patch: Import patch from tvtime
sourceforge tracker related to CC double-byte chars
* debian/patches/ tvtime- 1.0.2-key_ event.patch: Fix command
"tvtime-command KEY_EVENT ENTER" in menu (LP: #951473)
* debian/control: update to starndards-version 3.9.3, no changes needed - 24. By Andrew Starr-Bochicchio
-
* debian/
patches/ tvtime- 1.0.2-videoinpu t.patch:
tvtime does not work with UVC webcams (LP: #383669)
* debian/patches/ tvtime- 1.0.2-osd. patch:
Increase osd fadeout time and make it a less sickly color (LP: #940194) - 23. By Pojar Geo
-
* debian/
patches/ tvtime- 1.0.2-screensav er.patch:
Use XScreenSaverExtension instead of typing text via Xtest (LP: #715242)
* debian/control: Build-depend on libxss instead of libxtst. - 22. By Pojar Geo
-
debian/
patches/ tvtime- 1.0.2-from- upstream- fullscreen- crash.patch:
Fix crash when toggling fullscreen (LP: #151479) - 21. By Daniel T Chen
-
* Update tvtime-
1.0.2-alsa. patch to resolve crashes when the default
video device is inappropriate. Patch from Markus Rechberger,
thanks! (LP: #575938, #552060)
- Delete tvtime-1.0.2-videoinpu t_get_audio- check-vidin. patch as a
result.
- Rediff tvtime-1.0.2-alsamixer .patch, pal_audio_ mode_persistenc e.patch.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/quantal/tvtime