Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[usb-moded] remove Gconf dependency and release 0.76.1
Signed-off-by: Philippe De Swert <philippe.deswert@jollamobile.com>
  • Loading branch information
philippedeswert committed Oct 29, 2013
1 parent f187e5c commit a2bf6d7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 23 deletions.
2 changes: 1 addition & 1 deletion configure.ac
@@ -1,4 +1,4 @@
AC_INIT([usb_moded], [0.75.3])
AC_INIT([usb_moded], [0.76.1])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])

AM_CONFIG_HEADER([config.h])
Expand Down
9 changes: 9 additions & 0 deletions debian/changelog
@@ -1,3 +1,12 @@
usb-moded (0.76) unstable; urgency=low

* Fix possible memory leak when setting the network config.
* Make sure the trigger does not get restarted when we clean up.
* Fix leak when setting the default mode configuration setting.
* [usb-moded] Fix memory corruption issue

-- Philippe De Swert <philippe.deswert@jollamobile.com> Tue, 29 Oct 2013 16:37:15 +0200

usb-moded (0.75) unstable; urgency=low

* [usb-moded] Fix network settings disappearing on a config file merge. Fixes: JB#10917
Expand Down
22 changes: 0 additions & 22 deletions rpm/usb-moded.spec
Expand Up @@ -11,19 +11,14 @@ Source2: usb_moded.conf

BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(udev)
BuildRequires: pkgconfig(libkmod)
BuildRequires: doxygen
BuildRequires: GConf2

Requires: lsof
Requires: usb-moded-configs
Requires: usb-moded-diagnostics-config
Requires(post): GConf2
Requires(pre): GConf2
Requires(preun): GConf2
Requires(post): systemd
Requires(postun): systemd

Expand Down Expand Up @@ -246,27 +241,10 @@ ln -s ../%{name}.service $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants/%
# Sync mode not packaged for now.
rm %{buildroot}/etc/usb-moded/dyn-modes/sync_mode.ini

%pre
if [ "$1" -gt 1 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
%{_sysconfdir}/gconf/schemas/usb-moded.schemas \
> /dev/null || :
fi

%preun
if [ "$1" -eq 0 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
%{_sysconfdir}/gconf/schemas/usb-moded.schemas \
> /dev/null || :
fi
systemctl daemon-reload

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/usb-moded.schemas > /dev/null || :
systemctl daemon-reload

%files
Expand Down

0 comments on commit a2bf6d7

Please sign in to comment.