146 files changed, 27 insertions, 27 deletions

diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/maverick/kdegraphics.automake/debian/KUBUNTU-DEBIAN-DIFFERENCES
index b7d2adb39..b7d2adb39 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/maverick/kdegraphics.automake/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/buildvars.mk b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/buildvars.mk
+++ b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/buildvars.mk
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
index a5e510758..a5e510758 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/kde.mk b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/kde.mk
index 5b6508f8c..5b6508f8c 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/team-members b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/team-members
index 05761af6e..05761af6e 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/team-members
+++ b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/team-members
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/uploaders.mk b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/uploaders.mk
+++ b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/uploaders.mk
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/versions.pl b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/versions.pl
index 9ce11d8a3..9ce11d8a3 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/changelog b/ubuntu/maverick/kdegraphics.automake/debian/changelog
index b4a9d5ba0..b4a9d5ba0 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/changelog
+++ b/ubuntu/maverick/kdegraphics.automake/debian/changelog
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/compat b/ubuntu/maverick/kdegraphics.automake/debian/compat
index 7ed6ff82d..7ed6ff82d 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/compat
+++ b/ubuntu/maverick/kdegraphics.automake/debian/compat
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/control b/ubuntu/maverick/kdegraphics.automake/debian/control
index cbae876fa..f96e97765 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/control
+++ b/ubuntu/maverick/kdegraphics.automake/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <[email protected]>
 Uploaders: Ana Beatriz Guerrero Lopez <[email protected]>, Francesco Pedrini <[email protected]>, Josh Metzler <[email protected]>, Sune Vuorela <[email protected]>
-Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
+Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kdegraphics-trinity
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/control.in b/ubuntu/maverick/kdegraphics.automake/debian/control.in
index 7801bad78..7801bad78 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/control.in
+++ b/ubuntu/maverick/kdegraphics.automake/debian/control.in
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/copyright b/ubuntu/maverick/kdegraphics.automake/debian/copyright
index 13e809000..13e809000 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/copyright
+++ b/ubuntu/maverick/kdegraphics.automake/debian/copyright
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kcolorchooser-16.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kcolorchooser-16.xpm
index 22a32da35..22a32da35 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kcolorchooser-16.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kcolorchooser-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kcolorchooser.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kcolorchooser.xpm
index 22d830b4b..22d830b4b 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kcolorchooser.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kcolorchooser.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kcoloredit-16.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kcoloredit-16.xpm
index 8e97bb914..8e97bb914 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kcoloredit-16.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kcoloredit-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kcoloredit.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kcoloredit.xpm
index 83b310ff0..83b310ff0 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kcoloredit.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kcoloredit.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kdvi-16.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kdvi-16.xpm
index db22767d4..db22767d4 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kdvi-16.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kdvi-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kdvi.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kdvi.xpm
index fe4db5b6c..fe4db5b6c 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kdvi.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kdvi.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kfax-16.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kfax-16.xpm
index 48804f8a5..48804f8a5 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kfax-16.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kfax-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kfax.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kfax.xpm
index bd969b13a..bd969b13a 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kfax.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kfax.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kfaxview-16.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kfaxview-16.xpm
index f5b699dcb..f5b699dcb 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kfaxview-16.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kfaxview-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kfaxview.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kfaxview.xpm
index aea8354f4..aea8354f4 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kfaxview.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kfaxview.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kghostview-16.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kghostview-16.xpm
index ccb9fa8ae..ccb9fa8ae 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kghostview-16.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kghostview-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kghostview.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kghostview.xpm
index 38bb64331..38bb64331 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kghostview.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kghostview.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kiconedit-16.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kiconedit-16.xpm
index 857f5fe1c..857f5fe1c 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kiconedit-16.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kiconedit-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kiconedit.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kiconedit.xpm
index 412544858..412544858 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kiconedit.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kiconedit.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kolourpaint-16.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kolourpaint-16.xpm
index 79cabaf05..79cabaf05 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kolourpaint-16.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kolourpaint-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kolourpaint.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kolourpaint.xpm
index 32eba9310..32eba9310 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kolourpaint.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kolourpaint.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kooka-16.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kooka-16.xpm
index 46cd10535..46cd10535 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kooka-16.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kooka-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kooka.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kooka.xpm
index c720c7d21..c720c7d21 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kooka.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kooka.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kpdf-16.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kpdf-16.xpm
index ce5082f88..ce5082f88 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kpdf-16.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kpdf-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kpdf.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kpdf.xpm
index ae032c341..ae032c341 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kpdf.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kpdf.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kpovmodeler-16.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kpovmodeler-16.xpm
index c25f014f0..c25f014f0 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kpovmodeler-16.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kpovmodeler-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kpovmodeler.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kpovmodeler.xpm
index a998ccda9..a998ccda9 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kpovmodeler.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kpovmodeler.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kruler-16.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kruler-16.xpm
index 3e5a27d03..3e5a27d03 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kruler-16.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kruler-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kruler.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kruler.xpm
index 030fad1f5..030fad1f5 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kruler.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kruler.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/ksnapshot-16.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/ksnapshot-16.xpm
index f97cb30aa..f97cb30aa 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/ksnapshot-16.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/ksnapshot-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/ksnapshot.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/ksnapshot.xpm
index 302c59d25..302c59d25 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/ksnapshot.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/ksnapshot.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kuickshow-16.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kuickshow-16.xpm
index cf91f34d9..cf91f34d9 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kuickshow-16.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kuickshow-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kuickshow.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kuickshow.xpm
index 5d2d6ca97..5d2d6ca97 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kuickshow.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kuickshow.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kview-16.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kview-16.xpm
index 886c4821b..886c4821b 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kview-16.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kview-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kview.xpm b/ubuntu/maverick/kdegraphics.automake/debian/icons/kview.xpm
index 606fc37e6..606fc37e6 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/icons/kview.xpm
+++ b/ubuntu/maverick/kdegraphics.automake/debian/icons/kview.xpm
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kamera-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kamera-trinity.install
index c615ebfaa..c615ebfaa 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kamera-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kamera-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kcoloredit-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.install
index 70f637e8d..70f637e8d 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kcoloredit-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kcoloredit-trinity.manpages b/ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.manpages
index e4673b667..e4673b667 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kcoloredit-trinity.manpages
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kcoloredit-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.menu
index a864f4fcb..a864f4fcb 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kcoloredit-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-dev-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install
index 3c15273ee..3c15273ee 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-dev-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kamera b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kamera
index d59c53442..d59c53442 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kamera
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kamera
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kcoloredit b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kcoloredit
index 99b6d6e74..99b6d6e74 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kcoloredit
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kcoloredit
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kdvi b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kdvi
index bc08bb1a5..bc08bb1a5 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kdvi
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kdvi
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kgamma b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kgamma
index 4f714187e..4f714187e 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kgamma
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kgamma
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kghostview b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kghostview
index 60fb9060e..60fb9060e 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kghostview
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kghostview
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kiconedit b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kiconedit
index 92959c240..92959c240 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kiconedit
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kiconedit
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kolourpaint b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kolourpaint
index 1d1164d7b..1d1164d7b 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kolourpaint
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kolourpaint
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kooka b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kooka
index ddc5cde52..ddc5cde52 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kooka
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kooka
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kpdf b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpdf
index ce0ad85f8..ce0ad85f8 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kpdf
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpdf
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kpovmodeler b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpovmodeler
index fa77c4a1c..fa77c4a1c 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kpovmodeler
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpovmodeler
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kruler b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kruler
index f6b3de6a3..f6b3de6a3 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kruler
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kruler
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.ksnapshot b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.ksnapshot
index 1518b4854..1518b4854 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.ksnapshot
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.ksnapshot
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kuickshow b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kuickshow
index e18e99ea0..e18e99ea0 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kuickshow
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kuickshow
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kview b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kview
index 018bcbe82..018bcbe82 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-doc-html.doc-base.kview
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kview
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-kfile-plugins-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install
index 44140e75f..44140e75f 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kdegraphics-kfile-plugins-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kdvi-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.install
index bb8b79129..bb8b79129 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kdvi-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kdvi-trinity.manpages b/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.manpages
index 6cab6e597..6cab6e597 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kdvi-trinity.manpages
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kdvi-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.menu
index fd6a7d3be..fd6a7d3be 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kdvi-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kdvi-trinity.mime b/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.mime
index 61bd2bb9b..61bd2bb9b 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kdvi-trinity.mime
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.mime
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kfax-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.install
index 5c08ae3e5..5c08ae3e5 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kfax-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kfax-trinity.manpages b/ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.manpages
index 57b6c7961..57b6c7961 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kfax-trinity.manpages
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kfax-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.menu
index 3498fed01..3498fed01 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kfax-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kfax-trinity.mime b/ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.mime
index e4aede21c..e4aede21c 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kfax-trinity.mime
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.mime
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kfaxview-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.install
index 1dab23cae..1dab23cae 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kfaxview-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kfaxview-trinity.lintian b/ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.lintian
index 7d86c17d3..7d86c17d3 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kfaxview-trinity.lintian
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kfaxview-trinity.manpages b/ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.manpages
index a30d1c56a..a30d1c56a 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kfaxview-trinity.manpages
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kfaxview-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.menu
index 64550dfb4..64550dfb4 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kfaxview-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kgamma-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kgamma-trinity.install
index 7a84c12f7..7a84c12f7 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kgamma-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kgamma-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kghostview-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.install
index 4fa99e814..4fa99e814 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kghostview-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kghostview-trinity.lintian b/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.lintian
index 5bf0bd75c..5bf0bd75c 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kghostview-trinity.lintian
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kghostview-trinity.manpages b/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.manpages
index 8cfcbdec7..8cfcbdec7 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kghostview-trinity.manpages
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kghostview-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.menu
index 70467d3f7..70467d3f7 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kghostview-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kghostview-trinity.mime b/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.mime
index b8894e89c..b8894e89c 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kghostview-trinity.mime
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.mime
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kiconedit-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.install
index ee15c189c..ee15c189c 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kiconedit-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kiconedit-trinity.manpages b/ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.manpages
index 2f136ed6c..2f136ed6c 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kiconedit-trinity.manpages
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kiconedit-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.menu
index 7add5c4f6..7add5c4f6 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kiconedit-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kmrml-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kmrml-trinity.install
index 55677d387..55677d387 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kmrml-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kmrml-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kmrml-trinity.lintian b/ubuntu/maverick/kdegraphics.automake/debian/kmrml-trinity.lintian
index 5c83f447b..5c83f447b 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kmrml-trinity.lintian
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kmrml-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kolourpaint-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.install
index d081a577f..d081a577f 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kolourpaint-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kolourpaint-trinity.manpages b/ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.manpages
index a10ddf05a..a10ddf05a 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kolourpaint-trinity.manpages
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kolourpaint-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.menu
index 4ae819ad3..4ae819ad3 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kolourpaint-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kooka-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.install
index 38d064424..38d064424 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kooka-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kooka-trinity.manpages b/ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.manpages
index 319f8652c..319f8652c 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kooka-trinity.manpages
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kooka-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.menu
index a1c221081..a1c221081 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kooka-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kpdf-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.install
index 0b6e562c7..0b6e562c7 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kpdf-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kpdf-trinity.manpages b/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.manpages
index 36f3caafb..36f3caafb 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kpdf-trinity.manpages
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kpdf-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.menu
index a9bf7aa0a..a9bf7aa0a 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kpdf-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kpdf-trinity.mime b/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.mime
index 7592a8adb..7592a8adb 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kpdf-trinity.mime
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.mime
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kpovmodeler-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.install
index a3d46f92e..a3d46f92e 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kpovmodeler-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kpovmodeler-trinity.lintian b/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.lintian
index 18443a699..18443a699 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kpovmodeler-trinity.lintian
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kpovmodeler-trinity.manpages b/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.manpages
index 11c1a16f8..11c1a16f8 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kpovmodeler-trinity.manpages
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kpovmodeler-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.menu
index 2ac1d39a7..2ac1d39a7 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kpovmodeler-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kruler-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.install
index b39d5a2e0..b39d5a2e0 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kruler-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kruler-trinity.manpages b/ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.manpages
index aac20ba29..aac20ba29 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kruler-trinity.manpages
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kruler-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.menu
index b84cda933..b84cda933 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kruler-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/ksnapshot-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.install
index 460875310..460875310 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/ksnapshot-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/ksnapshot-trinity.manpages b/ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.manpages
index efb781eba..efb781eba 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/ksnapshot-trinity.manpages
+++ b/ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/ksnapshot-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.menu
index 5939d5d61..5939d5d61 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/ksnapshot-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/ksvg-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/ksvg-trinity.install
index 7601fbad2..7601fbad2 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/ksvg-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/ksvg-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/ksvg-trinity.lintian b/ubuntu/maverick/kdegraphics.automake/debian/ksvg-trinity.lintian
index 9f56c22ee..9f56c22ee 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/ksvg-trinity.lintian
+++ b/ubuntu/maverick/kdegraphics.automake/debian/ksvg-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kuickshow-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.install
index 11c176bf6..11c176bf6 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kuickshow-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kuickshow-trinity.lintian b/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.lintian
index 61cb450ac..61cb450ac 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kuickshow-trinity.lintian
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kuickshow-trinity.manpages b/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.manpages
index 3eadda903..3eadda903 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kuickshow-trinity.manpages
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kuickshow-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.menu
index 4075305dc..4075305dc 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kuickshow-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kview-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.install
index 3203fc726..3203fc726 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kview-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kview-trinity.lintian b/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.lintian
index 8314a8155..8314a8155 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kview-trinity.lintian
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kview-trinity.manpages b/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.manpages
index bad8bf322..bad8bf322 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kview-trinity.manpages
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kview-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.menu
index e0779319d..e0779319d 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kview-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kview-trinity.mime b/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.mime
index 16e079720..16e079720 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kview-trinity.mime
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.mime
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kviewshell-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.install
index a43c470e3..a43c470e3 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kviewshell-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kviewshell-trinity.lintian b/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.lintian
index 4a0571207..4a0571207 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kviewshell-trinity.lintian
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/kviewshell-trinity.manpages b/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.manpages
index 89af3c5f2..89af3c5f2 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/kviewshell-trinity.manpages
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/libkscan-dev-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/libkscan-dev-trinity.install
index 29764eb5d..29764eb5d 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/libkscan-dev-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/libkscan-dev-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/libkscan1-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/libkscan1-trinity.install
index 00674e14c..00674e14c 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/libkscan1-trinity.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/libkscan1-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/libpoppler-tqt-dev.install b/ubuntu/maverick/kdegraphics.automake/debian/libpoppler-tqt-dev.install
index 57d9ec1d0..57d9ec1d0 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/libpoppler-tqt-dev.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/libpoppler-tqt-dev.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/libpoppler-tqt.install b/ubuntu/maverick/kdegraphics.automake/debian/libpoppler-tqt.install
index d63075962..d63075962 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/libpoppler-tqt.install
+++ b/ubuntu/maverick/kdegraphics.automake/debian/libpoppler-tqt.install
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/man/kcolorchooser.1 b/ubuntu/maverick/kdegraphics.automake/debian/man/kcolorchooser.1
index e856c927c..e856c927c 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/man/kcolorchooser.1
+++ b/ubuntu/maverick/kdegraphics.automake/debian/man/kcolorchooser.1
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/man/kcoloredit.1 b/ubuntu/maverick/kdegraphics.automake/debian/man/kcoloredit.1
index 95807e3cd..95807e3cd 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/man/kcoloredit.1
+++ b/ubuntu/maverick/kdegraphics.automake/debian/man/kcoloredit.1
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/man/kdvi.1 b/ubuntu/maverick/kdegraphics.automake/debian/man/kdvi.1
index 39bcbff11..39bcbff11 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/man/kdvi.1
+++ b/ubuntu/maverick/kdegraphics.automake/debian/man/kdvi.1
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/man/kfax.1 b/ubuntu/maverick/kdegraphics.automake/debian/man/kfax.1
index 9d97915ff..9d97915ff 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/man/kfax.1
+++ b/ubuntu/maverick/kdegraphics.automake/debian/man/kfax.1
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/man/kfaxview.1 b/ubuntu/maverick/kdegraphics.automake/debian/man/kfaxview.1
index 48dc9f74d..48dc9f74d 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/man/kfaxview.1
+++ b/ubuntu/maverick/kdegraphics.automake/debian/man/kfaxview.1
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/man/kghostview.1 b/ubuntu/maverick/kdegraphics.automake/debian/man/kghostview.1
index a29a2c025..a29a2c025 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/man/kghostview.1
+++ b/ubuntu/maverick/kdegraphics.automake/debian/man/kghostview.1
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/man/kiconedit.1 b/ubuntu/maverick/kdegraphics.automake/debian/man/kiconedit.1
index a91a5c1de..a91a5c1de 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/man/kiconedit.1
+++ b/ubuntu/maverick/kdegraphics.automake/debian/man/kiconedit.1
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/man/kolourpaint.1 b/ubuntu/maverick/kdegraphics.automake/debian/man/kolourpaint.1
index 3a736b48c..3a736b48c 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/man/kolourpaint.1
+++ b/ubuntu/maverick/kdegraphics.automake/debian/man/kolourpaint.1
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/man/kooka.1 b/ubuntu/maverick/kdegraphics.automake/debian/man/kooka.1
index fc14a0984..fc14a0984 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/man/kooka.1
+++ b/ubuntu/maverick/kdegraphics.automake/debian/man/kooka.1
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/man/kpdf.1 b/ubuntu/maverick/kdegraphics.automake/debian/man/kpdf.1
index 2b1ffaeeb..2b1ffaeeb 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/man/kpdf.1
+++ b/ubuntu/maverick/kdegraphics.automake/debian/man/kpdf.1
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/man/kpovmodeler.1 b/ubuntu/maverick/kdegraphics.automake/debian/man/kpovmodeler.1
index ca14d57b8..ca14d57b8 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/man/kpovmodeler.1
+++ b/ubuntu/maverick/kdegraphics.automake/debian/man/kpovmodeler.1
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/man/kruler.1 b/ubuntu/maverick/kdegraphics.automake/debian/man/kruler.1
index 617aef584..617aef584 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/man/kruler.1
+++ b/ubuntu/maverick/kdegraphics.automake/debian/man/kruler.1
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/man/ksnapshot.1 b/ubuntu/maverick/kdegraphics.automake/debian/man/ksnapshot.1
index abe516b09..abe516b09 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/man/ksnapshot.1
+++ b/ubuntu/maverick/kdegraphics.automake/debian/man/ksnapshot.1
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/man/kuickshow.1 b/ubuntu/maverick/kdegraphics.automake/debian/man/kuickshow.1
index 2675eae4e..2675eae4e 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/man/kuickshow.1
+++ b/ubuntu/maverick/kdegraphics.automake/debian/man/kuickshow.1
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/man/kview.1 b/ubuntu/maverick/kdegraphics.automake/debian/man/kview.1
index a506b7e20..a506b7e20 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/man/kview.1
+++ b/ubuntu/maverick/kdegraphics.automake/debian/man/kview.1
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/man/kviewshell.1 b/ubuntu/maverick/kdegraphics.automake/debian/man/kviewshell.1
index e9c762af2..e9c762af2 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/man/kviewshell.1
+++ b/ubuntu/maverick/kdegraphics.automake/debian/man/kviewshell.1
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/maverick/kdegraphics.automake/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/maverick/kdegraphics.automake/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/maverick/kdegraphics.automake/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/maverick/kdegraphics.automake/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/maverick/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/rules b/ubuntu/maverick/kdegraphics.automake/debian/rules
index 653c978ae..dc67d38f0 100755
--- a/ubuntu/maverick/kdegraphics.cmake/debian/rules
+++ b/ubuntu/maverick/kdegraphics.automake/debian/rules
@@ -1,25 +1,18 @@
-#!/usr/bin/make -f
-
-# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
-# Also include the main Trinity path
-ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
-else
-LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
-endif
-export LD_LIBRARY_PATH
+#! /usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
--DWITH_TIFF="ON" -DWITH_OPENEXR="ON" -DWITH_PDF="ON"
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
-# Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
-# never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" --with-extra-libs="/usr/lib/mesa"
 
 DEB_DH_STRIP_ARGS  := --dbg-package=kdegraphics-trinity-dbg
 
diff --git a/ubuntu/maverick/kdegraphics/debian/control b/ubuntu/maverick/kdegraphics/debian/control
index f96e97765..cbae876fa 100644
--- a/ubuntu/maverick/kdegraphics/debian/control
+++ b/ubuntu/maverick/kdegraphics/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <[email protected]>
 Uploaders: Ana Beatriz Guerrero Lopez <[email protected]>, Francesco Pedrini <[email protected]>, Josh Metzler <[email protected]>, Sune Vuorela <[email protected]>
-Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], automake, autoconf, libtool, libltdl-dev
+Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: kdegraphics-trinity
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/patches/.gitignore b/ubuntu/maverick/kdegraphics/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/patches/.gitignore
+++ b/ubuntu/maverick/kdegraphics/debian/patches/.gitignore
diff --git a/ubuntu/maverick/kdegraphics/debian/rules b/ubuntu/maverick/kdegraphics/debian/rules
index dc67d38f0..653c978ae 100755
--- a/ubuntu/maverick/kdegraphics/debian/rules
+++ b/ubuntu/maverick/kdegraphics/debian/rules
@@ -1,18 +1,25 @@
-#! /usr/bin/make -f
+#!/usr/bin/make -f
+
+# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
+# Also include the main Trinity path
+ifeq ("$(LD_LIBRARY_PATH)", "")
+LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
+else
+LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
+endif
+export LD_LIBRARY_PATH
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/debian-qt-kde.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \
+-DWITH_TIFF="ON" -DWITH_OPENEXR="ON" -DWITH_PDF="ON"
 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" --with-extra-libs="/usr/lib/mesa"
+# Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
+# never build in parallel, regardless of DEB_BUILD_OPTIONS.
+DEB_BUILD_PARALLEL = true
 
 DEB_DH_STRIP_ARGS  := --dbg-package=kdegraphics-trinity-dbg