Branch: master

6aafdb22 2014-12-30 03:23:48 François Andriot
RPM packaging: update filesystem
M redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
index 309fea0..2c919db 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
@@ -163,6 +163,7 @@
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/plugin
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/profiles
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/remotes
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/remoteview
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/videothumbnail
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/zeroconf
c52dc050 2014-12-30 03:24:42 François Andriot
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
M debian/lenny/dependencies/libr/debian/control
M debian/squeeze/dependencies/libr/debian/control
M ubuntu/maverick/dependencies/libr/debian/control
diff --git a/debian/lenny/dependencies/libr/debian/control b/debian/lenny/dependencies/libr/debian/control
index 6416670..b5451eb 100644
--- a/debian/lenny/dependencies/libr/debian/control
+++ b/debian/lenny/dependencies/libr/debian/control
@@ -1,7 +1,7 @@
 Source: libr
 Priority: extra
 Maintainer: Erich E. Hoover <ehoover@...>
-Build-Depends: debhelper (>= 7), quilt, autotools-dev, autopoint, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 7), quilt, autotools-dev, gettext (< 0.18) | autopoint, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Section: libs
 Homepage: http://www.compholio.com/elficon/
diff --git a/debian/squeeze/dependencies/libr/debian/control b/debian/squeeze/dependencies/libr/debian/control
index 6416670..b5451eb 100644
--- a/debian/squeeze/dependencies/libr/debian/control
+++ b/debian/squeeze/dependencies/libr/debian/control
@@ -1,7 +1,7 @@
 Source: libr
 Priority: extra
 Maintainer: Erich E. Hoover <ehoover@...>
-Build-Depends: debhelper (>= 7), quilt, autotools-dev, autopoint, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 7), quilt, autotools-dev, gettext (< 0.18) | autopoint, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Section: libs
 Homepage: http://www.compholio.com/elficon/
diff --git a/ubuntu/maverick/dependencies/libr/debian/control b/ubuntu/maverick/dependencies/libr/debian/control
index 6416670..b5451eb 100644
--- a/ubuntu/maverick/dependencies/libr/debian/control
+++ b/ubuntu/maverick/dependencies/libr/debian/control
@@ -1,7 +1,7 @@
 Source: libr
 Priority: extra
 Maintainer: Erich E. Hoover <ehoover@...>
-Build-Depends: debhelper (>= 7), quilt, autotools-dev, autopoint, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 7), quilt, autotools-dev, gettext (< 0.18) | autopoint, pkg-config, libglade2-dev, binutils-dev, doxygen, cvs, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Section: libs
 Homepage: http://www.compholio.com/elficon/
ffaa327d 2014-12-30 03:25:02 François Andriot
RPM packaging: update tdeutils
M redhat/main/tdeutils/tdeutils-14.0.0.spec
diff --git a/redhat/main/tdeutils/tdeutils-14.0.0.spec b/redhat/main/tdeutils/tdeutils-14.0.0.spec
index f90543e..beff24c 100644
--- a/redhat/main/tdeutils/tdeutils-14.0.0.spec
+++ b/redhat/main/tdeutils/tdeutils-14.0.0.spec
@@ -308,6 +308,7 @@
 %package -n trinity-kcharselect
 Summary:	character selector for Trinity
 Group:		Applications/Utilities
+Requires:	trinity-kicker
 
 %description -n trinity-kcharselect
 A character set selector for TDE.
@@ -419,6 +420,7 @@
 %package -n trinity-kdf
 Summary:	disk space utility for Trinity
 Group:		Applications/Utilities
+Requires:	trinity-kcontrol
 
 %description -n trinity-kdf
 KDiskFree displays the available file devices (hard drive partitions, floppy
@@ -664,6 +666,7 @@
 Summary:	battery monitoring and management for laptops using Trinity
 Group:		Applications/Utilities
 Requires:	pm-utils
+Requires:	trinity-kcontrol
 
 %if 0%{?with_consolehelper}
 # package 'usermode' provides '/usr/bin/consolehelper-gtk'
@@ -749,7 +752,9 @@
 %{tde_tdelibdir}/kmilo_generic.so
 %{tde_libdir}/libkmilo.so.*
 %{tde_datadir}/services/kded/kmilod.desktop
+%dir %{tde_datadir}/services/kmilo
 %{tde_datadir}/services/kmilo/kmilo_generic.desktop
+%dir %{tde_datadir}/servicetypes/kmilo
 %{tde_datadir}/servicetypes/kmilo/kmilopluginsvc.desktop
 
 %post -n trinity-kmilo
@@ -764,6 +769,7 @@
 Summary:	non-standard plugins for KMilo
 Group:		Applications/Utilities
 Requires:	trinity-kmilo = %{version}-%{release}
+Requires:	trinity-kcontrol
 
 %description -n trinity-kmilo-legacy
 KMilo lets you use the special keys on some keyboards and laptops.
@@ -840,6 +846,7 @@
 %package -n trinity-ksim
 Summary:	system information monitor for Trinity
 Group:		Applications/Utilities
+Requires:	trinity-kicker
 
 %description -n trinity-ksim
 KSim is a system monitor app which has its own plugin system with support