Try to fix the autopoint dependency on older Ubuntu versions

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/

Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

diff --git a/redhat/main/tdeutils/tdeutils-14.0.0.spec b/redhat/main/tdeutils/tdeutils-14.0.0.spec
index 11844d8..f90543e 100644
--- a/redhat/main/tdeutils/tdeutils-14.0.0.spec
+++ b/redhat/main/tdeutils/tdeutils-14.0.0.spec
@@ -477,7 +477,7 @@
 %{tde_tdelibdir}/kedit.so
 %{tde_libdir}/libtdeinit_kedit.so
 %{tde_tdeappdir}/KEdit.desktop
-%{tde_datadir}/apps/kedit/keditui.rc
+%{tde_datadir}/apps/kedit/
 %{tde_datadir}/config.kcfg/kedit.kcfg
 %{tde_datadir}/icons/hicolor/*/apps/kedit.png
 %{tde_tdedocdir}/HTML/en/kedit/
@@ -601,7 +601,7 @@
 %{tde_libdir}/libkhexeditcommon.so.*
 %{tde_tdeappdir}/khexedit.desktop
 %{tde_datadir}/apps/khexedit/
-%{tde_datadir}/apps/khexedit2part/khexedit2partui.rc
+%{tde_datadir}/apps/khexedit2part/
 %{tde_datadir}/icons/hicolor/*/apps/khexedit.png
 %{tde_datadir}/services/kbyteseditwidget.desktop
 %{tde_datadir}/services/khexedit2part.desktop
@@ -967,8 +967,8 @@
 %files -n trinity-superkaramba
 %defattr(-,root,root,-)
 %{tde_bindir}/superkaramba
-%{tde_datadir}/applnk/Utilities/superkaramba.desktop
-%{tde_datadir}/apps/superkaramba/superkarambaui.rc
+%{tde_tdeappdir}/superkaramba.desktop
+%{tde_datadir}/apps/superkaramba/
 %{tde_datadir}/icons/crystalsvg/*/apps/superkaramba.png
 %{tde_datadir}/icons/crystalsvg/*/mimetypes/superkaramba_theme.png
 %{tde_datadir}/icons/crystalsvg/scalable/apps/superkaramba.svgz
@@ -1131,6 +1131,9 @@
 
 %endif
 
+# Fix desktop shortcut location
+%__mv "%{?buildroot}%{tde_datadir}/applnk/Utilities/superkaramba.desktop" "%{?buildroot}%{tde_tdeappdir}/superkaramba.desktop"
+
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
 %suse_update_desktop_file KEdit              Utility TextEditor