Merge lp://qastaging/~noskcaj/gnome-user-share/3.8 into lp://qastaging/~ubuntu-desktop/gnome-user-share/ubuntu

Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp://qastaging/~noskcaj/gnome-user-share/3.8
Merge into: lp://qastaging/~ubuntu-desktop/gnome-user-share/ubuntu
Diff against target: 944 lines (+562/-193)
14 files modified
debian/changelog (+90/-0)
debian/control (+9/-8)
debian/control.in (+8/-7)
debian/copyright (+0/-11)
debian/patches/01_notification.patch (+3/-1)
debian/patches/02_bluetooth_optional.patch (+318/-0)
debian/patches/04_webdav_optional.patch (+1/-137)
debian/patches/05_autostart_delay.patch (+22/-4)
debian/patches/06_nodisplay_autostart.patch (+23/-5)
debian/patches/07_onlyshowin_unity.patch (+29/-18)
debian/patches/10_apache_2.4.patch (+14/-0)
debian/patches/11_apache_noauth.patch (+41/-0)
debian/patches/series (+2/-0)
debian/rules (+2/-2)
To merge this branch: bzr merge lp://qastaging/~noskcaj/gnome-user-share/3.8
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Needs Information
Review via email: mp+266657@code.qastaging.launchpad.net

Description of the change

Merge 3.8.0-2 from debian, newer versions require bluez5, but this fixes some bugs and gives apache2.4 support

To post a comment you must log in.
18. By Jackson Doak

* New upstream release.
* Refresh 02_bluetooth_optional.patch.
* Bump Standards-Version to 3.9.4. No further changes.

Revision history for this message
Daniel Holbach (dholbach) wrote :

Debian seems to have 3.14.2-1 now. Do you have a link to the 3.8.0-2 source package? Do you know what the state is of having bluez5 in main?

review: Needs Information
Revision history for this message
Jackson Doak (noskcaj) wrote :

the link to the 3.8.3 source is https://download.gnome.org/sources/gnome-user-share/3.8/gnome-user-share-3.8.3.tar.xz , i got the debian source from pkg-gnome svn. bluez5 will be in ubuntu later this cycle hopefully, but we can't be sure.

Unmerged revisions

18. By Jackson Doak

* New upstream release.
* Refresh 02_bluetooth_optional.patch.
* Bump Standards-Version to 3.9.4. No further changes.

17. By Jackson Doak

* Merge with old debian release. Remaining changes:
* debian/control:
  - Suggests the apache2-bin and libapache2-mod-dnssd binaries rather than
    depends on those, we want obex push to work out of the box but we don't
    really need webdav and the apache binaries on the default installation.
* debian/dirs: Dropped, we don't need to create /usr/share/gnome.
* debian/gconf-defaults: Enable notifications on receipt of files by default
* debian/patches/01_notification.patch: Display an alert box instead
  of a notification for files received.
* debian/patches/02_bluetooth_optional.patch: Dropped, it's enables
  Bluetooth support to be configurable at build-time. We don't
  actually use it, it adds a lot of #ifdef's to the code, and requires
  some effort to port it to the new version.
* debian/patches/04_webdav_optional.patch:
  - De-senstize the WebDAV UI components if the suggested packages are
    not available for WebDAV sharing. Display a notice explaining why sharing
    cannot be enabled.
* debian/patches/05_autostart_delay.patch:
  - set X-GNOME-Autostart-Delay key to delay starting by 15 seconds.
* debian/patches/06_nodisplay_autostart.patch:
  - Don't show in "Startup Applications"
* debian/patches/07_onlyshowin_unity.patch:
  - Add Unity to OnlyShowIn
* debian/rules:
  - don't move autostart file from etc to usr
  - don't install the Nautilus bar. It's not that useful to people who don't
    have bluetooth hardware and is not easily disabled.
* debian/control.in:
  + Remove obsolete build dependency on scrollkeeper.
  + Switch apache2.2-bin dependency to apache2-bin for the Apache 2.4
    transition. Closes: #669729.
  + Bump minimum dependency on libapache2-mod-dnssd to 0.6-3.1~
    to get Apache 2.4 support.
* debian/patches/10_apache_2.4.patch:
  + Don't load mod_unixd.so as it is statically linked.
    Thanks Arno Töll for the insights.
* 11_apache_noauth.patch: fix the configuration with
  require_password=never. Thanks Arno Töll.
* New upstream release.
  + debian/control.in:
    - Update build dependencies.
  + debian/patches/02_bluetooth_optional.patch:
    - Updated.
  + debian/rules:
    - Pass --disable-bluetooth to configure on !linux.
* debian/rules: disable scrollkeeper
* New upstream release
* debian/patches/02_bluetooth_optional.patch
  + Updated
* Drop Build-Depends on libunique-3.0-dev.
* Bump Build-Depends on libglib2.0-dev to (>= 2.28.0).
* Update debian/copyright, drop outdated section about md5.[ch].
* Update Vcs-* URLs.
* Bump Standards-Version to 3.9.3.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: