Please Merge xine-lib 1.1.18.1-4 (main) from Debian unstable (main)

Bug #603059 reported by Scott Evans
4
This bug affects 1 person
Affects Status Importance Assigned to Milestone
xine-lib (Ubuntu)
Fix Released
Undecided
Reinhard Tartler

Bug Description

Please sync xine-lib 1.1.18.1-4 (main) from Debian unstable (main)

Explanation of the Ubuntu delta and why it can be dropped:
This version is required to resolve a version dependency to resolve Bug #602981
for requesting the latest version of Me TV

Changelog entries since current maverick version 1.1.17-1ubuntu4:

xine-lib (1.1.18.1-4) unstable; urgency=low

  * Fix dh 7 dh_xine sequence file installation.

 -- Darren Salt <email address hidden> Mon, 28 Jun 2010 23:58:21 +0100

xine-lib (1.1.18.1-3) unstable; urgency=low

  * Remove unnecessary symbols from the symbols file (FTBFS on powerpc).
  * Backport changes from upstream:
    - Make buildable with current (external) libdvdnav & libdvdread.
    - Handle odd widths properly (for ffmpeg-decoded video).
  * Use external libdvdnav & libdvdread.

 -- Darren Salt <email address hidden> Sun, 27 Jun 2010 12:00:49 +0100

xine-lib (1.1.18.1-2) unstable; urgency=low

  * Add a symbols file to libxine1-bin.
  * Add dh 7 support (dh --with xine).
  * Allow dh_xine to take package name suffixes.
    The defaults are 'x' and 'console'.

 -- Darren Salt <email address hidden> Sat, 26 Jun 2010 17:16:12 +0100

xine-lib (1.1.18.1-1) unstable; urgency=low

  * New upstream release.
    - Fixes skipping at stream start. (closes: #567579)
  * Tell dpkg-source to use a single patch file.
  * Build the v4l2 plugin; on Linux, build-depend on libv4l-dev.

 -- Darren Salt <email address hidden> Sun, 07 Mar 2010 00:00:21 +0000

Revision history for this message
Benjamin Drung (bdrung) wrote :

You didn't explain why the Ubuntu delta can be dropped. You probably want to merge the package.

Revision history for this message
Scott Evans (vk7hse) wrote :

putting this together on my Eee and I didn't notice that... that must have been part of the requestsync process, I don't understand what its asking! Ok Google has given me an answer, I'm not sure that applying the ubuntu delta will maintain the intended purpose but I'm not sure if this will break any other applications that may require a specific ubuntu tweak.

the sync/merge process is new to me so I'm open to further discussion as to what te best approach is.

Revision history for this message
Scott Evans (vk7hse) wrote :

if a merge is the better way then I'll need to swap to another PC as the Eee isn't set up for packaging etc...

Revision history for this message
Benjamin Drung (bdrung) wrote :

requestsync is only for requesting syncs. Here are some docs for the merge process: https://wiki.ubuntu.com/UbuntuDevelopment/Merging

Revision history for this message
Scott Evans (vk7hse) wrote :

just looking at https://merges.ubuntu.com/x/xine-lib/ reviels that the version that is in merges is not the latest 1.1.18-1 but the later version is 1.1.18-4 Output from merging is as follows...

scott@scott-desktop:~/src/merges$ ./grab-merge.sh xine-lib
Sure you want to delete all the files in /home/scott/src/merges [yn]? y
Getting xine-lib_1.1.17-1.dsc...
Getting xine-lib_1.1.17.orig.tar.bz2...
Getting xine-lib_1.1.17-1.debian.tar.gz...
Getting xine-lib_1.1.17-1ubuntu4.dsc...
Getting xine-lib_1.1.17.orig.tar.bz2...
Getting xine-lib_1.1.17-1ubuntu4.debian.tar.gz...
Getting xine-lib_1.1.17-1ubuntu4.patch...
Getting xine-lib_1.1.18.1-1.dsc...
Getting xine-lib_1.1.18.1.orig.tar.bz2...
Getting xine-lib_1.1.18.1-1.debian.tar.gz...
Getting xine-lib_1.1.18.1-1.patch...
Getting xine-lib_1.1.18.1-1ubuntu1.dsc...
Getting xine-lib_1.1.18.1-1ubuntu1.tar.gz...
Getting xine-lib_1.1.18.1-1ubuntu1.patch...

dpkg-source: warning: extracting unsigned source package (xine-lib_1.1.18.1-1ubuntu1.dsc)
dpkg-source: info: extracting xine-lib in xine-lib-1.1.18.1
dpkg-source: info: unpacking xine-lib_1.1.18.1-1ubuntu1.tar.gz

Run ../merge-genchanges or ../merge-buildpackage when done

*** WARNING ***

It looks like this package is maintained in revision control:

xine-lib_1.1.17-1.dsc:Vcs-Browser: http://hg.debian.org/hg/xine-lib/pkg/xine-lib-deb
xine-lib_1.1.17-1.dsc:Vcs-Hg: http://hg.debian.org/hg/xine-lib/pkg/xine-lib-deb
xine-lib_1.1.18.1-1.dsc:Vcs-Browser: http://hg.debian.org/hg/xine-lib/pkg/xine-lib-deb
xine-lib_1.1.18.1-1.dsc:Vcs-Hg: http://hg.debian.org/hg/xine-lib/pkg/xine-lib-deb

You almost certainly don't want to continue without investigating.

I'm inclined to think that the sync would be the better option, but open to further advice if its deemed not to be ...

Revision history for this message
Scott Evans (vk7hse) wrote : Re: [Bug 603059] Re: Sync xine-lib 1.1.18.1-4 (main) from Debian unstable (main)

On Thu, 2010-07-08 at 10:40 +0000, Benjamin Drung wrote:

> requestsync is only for requesting syncs. Here are some docs for the
> merge process: https://wiki.ubuntu.com/UbuntuDevelopment/Merging
>

Ok it appears that there was an earlier request on this package
https://bugs.launchpad.net/ubuntu/+source/xine-lib/+bug/550296

I'll work through the merge process and report back ASAP!
--
Scott Evans <email address hidden>

Revision history for this message
Scott Evans (vk7hse) wrote : Re: Sync xine-lib 1.1.18.1-4 (main) from Debian unstable (main)

this is required to be merged thus changing to invalid...

Changed in xine-lib (Ubuntu):
status: New → Invalid
status: Invalid → New
summary: - Sync xine-lib 1.1.18.1-4 (main) from Debian unstable (main)
+ Please Merge xine-lib 1.1.18.1-4 (main) from Debian unstable (main)
Revision history for this message
Scott Evans (vk7hse) wrote :

sorry got that wrong! ... needs a title change! (blush)

Revision history for this message
Reinhard Tartler (siretart) wrote :

merged version has reached maverick now

Changed in xine-lib (Ubuntu):
assignee: nobody → Reinhard Tartler (siretart)
status: New → Fix Released
Revision history for this message
Scott Evans (vk7hse) wrote : Re: [Bug 603059] Re: Please Merge xine-lib 1.1.18.1-4 (main) from Debian unstable (main)

On Fri, 2010-07-09 at 11:41 +0000, Reinhard Tartler wrote:

> merged version has reached maverick now
>
> ** Changed in: xine-lib (Ubuntu)
> Status: New => Fix Released
>
> ** Changed in: xine-lib (Ubuntu)
> Assignee: (unassigned) => Reinhard Tartler (siretart)

Thank you very much for your assistance with this ;-)

--
Scott Evans <email address hidden>

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.