[Bug 1602480] Re: Merge freerdp 1.1.0~git20140921.1.440916e+dfsg1-10 (main) from Debian unstable (main)

Jeremy Bicha jbicha at linux.com
Wed Jul 13 01:35:37 UTC 2016


What the diff was compared to Debian at the time of the last merge:

https://patches.ubuntu.com/f/freerdp/freerdp_1.1.0~git20140921.1.440916e+dfsg1-5ubuntu1.patch

** Description changed:

  Please merge freerdp 1.1.0~git20140921.1.440916e+dfsg1-10 (main) from
  Debian unstable (main)
  
  Explanation of the Ubuntu delta and why it can be dropped:
-     - Disable gstreamer support, this relies on gstreamer 0.10 and we don't
-       want to add any more deps on that.
+     - Disable gstreamer support, this relies on gstreamer 0.10 and we don't
+       want to add any more deps on that.
  
  gstreamer 0.10 support was disabled in devian revision 1-6 below.
  
  Explanation of the remaining Ubuntu delta:
-     - Disable ffmpeg support (it is in universe)
+     - Disable ffmpeg support (it is in universe)
  
  More specifically, building with ffmpeg adds ffmpeg dependencies to libfreerdp-plugins-standard
  which is depended on by remmina which is shipped on the primary Ubuntu iso.
  
+ Debian has added 4 new build-dependencies but all are already in main:
+ + libusb-1.0-0-dev [linux-any],
+ + libudev-dev [linux-any],
+ + libdbus-glib-1-dev,
+ + uuid-dev
  .
  
  Changelog entries since current yakkety version
  1.1.0~git20140921.1.440916e+dfsg1-5ubuntu1:
  
  freerdp (1.1.0~git20140921.1.440916e+dfsg1-10) unstable; urgency=medium
  
-   * debian/rules:
-     + Fix more DEB_HOST_* vs. DEB_BUILD_* issues. (Closes: #822842).
+   * debian/rules:
+     + Fix more DEB_HOST_* vs. DEB_BUILD_* issues. (Closes: #822842).
  
-  -- Mike Gabriel <sunweaver at debian.org>  Thu, 28 Apr 2016 23:01:32 +0200
+  -- Mike Gabriel <sunweaver at debian.org>  Thu, 28 Apr 2016 23:01:32 +0200
  
  freerdp (1.1.0~git20140921.1.440916e+dfsg1-9) unstable; urgency=medium
  
-   * debian/rules:
-     + Regression fix for usage of DEB_HOST_ARCH vs. DEB_BUILD_ARCH. Switching
-       back to DEB_HOST_ARCH to not break cross-builds. Thanks to Guillem Jover
-       for teaching me about the difference between those two options.
-       (Closes: #822842).
+   * debian/rules:
+     + Regression fix for usage of DEB_HOST_ARCH vs. DEB_BUILD_ARCH. Switching
+       back to DEB_HOST_ARCH to not break cross-builds. Thanks to Guillem Jover
+       for teaching me about the difference between those two options.
+       (Closes: #822842).
  
-  -- Mike Gabriel <sunweaver at debian.org>  Thu, 28 Apr 2016 12:58:12 +0200
+  -- Mike Gabriel <sunweaver at debian.org>  Thu, 28 Apr 2016 12:58:12 +0200
  
  freerdp (1.1.0~git20140921.1.440916e+dfsg1-8) unstable; urgency=medium
  
-   * debian/rules:
-     + Use DEB_BUILD_ARCH, rather than DEB_HOST_ARCH when detecting armhf build
-       system.
-   * debian/{control,rules}:
-     + Build with -DCHANNEL_URBDRC_CLIENT=on only on Linux OSes. (Closes:
-       #815614).
-   * debian/control:
-     + Bump Standards: to 3.9.7. No changes needed.
-     + Add recent MS Windows releases to LONG_DESCRIPTION (of bin:pkg
-       freerdp-x11).
+   * debian/rules:
+     + Use DEB_BUILD_ARCH, rather than DEB_HOST_ARCH when detecting armhf build
+       system.
+   * debian/{control,rules}:
+     + Build with -DCHANNEL_URBDRC_CLIENT=on only on Linux OSes. (Closes:
+       #815614).
+   * debian/control:
+     + Bump Standards: to 3.9.7. No changes needed.
+     + Add recent MS Windows releases to LONG_DESCRIPTION (of bin:pkg
+       freerdp-x11).
  
-  -- Mike Gabriel <sunweaver at debian.org>  Wed, 27 Apr 2016 21:35:58 +0200
+  -- Mike Gabriel <sunweaver at debian.org>  Wed, 27 Apr 2016 21:35:58 +0200
  
  freerdp (1.1.0~git20140921.1.440916e+dfsg1-7) unstable; urgency=medium
  
-   * debian/rules:
-     + Fix missing backslash in list of configure arguments. (Closes: #815317).
-       Thanks to Emilio Pozuelo Monfort for spotting this.
+   * debian/rules:
+     + Fix missing backslash in list of configure arguments. (Closes: #815317).
+       Thanks to Emilio Pozuelo Monfort for spotting this.
  
-  -- Mike Gabriel <sunweaver at debian.org>  Sat, 20 Feb 2016 22:41:45 +0100
+  -- Mike Gabriel <sunweaver at debian.org>  Sat, 20 Feb 2016 22:41:45 +0100
  
  freerdp (1.1.0~git20140921.1.440916e+dfsg1-6) unstable; urgency=medium
  
-   [ Sriram Raghunathan ]
-   * debian/control:
-     + Fix typo in control file which is used to show package info. (Closes:
-       #768855).
+   [ Sriram Raghunathan ]
+   * debian/control:
+     + Fix typo in control file which is used to show package info. (Closes:
+       #768855).
  
-   [ Lionel Elie Mamane ]
-   * Enable URBDRC (USB redirection) channel. (Closes: #788005).
+   [ Lionel Elie Mamane ]
+   * Enable URBDRC (USB redirection) channel. (Closes: #788005).
  
-   [ Alex 'AdUser' Z ]
-   * debian/patches:
-     + Add 1010_libudev-link.patch. Fix linking against libudev if building
-       USB redirection channel is enabled.
+   [ Alex 'AdUser' Z ]
+   * debian/patches:
+     + Add 1010_libudev-link.patch. Fix linking against libudev if building
+       USB redirection channel is enabled.
  
-   [ Mike Gabriel ]
-   * debian/{control,rules}:
-     + Drop B-D: libgstreamer-plugins-base0.10-dev. This requires disabling
-       gstreamer support and is a wanted and temporary regression. With
-       upcoming freerdp2 upload to Debian, gstreamer1.0 support will be
-       (re-)introduced. (Closes: #785898).
-   * debian/control:
-     + Add B-Ds: libusb-1.0-0-dev, libudev-dev, libdbus-glib-1-dev, uuid-dev.
-     + Use encrypted URLs for Vcs-*: field.
-     + Versioned B-D on dpkg-dev (>= 1.16.1.1).
-   * debian/rules:
-     + Enable all hardening flags.
-   * debian/patches:
-     + Add 0005_release-keys-when-xfreerdp-is-unfocused-to-prevent-s.patch.
-       Prevent Alt key from getting "stuck" with -grab-keyboard option when
-       using Alt-Tab to switch between local X windows. Thanks to Petr
-       Vorel <petr.vorel at gmail.com> for providing the patch. (Closes: #778650).
-     + Add 0006_fix-null-cert-that-is-not-an-error.patch. Fix null certificate
-       that is not an error. Thanks to Nathan Schulte for referencing the
-       upstream commit. Patch backported by myself to this freerdp Git snapshot.
-       (Closes: #803891).
-     + Add 0007_Fix-build-failure-on-x32.patch. Fix FTBFS on x32 architecture.
-       Thanks to Adam Borowski for providing this patch. (Closes: #808503).
-     + Add 1012_typo-fix.patch. Fix spelling of the work "occurred".
+   [ Mike Gabriel ]
+   * debian/{control,rules}:
+     + Drop B-D: libgstreamer-plugins-base0.10-dev. This requires disabling
+       gstreamer support and is a wanted and temporary regression. With
+       upcoming freerdp2 upload to Debian, gstreamer1.0 support will be
+       (re-)introduced. (Closes: #785898).
+   * debian/control:
+     + Add B-Ds: libusb-1.0-0-dev, libudev-dev, libdbus-glib-1-dev, uuid-dev.
+     + Use encrypted URLs for Vcs-*: field.
+     + Versioned B-D on dpkg-dev (>= 1.16.1.1).
+   * debian/rules:
+     + Enable all hardening flags.
+   * debian/patches:
+     + Add 0005_release-keys-when-xfreerdp-is-unfocused-to-prevent-s.patch.
+       Prevent Alt key from getting "stuck" with -grab-keyboard option when
+       using Alt-Tab to switch between local X windows. Thanks to Petr
+       Vorel <petr.vorel at gmail.com> for providing the patch. (Closes: #778650).
+     + Add 0006_fix-null-cert-that-is-not-an-error.patch. Fix null certificate
+       that is not an error. Thanks to Nathan Schulte for referencing the
+       upstream commit. Patch backported by myself to this freerdp Git snapshot.
+       (Closes: #803891).
+     + Add 0007_Fix-build-failure-on-x32.patch. Fix FTBFS on x32 architecture.
+       Thanks to Adam Borowski for providing this patch. (Closes: #808503).
+     + Add 1012_typo-fix.patch. Fix spelling of the work "occurred".
  
-   [ Andreas Cadhalpun ]
-   * debian/patches:
-     + Add 1011_ffmpeg-2.9.patch. Fix FTBFS against ffmpeg-2.9. (Closes:
-       #803814).
+   [ Andreas Cadhalpun ]
+   * debian/patches:
+     + Add 1011_ffmpeg-2.9.patch. Fix FTBFS against ffmpeg-2.9. (Closes:
+       #803814).
  
-  -- Mike Gabriel <sunweaver at debian.org>  Fri, 19 Feb 2016 09:02:00 +0100
+  -- Mike Gabriel <sunweaver at debian.org>  Fri, 19 Feb 2016 09:02:00 +0100

-- 
You received this bug notification because you are a member of Ubuntu
Sponsors Team, which is subscribed to the bug report.
https://bugs.launchpad.net/bugs/1602480

Title:
  Merge freerdp 1.1.0~git20140921.1.440916e+dfsg1-10 (main) from Debian
  unstable (main)

Status in freerdp package in Ubuntu:
  New

Bug description:
  Please merge freerdp 1.1.0~git20140921.1.440916e+dfsg1-10 (main) from
  Debian unstable (main)

  Explanation of the Ubuntu delta and why it can be dropped:
      - Disable gstreamer support, this relies on gstreamer 0.10 and we don't
        want to add any more deps on that.

  gstreamer 0.10 support was disabled in devian revision 1-6 below.

  Explanation of the remaining Ubuntu delta:
      - Disable ffmpeg support (it is in universe)

  More specifically, building with ffmpeg adds ffmpeg dependencies to libfreerdp-plugins-standard
  which is depended on by remmina which is shipped on the primary Ubuntu iso.

  Debian has added 4 new build-dependencies but all are already in main:
  + libusb-1.0-0-dev [linux-any],
  + libudev-dev [linux-any],
  + libdbus-glib-1-dev,
  + uuid-dev
  .

  Changelog entries since current yakkety version
  1.1.0~git20140921.1.440916e+dfsg1-5ubuntu1:

  freerdp (1.1.0~git20140921.1.440916e+dfsg1-10) unstable;
  urgency=medium

    * debian/rules:
      + Fix more DEB_HOST_* vs. DEB_BUILD_* issues. (Closes: #822842).

   -- Mike Gabriel <sunweaver at debian.org>  Thu, 28 Apr 2016 23:01:32
  +0200

  freerdp (1.1.0~git20140921.1.440916e+dfsg1-9) unstable; urgency=medium

    * debian/rules:
      + Regression fix for usage of DEB_HOST_ARCH vs. DEB_BUILD_ARCH. Switching
        back to DEB_HOST_ARCH to not break cross-builds. Thanks to Guillem Jover
        for teaching me about the difference between those two options.
        (Closes: #822842).

   -- Mike Gabriel <sunweaver at debian.org>  Thu, 28 Apr 2016 12:58:12
  +0200

  freerdp (1.1.0~git20140921.1.440916e+dfsg1-8) unstable; urgency=medium

    * debian/rules:
      + Use DEB_BUILD_ARCH, rather than DEB_HOST_ARCH when detecting armhf build
        system.
    * debian/{control,rules}:
      + Build with -DCHANNEL_URBDRC_CLIENT=on only on Linux OSes. (Closes:
        #815614).
    * debian/control:
      + Bump Standards: to 3.9.7. No changes needed.
      + Add recent MS Windows releases to LONG_DESCRIPTION (of bin:pkg
        freerdp-x11).

   -- Mike Gabriel <sunweaver at debian.org>  Wed, 27 Apr 2016 21:35:58
  +0200

  freerdp (1.1.0~git20140921.1.440916e+dfsg1-7) unstable; urgency=medium

    * debian/rules:
      + Fix missing backslash in list of configure arguments. (Closes: #815317).
        Thanks to Emilio Pozuelo Monfort for spotting this.

   -- Mike Gabriel <sunweaver at debian.org>  Sat, 20 Feb 2016 22:41:45
  +0100

  freerdp (1.1.0~git20140921.1.440916e+dfsg1-6) unstable; urgency=medium

    [ Sriram Raghunathan ]
    * debian/control:
      + Fix typo in control file which is used to show package info. (Closes:
        #768855).

    [ Lionel Elie Mamane ]
    * Enable URBDRC (USB redirection) channel. (Closes: #788005).

    [ Alex 'AdUser' Z ]
    * debian/patches:
      + Add 1010_libudev-link.patch. Fix linking against libudev if building
        USB redirection channel is enabled.

    [ Mike Gabriel ]
    * debian/{control,rules}:
      + Drop B-D: libgstreamer-plugins-base0.10-dev. This requires disabling
        gstreamer support and is a wanted and temporary regression. With
        upcoming freerdp2 upload to Debian, gstreamer1.0 support will be
        (re-)introduced. (Closes: #785898).
    * debian/control:
      + Add B-Ds: libusb-1.0-0-dev, libudev-dev, libdbus-glib-1-dev, uuid-dev.
      + Use encrypted URLs for Vcs-*: field.
      + Versioned B-D on dpkg-dev (>= 1.16.1.1).
    * debian/rules:
      + Enable all hardening flags.
    * debian/patches:
      + Add 0005_release-keys-when-xfreerdp-is-unfocused-to-prevent-s.patch.
        Prevent Alt key from getting "stuck" with -grab-keyboard option when
        using Alt-Tab to switch between local X windows. Thanks to Petr
        Vorel <petr.vorel at gmail.com> for providing the patch. (Closes: #778650).
      + Add 0006_fix-null-cert-that-is-not-an-error.patch. Fix null certificate
        that is not an error. Thanks to Nathan Schulte for referencing the
        upstream commit. Patch backported by myself to this freerdp Git snapshot.
        (Closes: #803891).
      + Add 0007_Fix-build-failure-on-x32.patch. Fix FTBFS on x32 architecture.
        Thanks to Adam Borowski for providing this patch. (Closes: #808503).
      + Add 1012_typo-fix.patch. Fix spelling of the work "occurred".

    [ Andreas Cadhalpun ]
    * debian/patches:
      + Add 1011_ffmpeg-2.9.patch. Fix FTBFS against ffmpeg-2.9. (Closes:
        #803814).

   -- Mike Gabriel <sunweaver at debian.org>  Fri, 19 Feb 2016 09:02:00
  +0100

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/freerdp/+bug/1602480/+subscriptions



More information about the Ubuntu-sponsors mailing list