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

6 files changed, 8 insertions, 6 deletions

diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog
index dd416c496..d75004323 100644
--- a/ubuntu/maverick/tdelibs/debian/changelog
+++ b/ubuntu/maverick/tdelibs/debian/changelog
@@ -2083,7 +2083,7 @@ tdelibs (4:3.4.0-0pre5) alioth; urgency=low
     page. (Closes: #257588).
 
   * [cdbs/kde.mk] Use escaped variables in the definitions of kde_htmldir and
-    the like instead of absolute paths, so that /usr/bin/kde-config doesn't
+    the like instead of absolute paths, so that /usr/bin/tde-config doesn't
     output them expanded even when --expandvars is not used. (Closes: #287822)
 
   * Fixed the ability of the build system to find kde.pot, even when it is not
diff --git a/ubuntu/maverick/tdelibs/debian/control b/ubuntu/maverick/tdelibs/debian/control
index 232016009..36ddac249 100644
--- a/ubuntu/maverick/tdelibs/debian/control
+++ b/ubuntu/maverick/tdelibs/debian/control
@@ -16,7 +16,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev,
  libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev,
  sharutils, texinfo, libogg-dev, libtqtinterface-dev,
  gettext-kde, lsb-release, base-files, sudo, libr-dev,
- cmake, libltdl-dev
+ libudev-dev, cmake, libltdl-dev
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.3
 
@@ -89,7 +89,7 @@ Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 2.3.17),
  libsasl2-dev, libssl-dev, libxcomposite-dev,
  libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev,
  libavahi-client-dev (>= 0.4), libtqtinterface-dev,
- gettext-kde, libr-dev
+ gettext-kde, libr-dev, libudev-dev
 Provides: tdelibs-trinity-dev
 Description: development files for the TDE core libraries
  This package contains all the headers and other related files needed
diff --git a/ubuntu/maverick/tdelibs/debian/man/kde-config-trinity.sgml b/ubuntu/maverick/tdelibs/debian/man/tde-config-trinity.sgml
index 7be0ec30c..9e1fa9b3d 100644
--- a/ubuntu/maverick/tdelibs/debian/man/kde-config-trinity.sgml
+++ b/ubuntu/maverick/tdelibs/debian/man/tde-config-trinity.sgml
@@ -27,7 +27,7 @@ manpage.1: manpage.sgml
   <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
   <!ENTITY dhusername  "Chris Cheney">
   <!ENTITY dhucpackage "<refentrytitle>KDE-CONFIG</refentrytitle>">
-  <!ENTITY dhpackage   "kde-config">
+  <!ENTITY dhpackage   "tde-config">
 
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
index 3d2e8e43b..95be99174 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -826,3 +826,5 @@ debian/tmp/opt/trinity/lib/libvcard.la
 debian/tmp/opt/trinity/lib/libvcard.so
 
 debian/tmp/opt/trinity/share/cmake
+
+debian/tmp/opt/trinity/lib/pkgconfig/tdelibs.pc
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
index 3887f606d..46340c78b 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
@@ -18,7 +18,7 @@ debian/tmp/opt/trinity/bin/kaddprinterwizard
 debian/tmp/opt/trinity/bin/kbuildsycoca
 debian/tmp/opt/trinity/bin/kconf_update
 debian/tmp/opt/trinity/bin/kcookiejar
-debian/tmp/opt/trinity/bin/kde-config
+debian/tmp/opt/trinity/bin/tde-config
 debian/tmp/opt/trinity/bin/kded
 debian/tmp/opt/trinity/bin/tdeinit
 debian/tmp/opt/trinity/bin/tdeinit_shutdown
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages
index 00ed3a04e..ef5a28c2f 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.manpages
@@ -8,7 +8,7 @@ debian/man/out/kaddprinterwizard-trinity.1
 debian/man/out/kbuildsycoca-trinity.1
 debian/man/out/kconf_update-trinity.1
 debian/man/out/kcookiejar-trinity.1
-debian/man/out/kde-config-trinity.1
+debian/man/out/tde-config-trinity.1
 debian/man/out/kded-trinity.1
 debian/man/out/kdontchangethehostname-trinity.1
 debian/man/out/kfile-trinity.1