lp:~superm1/xfce4-utils/fix-xdg-fallback

Created by Mario Limonciello on 2009-04-11 and last modified on 2009-04-11
Get this branch:
bzr branch lp:~superm1/xfce4-utils/fix-xdg-fallback
Only Mario Limonciello can upload to this branch. If you are Mario Limonciello please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Mario Limonciello
Project:
Xfce4 Utilities
Status:
Development

Recent revisions

110. By Mario Limonciello on 2009-04-11

Update xubuntu_update-xdg-config-and-data-dirs.patch to also include
/etc/xdg so that any settings that are not defined in the XDG_CONFIG_DIRS
directory can be defined by /etc/xdg. (LP: #350962)

109. By Lionel Le Folgoc on 2009-03-01

releasing version 4.6.0-1ubuntu1

108. By Lionel Le Folgoc on 2009-03-01

releasing version 4.6.0-1ubuntu1

107. By Lionel Le Folgoc on 2009-02-07

* debian/patches:
  - xubuntu_update-xdg-config-and-data-dirs.patch: prepend "/etc/xdg/xubuntu"
    to XDG_{CONFIG,DATA}_DIRS to allow xubuntu-default-settings config files
    to override upstream ones
  - 00_xdg_data_dirs.patch: dropped, included in the above one
  - series: refreshed.

106. By Lionel Le Folgoc on 2009-02-07

build-depends on libdbus-glib-1-dev (>= 0.33)

105. By Lionel Le Folgoc on 2009-02-07

debian/patches/02_xfce4-about_return_version.patch: dropped, merged
upstream.

104. By Lionel Le Folgoc on 2009-02-07

* Merge with Debian pkg-xfce UNRELEASED, remaining Ubuntu changes:
  - debian/control:
    + use our Vcs-* fields
    + allow gnome-screensaver to satisfy the screensaver Recommends. Prevents
      derivatives from pulling in xscreensaver. (LP: #264594)
  - debian/patches/00_xdg_data_dirs.patch: make sure to add /etc/xdg/xubuntu
    even if XDG_DATA_DIRS is already set
  - debian/patches/02_xfce4-about_return_version.patch: patch to print Xfce4
    version when passed arg "--xfce-version" as part of the
    about-this-computer spec
  - debian/patches/04_avoid-xcblib-hang.patch: avoid race condition and
    deadlock in libxcb by launching dbus-launch before gnome-screensaver
    (which should occur anyhow). (LP: #232364)
  - debian/patches/series: refreshed
  - debian/rules:
    + pass --with-vendor-info=Xubuntu to ./configure
    + do not replace firefox calls with iceweasel
  - debian/Xubuntu: added
* Merge from Debian Xfce SVN Unreleased, remaining Ubuntu changes:
  - debian/control: allow gnome-screensaver to satisfy the screensaver
    Recommends. Prevents derivatives from pulling in xscreensaver.
    (LP: #264594)
  - debian/patches/00_xdg_data_dirs.patch: make sure to add /etc/xdg/xubuntu
    even if XDG_DATA_DIRS is already set
  - debian/patches/02_xfce4-about_return_version.patch: patch to print Xfce4
    version when passed arg "--xfce-version" as part of the
    about-this-computer spec
  - debian/patches/04_avoid-xcblib-hang.patch: avoid race condition and
    deadlock in libxcb by launching dbus-launch before gnome-screensaver
    (which should occur anyhow). (LP: #232364)
  - debian/patches/series: refreshed
  - debian/rules:
    + pass --enable-dbus --with-vendor-info=Ubuntu to ./configure
    + do not replace firefox calls with iceweasel
  - debian/Ubuntu: added
* new upstream bugfix release
* debian/control:
  - update standards version to 3.8.0.
* debian/rules:
  - stop messing with config.{guess,sub}.
* Translations: cherry-pick from upstream 4.4 svn branch:
  - Urdu, Kurdish, Indonesian translations added
  - Spanish, Albanian, Latvian translations updated.
* New patch debian/patches/99_update_translations.patch created and enabled
  for this.
* debian/control:
  - Allow gnome-screensaver to satisfy the screensaver Recommends.
    Prevents derivatives from pulling in xscreensaver. (LP: #264594)
* debian/patches/04_avoid-xcblib-hang.patch: UPDATED
  - Drop sleep 1 after dbus-launch, not needed.
* debian/patches/04_avoid-xcblib-hang.patch: NEW
  - Avoid race condition and deadlock in libxcb by launching
     dbus-launch before gnome-screensaver (which should occur anyhow).
  - Added sleep 1 after dbus-launch to help avoid race condition.
  - Fixes lp: #232364
* debian/control:
  - Updated maintainer field to Xubuntu Developers.
  - Bumped standards version to 3.8.0
* debian/control: re-adhere to DebianMaintainerField.
* Merge from debian unstable, remaining changes:
  - debian/patches/00_xdg_data_dirs.patch: make sure to add /etc/xdg/xubuntu
    even if XDG_DATA_DIRS is already set
  - debian/patches/02_xfce4-about_return_version.patch: patch to print Xfce4
    version when passed arg "--xfce-version" as part of the
    about-this-computer spec
  - debian/rules: pass --enable-dbus --with-vendor-info=Ubuntu to
    ./configure
  - debian/Ubuntu: added
* debian/rules: do not replace firefox calls with iceweasel
* Merge from Debian unstable. Remaining Ubuntu changes:
  - switch to cdbs
  - debian/control:
    + b-d on autotools-dev, debhelper (>= 5), cdbs and drop chrpath
    + adhere to DebianMaintainerField
  - debian/patches/00_xdg_data_dirs.patch:
    make sure to add /etc/xdg/xubuntu even if XDG_DATA_DIRS is already set
  - debian/patches/02_xfce4-about_return_version.patch:
    patch to print Xfce4 version when passed arg "--xfce-version" as part of
    the about-this-computer spec
  - debian/rules: pass --enable-dbus --with-vendor-info=Ubuntu to ./configure
  - debian/compat: bump to 5.
* debian/control:
  - drop quilt from b-d
  - do not depend on exo-utils (not in the archive yet).
* debian/patches/series: dropped.
* debian/rules, debian/Ubuntu: install missing vendor infos. (LP: #177742)
* debian/patches/02_xfce4-about_return_version.patch:
  . Created patch to print Xfce4 version when passed
    arg "--xfce-version" as part of the about-this-computer
    spec.
* Merge from Debian unstable. Remaining Ubuntu changes:
  - switch to cdbs
  - debian/control:
    + b-d on autotools-dev, debhelper (>= 5), cdbs & libdbus-glib-1-dev, and
      drop chrpath
    + adhere to DebianMaintainerField
    + recommends dbus
  - debian/patches/00_xdg_data_dirs.patch:
    make sure to add /etc/xdg/xubuntu even if XDG_DATA_DIRS is already set
  - debian/rules: pass --enable-dbus --with-vendor-info=Ubuntu
  - debian/compat: bump to 5.
* Merge from Debian unstable. Remaining Ubuntu changes:
  - switch to cdbs
  - debian/control:
    + b-d on cdbs & libdbus-glib-1-dev, and drop chrpath & dpatch
    + adhere to DebianMaintainerField
    + recommends dbus
  - debian/patches/00_xdg_data_dirs.patch:
    make sure to add /etc/xdg/xubuntu even if XDG_DATA_DIRS is already set
  - debian/rules: pass --enable-dbus.
* debian/patches:
  - 00_xdg_data_dirs.patch: updated
  - 01_gnome_screensaver.patch: dropped.
* debian/compat: bump to 5.
* debian/control: bump debhelper b-d to (>= 5), add autotools-dev.
* debian/rules: pass --with-vendor-info=Ubuntu.
* debian/patches/01_gnome_screensaver.patch: correctly check for
  gnome-screensaver, thanks Camille Dominique for the patch. (LP: #161758)
* Merge from Debian unstable. Remaining Ubuntu changes:
  - debian/patches/00_xdg_data_dirs.patch:
    make sure to add /etc/xdg/xubuntu even if XDG_DATA_DIRS is already set
  - debian/patches/01_gnome_screensaver.patch:
    try launching gnome-screensaver first, fall back to xscreensaver
* debian/patches/00_xdg_data_dirs.patch:
  make sure to add /etc/xdg/xubuntu even if XDG_DATA_DIRS is already set
* debian/patches/01_gnome_screensaver.patch:
  fix test for return value of executing gnome-screensaver
* debian/patches/01_gnome_screensaver.patch: updated, also patch xflock4 to
  run gnome-screensaver if present (thanks Marcin Gąsiorowski).
* debian/patches/00_xdg_data_dirs.patch:
  Do not add /usr/share twice to $XDG_DATA_DIRS
* debian/patches/01_gnome_screensaver.patch:
    Try launching gnome-screensaver first, fall back to xscreensaver
* Merge from debian unstable, remaining changes:
  - use xfce.mk
  - 00_xdg_data_dirs.patch: add specific xubuntu config dir
  - keep using firefox as browser in xfbrowser4
* Updated Maitainer field
* New upstream release
* debian/rules: do not remove the COPYING file, used by xfce4-about
  LP #75158
* Thighten B-D versions
* New upstream release (4.4RC2)
* Bump standards version and Xfce libs versions (B-D)
* Remove extra license file
* Rebuild against dbus 0.90
* Upstream svn snapshot
* debian/patches/00_xdg_data_dirs: the only change left compared
  to upstream is setting custom XDG_DATA_DIRS
* Make the command inherit the directory where xfrun4 was invoked,
  do not start it in the filesystem root (LP #45179)
* Upstream svn snapshot (set XDG_DATA_DIRS, add Czech translation)
* Prepend /etc/xdg/xubuntu to XDG_DATA_DIRS so we can override default
  MIME handlers in /usr/share/applications/defaults.list
* Fix cancel button disappearing on click (LP bug #43277)
* Upstream svn snapshot
* Enable xfrun4 called via dbus and Recommend dbus
* Remove postinst/prerm which restart xfce-mcs-manager
* Upstream svn snapshot (4.4 beta1)
* Revert last change since xfdesktop creates ~/Desktop now
* Create ~/Desktop in xinitrc if that directory does not exist
  for the current user
* Upstream svn snapshot (fixes LP #31556)
* Upstream svn snapshot
* Add translation domain entry to .desktop files
* Switch to CDBS
* Remove obsolete xinerama patch and postrm
* Upstream svn snapshot
* Bump all depends to 4.3
* Upstream svn snapshot
* UVF exception granted

103. By Lionel Le Folgoc on 2009-02-07

set merge mode

102. By corsac on 2009-01-28

* debian/patches/01_xflock4-test-running-screensaver.patch:
  - refresh patch to force blank mode in xlock, as it's known to be quite
    insecure anyway.

101. By corsac on 2009-01-26

* new upstream release candidate.
* debian/control:
  - update build-deps for “Capybara”.

Branch metadata

Branch format:
Branch format 6
Repository format:
Bazaar pack repository format 1 with rich root (needs bzr 1.0)
This branch contains Public information 
Everyone can see this information.