Finish renaming kiconedit->tdeiconedit on Debian and Ubuntu

debian/lenny/metapackages/rename-meta/debian/control

@@ -264,6 +264,12 @@ Depends: tdegraphics-trinity-dbg
 Conflicts: kdegraphics-trinity-dbg (<< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
+Package: kiconedit-trinity
+Architecture: all
+Depends: tdeiconedit-trinity
+Conflicts: kiconedit-trinity (<< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
 Package: kdesvn-trinity
 Architecture: all
 Depends: tdesvn-trinity

debian/lenny/tdegraphics/debian/control

@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdegraphics-trinity (<< 4:14.0.0~)
 Breaks: kdegraphics-trinity (<< 4:14.0.0~)
-Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
+Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), tdeiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
 Suggests: tdegraphics-trinity-doc-html (>= ${source:Version})
 Description: graphics apps from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -176,7 +176,7 @@ Description: PostScript viewer for Trinity
  This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
-Package: kiconedit-trinity
+Package: tdeiconedit-trinity
 Section: graphics
 Architecture: any
 Replaces: kiconedit-trinity (<< 4:14.0.0~)

debian/lenny/tdegraphics/debian/control.in

@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdegraphics
 Section: tde
 Architecture: all
-Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), kiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
+Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), tdeiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
 Suggests: tdegraphics-doc-html (>= ${source:Version})
 Description: graphics apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -154,7 +154,7 @@ Description: PostScript viewer for KDE
  This package is part of KDE, as a component of the KDE graphics module.
  See the 'kde' and 'tdegraphics' packages for more information.
 
-Package: kiconedit
+Package: tdeiconedit
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}

debian/lenny/tdegraphics/debian/icons/tdeiconedit-16.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *kiconedit-16[] = {
+static char *tdeiconedit-16[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 20 1",
 "  c black",

debian/lenny/tdegraphics/debian/icons/tdeiconedit.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *kiconedit[] = {
+static char *tdeiconedit[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 242 2",
 "   c #000000",

debian/lenny/tdegraphics/debian/kcoloredit-trinity.menu

@@ -1,4 +1,4 @@
-?package(kcoloredit):\
+?package(kcoloredit-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
@@ -7,7 +7,7 @@
 	icon16x16="/opt/trinity/share/pixmaps/kcolorchooser-16.xpm"\
 	command="/opt/trinity/bin/kcolorchooser"
 
-?package(kcoloredit):\
+?package(kcoloredit-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

debian/lenny/tdegraphics/debian/kdvi-trinity.menu

@@ -1,4 +1,4 @@
-?package(kdvi):\
+?package(kdvi-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,DVI,Documents"\

debian/lenny/tdegraphics/debian/kfax-trinity.menu

@@ -1,4 +1,4 @@
-?package(kfax):\
+?package(kfax-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

debian/lenny/tdegraphics/debian/kfaxview-trinity.menu

@@ -1,4 +1,4 @@
-?package(kfaxview):\
+?package(kfaxview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

debian/lenny/tdegraphics/debian/kghostview-trinity.menu

@@ -1,4 +1,4 @@
-?package(kghostview):\
+?package(kghostview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,Documents"\

debian/lenny/tdegraphics/debian/kiconedit-trinity.install

@@ -1,41 +0,0 @@
-debian/tmp/opt/trinity/bin/kiconedit
-debian/tmp/opt/trinity/share/applications/tde/kiconedit.desktop
-debian/tmp/opt/trinity/share/apps/kiconedit/kiconeditui.rc
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/aim-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/aim.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/airbrush-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/areaselect.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/circle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/colorpicker-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/compressed.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/ellipse.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/eraser-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/fileclose.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/fill-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledcircle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledellipse.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledrectangle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/grayscale.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/grid.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/kdepalette.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/line.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/paintbrush-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/pointer.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/rectangle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/selectcircle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/selectrect.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/source.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/standard.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/transform.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/window_new.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/kiconedit-configuration.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kiconedit.png
-
-debian/icons/kiconedit.xpm		/opt/trinity/share/pixmaps
-debian/icons/kiconedit-16.xpm		/opt/trinity/share/pixmaps

debian/lenny/tdegraphics/debian/kiconedit-trinity.manpages

@@ -1 +0,0 @@
-debian/man/kiconedit.1

debian/lenny/tdegraphics/debian/kiconedit-trinity.menu

@@ -1,11 +0,0 @@
-?package(kiconedit):\
-	needs="X11"\
-	section="Applications/Graphics"\
-	hints="TDE"\
-	title="TDEIconEdit"\
-	icon32x32="/opt/trinity/share/pixmaps/kiconedit.xpm"\
-	icon16x16="/opt/trinity/share/pixmaps/kiconedit-16.xpm"\
-	command="/opt/trinity/bin/kiconedit"
-
-# Icon 32x32 kiconedit/pics/cr32-app-kiconedit.png kiconedit.xpm
-# Icon 16x16 kiconedit/pics/cr16-app-kiconedit.png kiconedit-16.xpm

debian/lenny/tdegraphics/debian/kolourpaint-trinity.menu

@@ -1,4 +1,4 @@
-?package(kolourpaint):\
+?package(kolourpaint-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

debian/lenny/tdegraphics/debian/kooka-trinity.menu

@@ -1,4 +1,4 @@
-?package(kooka):\
+?package(kooka-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

debian/lenny/tdegraphics/debian/kpdf-trinity.menu

@@ -1,4 +1,4 @@
-?package(kpdf):\
+?package(kpdf-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

debian/lenny/tdegraphics/debian/kpovmodeler-trinity.menu

@@ -1,4 +1,4 @@
-?package(kpovmodeler):\
+?package(kpovmodeler-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE,Modeler"\

debian/lenny/tdegraphics/debian/kruler-trinity.menu

@@ -1,4 +1,4 @@
-?package(kruler):\
+?package(kruler-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

debian/lenny/tdegraphics/debian/ksnapshot-trinity.menu

@@ -1,4 +1,4 @@
-?package(ksnapshot):\
+?package(ksnapshot-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

debian/lenny/tdegraphics/debian/kuickshow-trinity.menu

@@ -1,4 +1,4 @@
-?package(kuickshow):\
+?package(kuickshow-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

debian/lenny/tdegraphics/debian/kview-trinity.menu

@@ -1,4 +1,4 @@
-?package(kview):\
+?package(kview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,Images"\

debian/lenny/tdegraphics/debian/man/tdeiconedit.1

@@ -1,21 +1,21 @@
-.TH KICONEDIT "1" "September 2002" KDE "KDE Application"
+.TH TDEICONEDIT "1" "September 2002" TDE "TDE Application"
 .SH NAME
-kiconedit \- KDE Icon Editor
+tdeiconedit \- TDE Icon Editor
 .SH SYNOPSIS
-.B kiconedit
+.B tdeiconedit
 [\fIQt-options\fR] [\fIKDE-options\fR] [\fIfile(s)\fR]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B TDEIconEdit
-KDE Application.
+TDE Application.
 This manual page was written for the Debian GNU/Linux distribution
 because the original program does not have a manual page.
 .P
 .B TDEIconEdit
-is designed to help create icons for KDE using the standard
+is designed to help create icons for TDE using the standard
 icon palette.  
 .PP
-KDE Icon Editor
+TDE Icon Editor
 .SH AUTHOR
 TDEIconEdit was written by
 .nh
@@ -40,7 +40,7 @@ Show help about options
 \fB\-\-help\-qt\fR
 Show Qt specific options
 .TP
-\fB\-\-help\-kde\fR
+\fB\-\-help\-tde\fR
 Show KDE specific options
 .TP
 \fB\-\-help\-all\fR
@@ -68,7 +68,7 @@ is maintained as a docbook manual.  If the
 .B khelpcenter
 program is properly installed at your site, the command
 .IP
-.B khelpcenter help:/kiconedit
+.B khelpcenter help:/tdeiconedit
 .PP
 should give you access to the complete manual.
 .SH AUTHOR

debian/lenny/tdegraphics/debian/rules

@@ -14,9 +14,21 @@ include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.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" \
--DCMAKE_BUILD_TYPE=RelWithDebInfo
+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/" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DBUILD_ALL="ON" \
+ -DWITH_TIFF="ON" \
+ -DWITH_OPENEXR="ON" \
+ -DWITH_PDF="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
@@ -57,81 +69,49 @@ kuickshow-trinity-tar:
 	cd ..; tar zcf kuickshow-trinity_3.5.8.orig.tar.gz kuickshow-trinity-3.5.8
 
 binary-post-install/kpdf-trinity::
-	#cp -Rp debian/kpdf-trinity/usr/* debian/kpdf-trinity/opt/trinity/
-	#rm -rf debian/kpdf-trinity/usr/
 	mv debian/kpdf-trinity/usr/share/man debian/kpdf-trinity/opt/trinity/share/
 
 binary-post-install/kghostview-trinity::
-	#cp -Rp debian/kghostview-trinity/usr/* debian/kghostview-trinity/opt/trinity/
-	#rm -rf debian/kghostview-trinity/usr/
 	mv debian/kghostview-trinity/usr/share/man debian/kghostview-trinity/opt/trinity/share/
 
 binary-post-install/kcolorchooser-trinity::
-	#cp -Rp debian/kcolorchooser-trinity/usr/* debian/kcolorchooser-trinity/opt/trinity/
-	#rm -rf debian/kcolorchooser-trinity/usr/
 	mv debian/kcolorchooser-trinity/usr/share/man debian/kcolorchooser-trinity/opt/trinity/share/
 
 binary-post-install/kdvi-trinity::
-	#cp -Rp debian/kdvi-trinity/usr/* debian/kdvi-trinity/opt/trinity/
-	#rm -rf debian/kdvi-trinity/usr/
 	mv debian/kdvi-trinity/usr/share/man debian/kdvi-trinity/opt/trinity/share/
 
 binary-post-install/kfaxview-trinity::
-	#cp -Rp debian/kfaxview-trinity/usr/* debian/kfaxview-trinity/opt/trinity/
-	#rm -rf debian/kfaxview-trinity/usr/	
 	mv debian/kfaxview-trinity/usr/share/man debian/kfaxview-trinity/opt/trinity/share/
 
-binary-post-install/kiconedit-trinity::
-	#cp -Rp debian/kiconedit-trinity/usr/* debian/kiconedit-trinity/opt/trinity/
-	#rm -rf debian/kiconedit-trinity/usr/	
-	mv debian/kiconedit-trinity/usr/share/man debian/kiconedit-trinity/opt/trinity/share/
+binary-post-install/tdeiconedit-trinity::
+	mv debian/tdeiconedit-trinity/usr/share/man debian/tdeiconedit-trinity/opt/trinity/share/
 
 binary-post-install/kooka-trinity::
-	#cp -Rp debian/kooka-trinity/usr/* debian/kooka-trinity/opt/trinity/
-	#rm -rf debian/kooka-trinity/usr/
 	mv debian/kooka-trinity/usr/share/man debian/kooka-trinity/opt/trinity/share/
 
 binary-post-install/kpovmodeler-trinity::
-	#cp -Rp debian/kpovmodeler-trinity/usr/* debian/kpovmodeler-trinity/opt/trinity/
-	#rm -rf debian/kpovmodeler-trinity/usr/
 	mv debian/kpovmodeler-trinity/usr/share/man debian/kpovmodeler-trinity/opt/trinity/share/
 
 binary-post-install/ksnapshot-trinity::
-	#cp -Rp debian/ksnapshot-trinity/usr/* debian/ksnapshot-trinity/opt/trinity/
-	#rm -rf debian/ksnapshot-trinity/usr/
 	mv debian/ksnapshot-trinity/usr/share/man debian/ksnapshot-trinity/opt/trinity/share/
 
 binary-post-install/kview-trinity::
-	#cp -Rp debian/kview-trinity/usr/* debian/kview-trinity/opt/trinity/
-	#rm -rf debian/kview-trinity/usr/
 	mv debian/kview-trinity/usr/share/man debian/kview-trinity/opt/trinity/share/
 
 binary-post-install/kcoloredit-trinity::
-	#cp -Rp debian/kcoloredit-trinity/usr/* debian/kcoloredit-trinity/opt/trinity/
-	#rm -rf debian/kcoloredit-trinity/usr/
 	mv debian/kcoloredit-trinity/usr/share/man debian/kcoloredit-trinity/opt/trinity/share/
 
 binary-post-install/kfax-trinity::
-	#cp -Rp debian/kfax-trinity/usr/* debian/kfax-trinity/opt/trinity/
-	#rm -rf debian/kfax-trinity/usr/
 	mv debian/kfax-trinity/usr/share/man debian/kfax-trinity/opt/trinity/share/
 
 binary-post-install/kolourpaint-trinity::
-	#cp -Rp debian/kolourpaint-trinity/usr/* debian/kolourpaint-trinity/opt/trinity/
-	#rm -rf debian/kolourpaint-trinity/usr/
 	mv debian/kolourpaint-trinity/usr/share/man debian/kolourpaint-trinity/opt/trinity/share/
 
 binary-post-install/kruler-trinity::
-	#cp -Rp debian/kruler-trinity/usr/* debian/kruler-trinity/opt/trinity/
-	#rm -rf debian/kruler-trinity/usr/
 	mv debian/kruler-trinity/usr/share/man debian/kruler-trinity/opt/trinity/share/
 
 binary-post-install/kuickshow-trinity::
-	#cp -Rp debian/kuickshow-trinity/usr/* debian/kuickshow-trinity/opt/trinity/
-	#rm -rf debian/kuickshow-trinity/usr/
 	mv debian/kuickshow-trinity/usr/share/man debian/kuickshow-trinity/opt/trinity/share/
 
 binary-post-install/kviewshell-trinity::
-	#cp -Rp debian/kviewshell-trinity/usr/* debian/kviewshell-trinity/opt/trinity/
-	#rm -rf debian/kviewshell-trinity/usr/
 	mv debian/kviewshell-trinity/usr/share/man debian/kviewshell-trinity/opt/trinity/share/

debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera

@@ -5,6 +5,6 @@ Abstract: Kamera allows you to view and download images on a digital camera.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kamera/index.html
-Files: /usr/share/doc/tde/HTML/en/kamera/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kamera/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kamera/*.html
 

debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit

@@ -6,6 +6,6 @@ Abstract: KColorEdit is a palette files editor. It can be used for editing
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kcoloredit/index.html
-Files: /usr/share/doc/tde/HTML/en/kcoloredit/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kcoloredit/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kcoloredit/*.html
 

debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi

@@ -5,6 +5,6 @@ Abstract: This program and KPart allow the user to display *.DVI files from TeX.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kdvi/index.html
-Files: /usr/share/doc/tde/HTML/en/kdvi/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kdvi/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kdvi/*.html
 

debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma

@@ -5,6 +5,6 @@ Abstract: KGamma is a simple tool for monitor gamma correction.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kgamma/index.html
-Files: /usr/share/doc/tde/HTML/en/kgamma/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kgamma/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kgamma/*.html
 

debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview

@@ -6,6 +6,6 @@ Abstract: KGhostView displays and prints PostScript and
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kghostview/index.html
-Files: /usr/share/doc/tde/HTML/en/kghostview/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kghostview/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kghostview/*.html
 

debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint

@@ -5,6 +5,6 @@ Abstract: KolourPaint is a free, easy-to-use paint program for KDE.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kolourpaint/index.html
-Files: /usr/share/doc/tde/HTML/en/kolourpaint/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kolourpaint/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kolourpaint/*.html
 

debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka

@@ -5,6 +5,6 @@ Abstract: Kooka is a very useful KDE scanning application.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kooka/index.html
-Files: /usr/share/doc/tde/HTML/en/kooka/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kooka/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kooka/*.html
 

debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf

@@ -5,6 +5,6 @@ Abstract: KPDF is a KDE PDF viewer based on xpdf code.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpdf/index.html
-Files: /usr/share/doc/tde/HTML/en/kpdf/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpdf/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpdf/*.html
 

debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler

@@ -6,6 +6,6 @@ Abstract: KPovModeler is a graphical 3D modeler, which can generate
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpovmodeler/index.html
-Files: /usr/share/doc/tde/HTML/en/kpovmodeler/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpovmodeler/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpovmodeler/*.html
 

debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler

@@ -5,6 +5,6 @@ Abstract: KRuler can be used to measure objects on the screen.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kruler/index.html
-Files: /usr/share/doc/tde/HTML/en/kruler/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kruler/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kruler/*.html
 

debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot

@@ -5,6 +5,6 @@ Abstract: KSnapshot is a simple applet for taking screenshots.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/ksnapshot/index.html
-Files: /usr/share/doc/tde/HTML/en/ksnapshot/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/ksnapshot/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/ksnapshot/*.html
 

debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow

@@ -5,6 +5,6 @@ Abstract: KuickShow is a comfortable image browser/viewer.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kuickshow/index.html
-Files: /usr/share/doc/tde/HTML/en/kuickshow/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kuickshow/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kuickshow/*.html
 

debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview

@@ -5,6 +5,6 @@ Abstract: KView is an image viewing program.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kview/index.html
-Files: /usr/share/doc/tde/HTML/en/kview/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kview/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kview/*.html
 

debian/lenny/tdegraphics/debian/tdegraphics-doc-html.doc-base.tdeiconedit

@@ -1,4 +1,4 @@
-Document: tdegraphics-doc-html-kiconedit
+Document: tdegraphics-doc-html-tdeiconedit
 Title: TDEIconEdit Handbook
 Author: Thomas Tanghus, Lauri Watts
 Abstract: TDEIconEdit is designed to help create icons for KDE using the
@@ -6,6 +6,6 @@ Abstract: TDEIconEdit is designed to help create icons for KDE using the
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kiconedit/index.html
-Files: /usr/share/doc/tde/HTML/en/kiconedit/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/tdeiconedit/*.html
 

debian/lenny/tdegraphics/debian/tdeiconedit-trinity.install

@@ -0,0 +1,41 @@
+debian/tmp/opt/trinity/bin/tdeiconedit
+debian/tmp/opt/trinity/share/applications/tde/tdeiconedit.desktop
+debian/tmp/opt/trinity/share/apps/tdeiconedit/tdeiconeditui.rc
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/aim-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/aim.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/airbrush-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/areaselect.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/circle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/colorpicker-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/compressed.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/ellipse.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/eraser-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/fileclose.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/fill-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledcircle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledellipse.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledrectangle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/grayscale.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/grid.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/kdepalette.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/line.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/paintbrush-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/pointer.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/rectangle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/selectcircle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/selectrect.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/source.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/standard.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/transform.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/window_new.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/tdeiconedit-configuration.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdeiconedit.png
+
+debian/icons/tdeiconedit.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeiconedit-16.xpm		/opt/trinity/share/pixmaps

debian/lenny/tdegraphics/debian/tdeiconedit-trinity.manpages

@@ -0,0 +1 @@
+debian/man/tdeiconedit.1

debian/lenny/tdegraphics/debian/tdeiconedit-trinity.menu

@@ -0,0 +1,11 @@
+?package(tdeiconedit-trinity):\
+	needs="X11"\
+	section="Applications/Graphics"\
+	hints="TDE"\
+	title="TDEIconEdit"\
+	icon32x32="/opt/trinity/share/pixmaps/tdeiconedit.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeiconedit-16.xpm"\
+	command="/opt/trinity/bin/tdeiconedit"
+
+# Icon 32x32 tdeiconedit/pics/cr32-app-tdeiconedit.png tdeiconedit.xpm
+# Icon 16x16 tdeiconedit/pics/cr16-app-tdeiconedit.png tdeiconedit-16.xpm

debian/lenny/tdevelop/debian/control

@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebas
 Replaces: kdevelop-trinity (<< 4:14.0.0~)
 Breaks: kdevelop-trinity (<< 4:14.0.0~)
 Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
-Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, kiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
+Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
 Description: An IDE for Unix/X11
  KDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 

debian/squeeze/metapackages/rename-meta/debian/control

@@ -264,6 +264,12 @@ Depends: tdegraphics-trinity-dbg
 Conflicts: kdegraphics-trinity-dbg (<< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
+Package: kiconedit-trinity
+Architecture: all
+Depends: tdeiconedit-trinity
+Conflicts: kiconedit-trinity (<< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
 Package: kdesvn-trinity
 Architecture: all
 Depends: tdesvn-trinity

debian/squeeze/tdegraphics/debian/control

@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdegraphics-trinity (<< 4:14.0.0~)
 Breaks: kdegraphics-trinity (<< 4:14.0.0~)
-Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
+Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), tdeiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
 Suggests: tdegraphics-trinity-doc-html (>= ${source:Version})
 Description: graphics apps from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -176,7 +176,7 @@ Description: PostScript viewer for Trinity
  This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
-Package: kiconedit-trinity
+Package: tdeiconedit-trinity
 Section: graphics
 Architecture: any
 Replaces: kiconedit-trinity (<< 4:14.0.0~)

debian/squeeze/tdegraphics/debian/control.in

@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdegraphics
 Section: tde
 Architecture: all
-Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), kiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
+Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), tdeiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
 Suggests: tdegraphics-doc-html (>= ${source:Version})
 Description: graphics apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -154,7 +154,7 @@ Description: PostScript viewer for KDE
  This package is part of KDE, as a component of the KDE graphics module.
  See the 'kde' and 'tdegraphics' packages for more information.
 
-Package: kiconedit
+Package: tdeiconedit
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}

debian/squeeze/tdegraphics/debian/icons/tdeiconedit-16.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *kiconedit-16[] = {
+static char *tdeiconedit-16[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 20 1",
 "  c black",

debian/squeeze/tdegraphics/debian/icons/tdeiconedit.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *kiconedit[] = {
+static char *tdeiconedit[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 242 2",
 "   c #000000",

debian/squeeze/tdegraphics/debian/kcoloredit-trinity.menu

@@ -1,4 +1,4 @@
-?package(kcoloredit):\
+?package(kcoloredit-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
@@ -7,7 +7,7 @@
 	icon16x16="/opt/trinity/share/pixmaps/kcolorchooser-16.xpm"\
 	command="/opt/trinity/bin/kcolorchooser"
 
-?package(kcoloredit):\
+?package(kcoloredit-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

debian/squeeze/tdegraphics/debian/kdvi-trinity.menu

@@ -1,4 +1,4 @@
-?package(kdvi):\
+?package(kdvi-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,DVI,Documents"\

debian/squeeze/tdegraphics/debian/kfax-trinity.menu

@@ -1,4 +1,4 @@
-?package(kfax):\
+?package(kfax-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

debian/squeeze/tdegraphics/debian/kfaxview-trinity.menu

@@ -1,4 +1,4 @@
-?package(kfaxview):\
+?package(kfaxview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

debian/squeeze/tdegraphics/debian/kghostview-trinity.menu

@@ -1,4 +1,4 @@
-?package(kghostview):\
+?package(kghostview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,Documents"\

debian/squeeze/tdegraphics/debian/kiconedit-trinity.install

@@ -1,41 +0,0 @@
-debian/tmp/opt/trinity/bin/kiconedit
-debian/tmp/opt/trinity/share/applications/tde/kiconedit.desktop
-debian/tmp/opt/trinity/share/apps/kiconedit/kiconeditui.rc
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/aim-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/aim.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/airbrush-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/areaselect.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/circle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/colorpicker-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/compressed.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/ellipse.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/eraser-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/fileclose.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/fill-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledcircle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledellipse.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledrectangle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/grayscale.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/grid.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/kdepalette.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/line.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/paintbrush-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/pointer.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/rectangle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/selectcircle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/selectrect.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/source.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/standard.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/transform.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/window_new.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/kiconedit-configuration.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kiconedit.png
-
-debian/icons/kiconedit.xpm		/opt/trinity/share/pixmaps
-debian/icons/kiconedit-16.xpm		/opt/trinity/share/pixmaps

debian/squeeze/tdegraphics/debian/kiconedit-trinity.manpages

@@ -1 +0,0 @@
-debian/man/kiconedit.1

debian/squeeze/tdegraphics/debian/kiconedit-trinity.menu

@@ -1,11 +0,0 @@
-?package(kiconedit):\
-	needs="X11"\
-	section="Applications/Graphics"\
-	hints="TDE"\
-	title="TDEIconEdit"\
-	icon32x32="/opt/trinity/share/pixmaps/kiconedit.xpm"\
-	icon16x16="/opt/trinity/share/pixmaps/kiconedit-16.xpm"\
-	command="/opt/trinity/bin/kiconedit"
-
-# Icon 32x32 kiconedit/pics/cr32-app-kiconedit.png kiconedit.xpm
-# Icon 16x16 kiconedit/pics/cr16-app-kiconedit.png kiconedit-16.xpm

debian/squeeze/tdegraphics/debian/kolourpaint-trinity.menu

@@ -1,4 +1,4 @@
-?package(kolourpaint):\
+?package(kolourpaint-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

debian/squeeze/tdegraphics/debian/kooka-trinity.menu

@@ -1,4 +1,4 @@
-?package(kooka):\
+?package(kooka-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

debian/squeeze/tdegraphics/debian/kpdf-trinity.menu

@@ -1,4 +1,4 @@
-?package(kpdf):\
+?package(kpdf-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

debian/squeeze/tdegraphics/debian/kpovmodeler-trinity.menu

@@ -1,4 +1,4 @@
-?package(kpovmodeler):\
+?package(kpovmodeler-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE,Modeler"\

debian/squeeze/tdegraphics/debian/kruler-trinity.menu

@@ -1,4 +1,4 @@
-?package(kruler):\
+?package(kruler-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

debian/squeeze/tdegraphics/debian/ksnapshot-trinity.menu

@@ -1,4 +1,4 @@
-?package(ksnapshot):\
+?package(ksnapshot-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

debian/squeeze/tdegraphics/debian/kuickshow-trinity.menu

@@ -1,4 +1,4 @@
-?package(kuickshow):\
+?package(kuickshow-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

debian/squeeze/tdegraphics/debian/kview-trinity.menu

@@ -1,4 +1,4 @@
-?package(kview):\
+?package(kview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,Images"\

debian/squeeze/tdegraphics/debian/man/tdeiconedit.1

@@ -1,21 +1,21 @@
-.TH KICONEDIT "1" "September 2002" KDE "KDE Application"
+.TH TDEICONEDIT "1" "September 2002" TDE "TDE Application"
 .SH NAME
-kiconedit \- KDE Icon Editor
+tdeiconedit \- TDE Icon Editor
 .SH SYNOPSIS
-.B kiconedit
+.B tdeiconedit
 [\fIQt-options\fR] [\fIKDE-options\fR] [\fIfile(s)\fR]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B TDEIconEdit
-KDE Application.
+TDE Application.
 This manual page was written for the Debian GNU/Linux distribution
 because the original program does not have a manual page.
 .P
 .B TDEIconEdit
-is designed to help create icons for KDE using the standard
+is designed to help create icons for TDE using the standard
 icon palette.  
 .PP
-KDE Icon Editor
+TDE Icon Editor
 .SH AUTHOR
 TDEIconEdit was written by
 .nh
@@ -40,7 +40,7 @@ Show help about options
 \fB\-\-help\-qt\fR
 Show Qt specific options
 .TP
-\fB\-\-help\-kde\fR
+\fB\-\-help\-tde\fR
 Show KDE specific options
 .TP
 \fB\-\-help\-all\fR
@@ -68,7 +68,7 @@ is maintained as a docbook manual.  If the
 .B khelpcenter
 program is properly installed at your site, the command
 .IP
-.B khelpcenter help:/kiconedit
+.B khelpcenter help:/tdeiconedit
 .PP
 should give you access to the complete manual.
 .SH AUTHOR

debian/squeeze/tdegraphics/debian/rules

@@ -14,9 +14,21 @@ include /usr/share/cdbs/1/class/cmake.mk
 #include /usr/share/cdbs/1/rules/patchsys-quilt.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" \
--DCMAKE_BUILD_TYPE=RelWithDebInfo
+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/" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DBUILD_ALL="ON" \
+ -DWITH_TIFF="ON" \
+ -DWITH_OPENEXR="ON" \
+ -DWITH_PDF="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
@@ -57,81 +69,49 @@ kuickshow-trinity-tar:
 	cd ..; tar zcf kuickshow-trinity_3.5.8.orig.tar.gz kuickshow-trinity-3.5.8
 
 binary-post-install/kpdf-trinity::
-	#cp -Rp debian/kpdf-trinity/usr/* debian/kpdf-trinity/opt/trinity/
-	#rm -rf debian/kpdf-trinity/usr/
 	mv debian/kpdf-trinity/usr/share/man debian/kpdf-trinity/opt/trinity/share/
 
 binary-post-install/kghostview-trinity::
-	#cp -Rp debian/kghostview-trinity/usr/* debian/kghostview-trinity/opt/trinity/
-	#rm -rf debian/kghostview-trinity/usr/
 	mv debian/kghostview-trinity/usr/share/man debian/kghostview-trinity/opt/trinity/share/
 
 binary-post-install/kcolorchooser-trinity::
-	#cp -Rp debian/kcolorchooser-trinity/usr/* debian/kcolorchooser-trinity/opt/trinity/
-	#rm -rf debian/kcolorchooser-trinity/usr/
 	mv debian/kcolorchooser-trinity/usr/share/man debian/kcolorchooser-trinity/opt/trinity/share/
 
 binary-post-install/kdvi-trinity::
-	#cp -Rp debian/kdvi-trinity/usr/* debian/kdvi-trinity/opt/trinity/
-	#rm -rf debian/kdvi-trinity/usr/
 	mv debian/kdvi-trinity/usr/share/man debian/kdvi-trinity/opt/trinity/share/
 
 binary-post-install/kfaxview-trinity::
-	#cp -Rp debian/kfaxview-trinity/usr/* debian/kfaxview-trinity/opt/trinity/
-	#rm -rf debian/kfaxview-trinity/usr/	
 	mv debian/kfaxview-trinity/usr/share/man debian/kfaxview-trinity/opt/trinity/share/
 
-binary-post-install/kiconedit-trinity::
-	#cp -Rp debian/kiconedit-trinity/usr/* debian/kiconedit-trinity/opt/trinity/
-	#rm -rf debian/kiconedit-trinity/usr/	
-	mv debian/kiconedit-trinity/usr/share/man debian/kiconedit-trinity/opt/trinity/share/
+binary-post-install/tdeiconedit-trinity::
+	mv debian/tdeiconedit-trinity/usr/share/man debian/tdeiconedit-trinity/opt/trinity/share/
 
 binary-post-install/kooka-trinity::
-	#cp -Rp debian/kooka-trinity/usr/* debian/kooka-trinity/opt/trinity/
-	#rm -rf debian/kooka-trinity/usr/
 	mv debian/kooka-trinity/usr/share/man debian/kooka-trinity/opt/trinity/share/
 
 binary-post-install/kpovmodeler-trinity::
-	#cp -Rp debian/kpovmodeler-trinity/usr/* debian/kpovmodeler-trinity/opt/trinity/
-	#rm -rf debian/kpovmodeler-trinity/usr/
 	mv debian/kpovmodeler-trinity/usr/share/man debian/kpovmodeler-trinity/opt/trinity/share/
 
 binary-post-install/ksnapshot-trinity::
-	#cp -Rp debian/ksnapshot-trinity/usr/* debian/ksnapshot-trinity/opt/trinity/
-	#rm -rf debian/ksnapshot-trinity/usr/
 	mv debian/ksnapshot-trinity/usr/share/man debian/ksnapshot-trinity/opt/trinity/share/
 
 binary-post-install/kview-trinity::
-	#cp -Rp debian/kview-trinity/usr/* debian/kview-trinity/opt/trinity/
-	#rm -rf debian/kview-trinity/usr/
 	mv debian/kview-trinity/usr/share/man debian/kview-trinity/opt/trinity/share/
 
 binary-post-install/kcoloredit-trinity::
-	#cp -Rp debian/kcoloredit-trinity/usr/* debian/kcoloredit-trinity/opt/trinity/
-	#rm -rf debian/kcoloredit-trinity/usr/
 	mv debian/kcoloredit-trinity/usr/share/man debian/kcoloredit-trinity/opt/trinity/share/
 
 binary-post-install/kfax-trinity::
-	#cp -Rp debian/kfax-trinity/usr/* debian/kfax-trinity/opt/trinity/
-	#rm -rf debian/kfax-trinity/usr/
 	mv debian/kfax-trinity/usr/share/man debian/kfax-trinity/opt/trinity/share/
 
 binary-post-install/kolourpaint-trinity::
-	#cp -Rp debian/kolourpaint-trinity/usr/* debian/kolourpaint-trinity/opt/trinity/
-	#rm -rf debian/kolourpaint-trinity/usr/
 	mv debian/kolourpaint-trinity/usr/share/man debian/kolourpaint-trinity/opt/trinity/share/
 
 binary-post-install/kruler-trinity::
-	#cp -Rp debian/kruler-trinity/usr/* debian/kruler-trinity/opt/trinity/
-	#rm -rf debian/kruler-trinity/usr/
 	mv debian/kruler-trinity/usr/share/man debian/kruler-trinity/opt/trinity/share/
 
 binary-post-install/kuickshow-trinity::
-	#cp -Rp debian/kuickshow-trinity/usr/* debian/kuickshow-trinity/opt/trinity/
-	#rm -rf debian/kuickshow-trinity/usr/
 	mv debian/kuickshow-trinity/usr/share/man debian/kuickshow-trinity/opt/trinity/share/
 
 binary-post-install/kviewshell-trinity::
-	#cp -Rp debian/kviewshell-trinity/usr/* debian/kviewshell-trinity/opt/trinity/
-	#rm -rf debian/kviewshell-trinity/usr/
 	mv debian/kviewshell-trinity/usr/share/man debian/kviewshell-trinity/opt/trinity/share/

debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera

@@ -5,6 +5,6 @@ Abstract: Kamera allows you to view and download images on a digital camera.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kamera/index.html
-Files: /usr/share/doc/tde/HTML/en/kamera/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kamera/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kamera/*.html
 

debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit

@@ -6,6 +6,6 @@ Abstract: KColorEdit is a palette files editor. It can be used for editing
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kcoloredit/index.html
-Files: /usr/share/doc/tde/HTML/en/kcoloredit/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kcoloredit/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kcoloredit/*.html
 

debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi

@@ -5,6 +5,6 @@ Abstract: This program and KPart allow the user to display *.DVI files from TeX.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kdvi/index.html
-Files: /usr/share/doc/tde/HTML/en/kdvi/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kdvi/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kdvi/*.html
 

debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma

@@ -5,6 +5,6 @@ Abstract: KGamma is a simple tool for monitor gamma correction.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kgamma/index.html
-Files: /usr/share/doc/tde/HTML/en/kgamma/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kgamma/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kgamma/*.html
 

debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview

@@ -6,6 +6,6 @@ Abstract: KGhostView displays and prints PostScript and
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kghostview/index.html
-Files: /usr/share/doc/tde/HTML/en/kghostview/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kghostview/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kghostview/*.html
 

debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint

@@ -5,6 +5,6 @@ Abstract: KolourPaint is a free, easy-to-use paint program for KDE.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kolourpaint/index.html
-Files: /usr/share/doc/tde/HTML/en/kolourpaint/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kolourpaint/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kolourpaint/*.html
 

debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka

@@ -5,6 +5,6 @@ Abstract: Kooka is a very useful KDE scanning application.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kooka/index.html
-Files: /usr/share/doc/tde/HTML/en/kooka/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kooka/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kooka/*.html
 

debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf

@@ -5,6 +5,6 @@ Abstract: KPDF is a KDE PDF viewer based on xpdf code.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpdf/index.html
-Files: /usr/share/doc/tde/HTML/en/kpdf/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpdf/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpdf/*.html
 

debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler

@@ -6,6 +6,6 @@ Abstract: KPovModeler is a graphical 3D modeler, which can generate
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpovmodeler/index.html
-Files: /usr/share/doc/tde/HTML/en/kpovmodeler/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpovmodeler/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpovmodeler/*.html
 

debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler

@@ -5,6 +5,6 @@ Abstract: KRuler can be used to measure objects on the screen.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kruler/index.html
-Files: /usr/share/doc/tde/HTML/en/kruler/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kruler/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kruler/*.html
 

debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot

@@ -5,6 +5,6 @@ Abstract: KSnapshot is a simple applet for taking screenshots.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/ksnapshot/index.html
-Files: /usr/share/doc/tde/HTML/en/ksnapshot/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/ksnapshot/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/ksnapshot/*.html
 

debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow

@@ -5,6 +5,6 @@ Abstract: KuickShow is a comfortable image browser/viewer.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kuickshow/index.html
-Files: /usr/share/doc/tde/HTML/en/kuickshow/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kuickshow/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kuickshow/*.html
 

debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview

@@ -5,6 +5,6 @@ Abstract: KView is an image viewing program.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kview/index.html
-Files: /usr/share/doc/tde/HTML/en/kview/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kview/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kview/*.html
 

debian/squeeze/tdegraphics/debian/tdegraphics-doc-html.doc-base.tdeiconedit

@@ -1,4 +1,4 @@
-Document: tdegraphics-doc-html-kiconedit
+Document: tdegraphics-doc-html-tdeiconedit
 Title: TDEIconEdit Handbook
 Author: Thomas Tanghus, Lauri Watts
 Abstract: TDEIconEdit is designed to help create icons for KDE using the
@@ -6,6 +6,6 @@ Abstract: TDEIconEdit is designed to help create icons for KDE using the
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kiconedit/index.html
-Files: /usr/share/doc/tde/HTML/en/kiconedit/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/tdeiconedit/*.html
 

debian/squeeze/tdegraphics/debian/tdeiconedit-trinity.install

@@ -0,0 +1,41 @@
+debian/tmp/opt/trinity/bin/tdeiconedit
+debian/tmp/opt/trinity/share/applications/tde/tdeiconedit.desktop
+debian/tmp/opt/trinity/share/apps/tdeiconedit/tdeiconeditui.rc
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/aim-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/aim.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/airbrush-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/areaselect.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/circle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/colorpicker-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/compressed.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/ellipse.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/eraser-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/fileclose.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/fill-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledcircle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledellipse.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledrectangle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/grayscale.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/grid.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/kdepalette.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/line.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/paintbrush-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/pointer.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/rectangle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/selectcircle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/selectrect.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/source.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/standard.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/transform.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/window_new.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/tdeiconedit-configuration.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdeiconedit.png
+
+debian/icons/tdeiconedit.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeiconedit-16.xpm		/opt/trinity/share/pixmaps

debian/squeeze/tdegraphics/debian/tdeiconedit-trinity.manpages

@@ -0,0 +1 @@
+debian/man/tdeiconedit.1

debian/squeeze/tdegraphics/debian/tdeiconedit-trinity.menu

@@ -0,0 +1,11 @@
+?package(tdeiconedit-trinity):\
+	needs="X11"\
+	section="Applications/Graphics"\
+	hints="TDE"\
+	title="TDEIconEdit"\
+	icon32x32="/opt/trinity/share/pixmaps/tdeiconedit.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeiconedit-16.xpm"\
+	command="/opt/trinity/bin/tdeiconedit"
+
+# Icon 32x32 tdeiconedit/pics/cr32-app-tdeiconedit.png tdeiconedit.xpm
+# Icon 16x16 tdeiconedit/pics/cr16-app-tdeiconedit.png tdeiconedit-16.xpm

debian/squeeze/tdevelop/debian/control

@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebas
 Replaces: kdevelop-trinity (<< 4:14.0.0~)
 Breaks: kdevelop-trinity (<< 4:14.0.0~)
 Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
-Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, kiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
+Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
 Description: An IDE for Unix/X11
  KDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 

debian/wheezy/metapackages/rename-meta/debian/control

@@ -264,6 +264,12 @@ Depends: tdegraphics-trinity-dbg
 Conflicts: kdegraphics-trinity-dbg (<< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
+Package: kiconedit-trinity
+Architecture: all
+Depends: tdeiconedit-trinity
+Conflicts: kiconedit-trinity (<< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
 Package: kdesvn-trinity
 Architecture: all
 Depends: tdesvn-trinity

debian/wheezy/tdegraphics/debian/control

@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdegraphics-trinity (<< 4:14.0.0~)
 Breaks: kdegraphics-trinity (<< 4:14.0.0~)
-Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
+Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), tdeiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
 Suggests: tdegraphics-trinity-doc-html (>= ${source:Version})
 Description: graphics apps from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -176,7 +176,7 @@ Description: PostScript viewer for Trinity
  This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
-Package: kiconedit-trinity
+Package: tdeiconedit-trinity
 Section: graphics
 Architecture: any
 Replaces: kiconedit-trinity (<< 4:14.0.0~)

debian/wheezy/tdegraphics/debian/control.in

@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdegraphics
 Section: tde
 Architecture: all
-Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), kiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
+Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), tdeiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
 Suggests: tdegraphics-doc-html (>= ${source:Version})
 Description: graphics apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -154,7 +154,7 @@ Description: PostScript viewer for KDE
  This package is part of KDE, as a component of the KDE graphics module.
  See the 'kde' and 'tdegraphics' packages for more information.
 
-Package: kiconedit
+Package: tdeiconedit
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}

debian/wheezy/tdegraphics/debian/icons/tdeiconedit-16.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *kiconedit-16[] = {
+static char *tdeiconedit-16[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 20 1",
 "  c black",

debian/wheezy/tdegraphics/debian/icons/tdeiconedit.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *kiconedit[] = {
+static char *tdeiconedit[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 242 2",
 "   c #000000",

debian/wheezy/tdegraphics/debian/kcoloredit-trinity.menu

@@ -1,4 +1,4 @@
-?package(kcoloredit):\
+?package(kcoloredit-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
@@ -7,7 +7,7 @@
 	icon16x16="/opt/trinity/share/pixmaps/kcolorchooser-16.xpm"\
 	command="/opt/trinity/bin/kcolorchooser"
 
-?package(kcoloredit):\
+?package(kcoloredit-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

debian/wheezy/tdegraphics/debian/kdvi-trinity.menu

@@ -1,4 +1,4 @@
-?package(kdvi):\
+?package(kdvi-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,DVI,Documents"\

debian/wheezy/tdegraphics/debian/kfax-trinity.menu

@@ -1,4 +1,4 @@
-?package(kfax):\
+?package(kfax-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

debian/wheezy/tdegraphics/debian/kfaxview-trinity.menu

@@ -1,4 +1,4 @@
-?package(kfaxview):\
+?package(kfaxview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

debian/wheezy/tdegraphics/debian/kghostview-trinity.menu

@@ -1,4 +1,4 @@
-?package(kghostview):\
+?package(kghostview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,Documents"\

debian/wheezy/tdegraphics/debian/kiconedit-trinity.install

@@ -1,41 +0,0 @@
-debian/tmp/opt/trinity/bin/kiconedit
-debian/tmp/opt/trinity/share/applications/tde/kiconedit.desktop
-debian/tmp/opt/trinity/share/apps/kiconedit/kiconeditui.rc
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/aim-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/aim.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/airbrush-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/areaselect.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/circle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/colorpicker-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/compressed.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/ellipse.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/eraser-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/fileclose.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/fill-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledcircle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledellipse.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledrectangle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/grayscale.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/grid.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/kdepalette.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/line.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/paintbrush-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/pointer.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/rectangle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/selectcircle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/selectrect.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/source.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/standard.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/transform.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/window_new.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/kiconedit-configuration.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kiconedit.png
-
-debian/icons/kiconedit.xpm		/opt/trinity/share/pixmaps
-debian/icons/kiconedit-16.xpm		/opt/trinity/share/pixmaps

debian/wheezy/tdegraphics/debian/kiconedit-trinity.manpages

@@ -1 +0,0 @@
-debian/man/kiconedit.1

debian/wheezy/tdegraphics/debian/kiconedit-trinity.menu

@@ -1,11 +0,0 @@
-?package(kiconedit):\
-	needs="X11"\
-	section="Applications/Graphics"\
-	hints="TDE"\
-	title="TDEIconEdit"\
-	icon32x32="/opt/trinity/share/pixmaps/kiconedit.xpm"\
-	icon16x16="/opt/trinity/share/pixmaps/kiconedit-16.xpm"\
-	command="/opt/trinity/bin/kiconedit"
-
-# Icon 32x32 kiconedit/pics/cr32-app-kiconedit.png kiconedit.xpm
-# Icon 16x16 kiconedit/pics/cr16-app-kiconedit.png kiconedit-16.xpm

debian/wheezy/tdegraphics/debian/kolourpaint-trinity.menu

@@ -1,4 +1,4 @@
-?package(kolourpaint):\
+?package(kolourpaint-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

debian/wheezy/tdegraphics/debian/kooka-trinity.menu

@@ -1,4 +1,4 @@
-?package(kooka):\
+?package(kooka-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

debian/wheezy/tdegraphics/debian/kpdf-trinity.menu

@@ -1,4 +1,4 @@
-?package(kpdf):\
+?package(kpdf-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

debian/wheezy/tdegraphics/debian/kpovmodeler-trinity.menu

@@ -1,4 +1,4 @@
-?package(kpovmodeler):\
+?package(kpovmodeler-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE,Modeler"\

debian/wheezy/tdegraphics/debian/kruler-trinity.menu

@@ -1,4 +1,4 @@
-?package(kruler):\
+?package(kruler-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

debian/wheezy/tdegraphics/debian/ksnapshot-trinity.menu

@@ -1,4 +1,4 @@
-?package(ksnapshot):\
+?package(ksnapshot-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

debian/wheezy/tdegraphics/debian/kuickshow-trinity.menu

@@ -1,4 +1,4 @@
-?package(kuickshow):\
+?package(kuickshow-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

debian/wheezy/tdegraphics/debian/kview-trinity.menu

@@ -1,4 +1,4 @@
-?package(kview):\
+?package(kview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,Images"\

debian/wheezy/tdegraphics/debian/man/tdeiconedit.1

@@ -1,21 +1,21 @@
-.TH KICONEDIT "1" "September 2002" KDE "KDE Application"
+.TH TDEICONEDIT "1" "September 2002" TDE "TDE Application"
 .SH NAME
-kiconedit \- KDE Icon Editor
+tdeiconedit \- TDE Icon Editor
 .SH SYNOPSIS
-.B kiconedit
+.B tdeiconedit
 [\fIQt-options\fR] [\fIKDE-options\fR] [\fIfile(s)\fR]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B TDEIconEdit
-KDE Application.
+TDE Application.
 This manual page was written for the Debian GNU/Linux distribution
 because the original program does not have a manual page.
 .P
 .B TDEIconEdit
-is designed to help create icons for KDE using the standard
+is designed to help create icons for TDE using the standard
 icon palette.  
 .PP
-KDE Icon Editor
+TDE Icon Editor
 .SH AUTHOR
 TDEIconEdit was written by
 .nh
@@ -40,7 +40,7 @@ Show help about options
 \fB\-\-help\-qt\fR
 Show Qt specific options
 .TP
-\fB\-\-help\-kde\fR
+\fB\-\-help\-tde\fR
 Show KDE specific options
 .TP
 \fB\-\-help\-all\fR
@@ -68,7 +68,7 @@ is maintained as a docbook manual.  If the
 .B khelpcenter
 program is properly installed at your site, the command
 .IP
-.B khelpcenter help:/kiconedit
+.B khelpcenter help:/tdeiconedit
 .PP
 should give you access to the complete manual.
 .SH AUTHOR

debian/wheezy/tdegraphics/debian/rules

@@ -14,9 +14,21 @@ include /usr/share/cdbs/1/class/cmake.mk
 #include /usr/share/cdbs/1/rules/patchsys-quilt.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" \
--DCMAKE_BUILD_TYPE=RelWithDebInfo
+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/" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DBUILD_ALL="ON" \
+ -DWITH_TIFF="ON" \
+ -DWITH_OPENEXR="ON" \
+ -DWITH_PDF="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
@@ -57,81 +69,49 @@ kuickshow-trinity-tar:
 	cd ..; tar zcf kuickshow-trinity_3.5.8.orig.tar.gz kuickshow-trinity-3.5.8
 
 binary-post-install/kpdf-trinity::
-	#cp -Rp debian/kpdf-trinity/usr/* debian/kpdf-trinity/opt/trinity/
-	#rm -rf debian/kpdf-trinity/usr/
 	mv debian/kpdf-trinity/usr/share/man debian/kpdf-trinity/opt/trinity/share/
 
 binary-post-install/kghostview-trinity::
-	#cp -Rp debian/kghostview-trinity/usr/* debian/kghostview-trinity/opt/trinity/
-	#rm -rf debian/kghostview-trinity/usr/
 	mv debian/kghostview-trinity/usr/share/man debian/kghostview-trinity/opt/trinity/share/
 
 binary-post-install/kcolorchooser-trinity::
-	#cp -Rp debian/kcolorchooser-trinity/usr/* debian/kcolorchooser-trinity/opt/trinity/
-	#rm -rf debian/kcolorchooser-trinity/usr/
 	mv debian/kcolorchooser-trinity/usr/share/man debian/kcolorchooser-trinity/opt/trinity/share/
 
 binary-post-install/kdvi-trinity::
-	#cp -Rp debian/kdvi-trinity/usr/* debian/kdvi-trinity/opt/trinity/
-	#rm -rf debian/kdvi-trinity/usr/
 	mv debian/kdvi-trinity/usr/share/man debian/kdvi-trinity/opt/trinity/share/
 
 binary-post-install/kfaxview-trinity::
-	#cp -Rp debian/kfaxview-trinity/usr/* debian/kfaxview-trinity/opt/trinity/
-	#rm -rf debian/kfaxview-trinity/usr/	
 	mv debian/kfaxview-trinity/usr/share/man debian/kfaxview-trinity/opt/trinity/share/
 
-binary-post-install/kiconedit-trinity::
-	#cp -Rp debian/kiconedit-trinity/usr/* debian/kiconedit-trinity/opt/trinity/
-	#rm -rf debian/kiconedit-trinity/usr/	
-	mv debian/kiconedit-trinity/usr/share/man debian/kiconedit-trinity/opt/trinity/share/
+binary-post-install/tdeiconedit-trinity::
+	mv debian/tdeiconedit-trinity/usr/share/man debian/tdeiconedit-trinity/opt/trinity/share/
 
 binary-post-install/kooka-trinity::
-	#cp -Rp debian/kooka-trinity/usr/* debian/kooka-trinity/opt/trinity/
-	#rm -rf debian/kooka-trinity/usr/
 	mv debian/kooka-trinity/usr/share/man debian/kooka-trinity/opt/trinity/share/
 
 binary-post-install/kpovmodeler-trinity::
-	#cp -Rp debian/kpovmodeler-trinity/usr/* debian/kpovmodeler-trinity/opt/trinity/
-	#rm -rf debian/kpovmodeler-trinity/usr/
 	mv debian/kpovmodeler-trinity/usr/share/man debian/kpovmodeler-trinity/opt/trinity/share/
 
 binary-post-install/ksnapshot-trinity::
-	#cp -Rp debian/ksnapshot-trinity/usr/* debian/ksnapshot-trinity/opt/trinity/
-	#rm -rf debian/ksnapshot-trinity/usr/
 	mv debian/ksnapshot-trinity/usr/share/man debian/ksnapshot-trinity/opt/trinity/share/
 
 binary-post-install/kview-trinity::
-	#cp -Rp debian/kview-trinity/usr/* debian/kview-trinity/opt/trinity/
-	#rm -rf debian/kview-trinity/usr/
 	mv debian/kview-trinity/usr/share/man debian/kview-trinity/opt/trinity/share/
 
 binary-post-install/kcoloredit-trinity::
-	#cp -Rp debian/kcoloredit-trinity/usr/* debian/kcoloredit-trinity/opt/trinity/
-	#rm -rf debian/kcoloredit-trinity/usr/
 	mv debian/kcoloredit-trinity/usr/share/man debian/kcoloredit-trinity/opt/trinity/share/
 
 binary-post-install/kfax-trinity::
-	#cp -Rp debian/kfax-trinity/usr/* debian/kfax-trinity/opt/trinity/
-	#rm -rf debian/kfax-trinity/usr/
 	mv debian/kfax-trinity/usr/share/man debian/kfax-trinity/opt/trinity/share/
 
 binary-post-install/kolourpaint-trinity::
-	#cp -Rp debian/kolourpaint-trinity/usr/* debian/kolourpaint-trinity/opt/trinity/
-	#rm -rf debian/kolourpaint-trinity/usr/
 	mv debian/kolourpaint-trinity/usr/share/man debian/kolourpaint-trinity/opt/trinity/share/
 
 binary-post-install/kruler-trinity::
-	#cp -Rp debian/kruler-trinity/usr/* debian/kruler-trinity/opt/trinity/
-	#rm -rf debian/kruler-trinity/usr/
 	mv debian/kruler-trinity/usr/share/man debian/kruler-trinity/opt/trinity/share/
 
 binary-post-install/kuickshow-trinity::
-	#cp -Rp debian/kuickshow-trinity/usr/* debian/kuickshow-trinity/opt/trinity/
-	#rm -rf debian/kuickshow-trinity/usr/
 	mv debian/kuickshow-trinity/usr/share/man debian/kuickshow-trinity/opt/trinity/share/
 
 binary-post-install/kviewshell-trinity::
-	#cp -Rp debian/kviewshell-trinity/usr/* debian/kviewshell-trinity/opt/trinity/
-	#rm -rf debian/kviewshell-trinity/usr/
 	mv debian/kviewshell-trinity/usr/share/man debian/kviewshell-trinity/opt/trinity/share/

debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera

@@ -5,6 +5,6 @@ Abstract: Kamera allows you to view and download images on a digital camera.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kamera/index.html
-Files: /usr/share/doc/tde/HTML/en/kamera/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kamera/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kamera/*.html
 

debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit

@@ -6,6 +6,6 @@ Abstract: KColorEdit is a palette files editor. It can be used for editing
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kcoloredit/index.html
-Files: /usr/share/doc/tde/HTML/en/kcoloredit/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kcoloredit/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kcoloredit/*.html
 

debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi

@@ -5,6 +5,6 @@ Abstract: This program and KPart allow the user to display *.DVI files from TeX.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kdvi/index.html
-Files: /usr/share/doc/tde/HTML/en/kdvi/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kdvi/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kdvi/*.html
 

debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma

@@ -5,6 +5,6 @@ Abstract: KGamma is a simple tool for monitor gamma correction.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kgamma/index.html
-Files: /usr/share/doc/tde/HTML/en/kgamma/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kgamma/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kgamma/*.html
 

debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview

@@ -6,6 +6,6 @@ Abstract: KGhostView displays and prints PostScript and
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kghostview/index.html
-Files: /usr/share/doc/tde/HTML/en/kghostview/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kghostview/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kghostview/*.html
 

debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint

@@ -5,6 +5,6 @@ Abstract: KolourPaint is a free, easy-to-use paint program for KDE.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kolourpaint/index.html
-Files: /usr/share/doc/tde/HTML/en/kolourpaint/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kolourpaint/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kolourpaint/*.html
 

debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka

@@ -5,6 +5,6 @@ Abstract: Kooka is a very useful KDE scanning application.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kooka/index.html
-Files: /usr/share/doc/tde/HTML/en/kooka/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kooka/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kooka/*.html
 

debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf

@@ -5,6 +5,6 @@ Abstract: KPDF is a KDE PDF viewer based on xpdf code.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpdf/index.html
-Files: /usr/share/doc/tde/HTML/en/kpdf/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpdf/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpdf/*.html
 

debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler

@@ -6,6 +6,6 @@ Abstract: KPovModeler is a graphical 3D modeler, which can generate
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpovmodeler/index.html
-Files: /usr/share/doc/tde/HTML/en/kpovmodeler/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpovmodeler/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpovmodeler/*.html
 

debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler

@@ -5,6 +5,6 @@ Abstract: KRuler can be used to measure objects on the screen.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kruler/index.html
-Files: /usr/share/doc/tde/HTML/en/kruler/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kruler/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kruler/*.html
 

debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot

@@ -5,6 +5,6 @@ Abstract: KSnapshot is a simple applet for taking screenshots.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/ksnapshot/index.html
-Files: /usr/share/doc/tde/HTML/en/ksnapshot/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/ksnapshot/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/ksnapshot/*.html
 

debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow

@@ -5,6 +5,6 @@ Abstract: KuickShow is a comfortable image browser/viewer.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kuickshow/index.html
-Files: /usr/share/doc/tde/HTML/en/kuickshow/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kuickshow/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kuickshow/*.html
 

debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview

@@ -5,6 +5,6 @@ Abstract: KView is an image viewing program.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kview/index.html
-Files: /usr/share/doc/tde/HTML/en/kview/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kview/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kview/*.html
 

debian/wheezy/tdegraphics/debian/tdegraphics-doc-html.doc-base.tdeiconedit

@@ -1,4 +1,4 @@
-Document: tdegraphics-doc-html-kiconedit
+Document: tdegraphics-doc-html-tdeiconedit
 Title: TDEIconEdit Handbook
 Author: Thomas Tanghus, Lauri Watts
 Abstract: TDEIconEdit is designed to help create icons for KDE using the
@@ -6,6 +6,6 @@ Abstract: TDEIconEdit is designed to help create icons for KDE using the
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kiconedit/index.html
-Files: /usr/share/doc/tde/HTML/en/kiconedit/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/tdeiconedit/*.html
 

debian/wheezy/tdegraphics/debian/tdeiconedit-trinity.install

@@ -0,0 +1,41 @@
+debian/tmp/opt/trinity/bin/tdeiconedit
+debian/tmp/opt/trinity/share/applications/tde/tdeiconedit.desktop
+debian/tmp/opt/trinity/share/apps/tdeiconedit/tdeiconeditui.rc
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/aim-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/aim.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/airbrush-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/areaselect.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/circle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/colorpicker-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/compressed.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/ellipse.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/eraser-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/fileclose.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/fill-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledcircle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledellipse.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledrectangle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/grayscale.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/grid.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/kdepalette.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/line.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/paintbrush-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/pointer.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/rectangle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/selectcircle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/selectrect.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/source.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/standard.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/transform.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/window_new.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/tdeiconedit-configuration.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdeiconedit.png
+
+debian/icons/tdeiconedit.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeiconedit-16.xpm		/opt/trinity/share/pixmaps

debian/wheezy/tdegraphics/debian/tdeiconedit-trinity.manpages

@@ -0,0 +1 @@
+debian/man/tdeiconedit.1

debian/wheezy/tdegraphics/debian/tdeiconedit-trinity.menu

@@ -0,0 +1,11 @@
+?package(tdeiconedit-trinity):\
+	needs="X11"\
+	section="Applications/Graphics"\
+	hints="TDE"\
+	title="TDEIconEdit"\
+	icon32x32="/opt/trinity/share/pixmaps/tdeiconedit.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeiconedit-16.xpm"\
+	command="/opt/trinity/bin/tdeiconedit"
+
+# Icon 32x32 tdeiconedit/pics/cr32-app-tdeiconedit.png tdeiconedit.xpm
+# Icon 16x16 tdeiconedit/pics/cr16-app-tdeiconedit.png tdeiconedit-16.xpm

debian/wheezy/tdevelop/debian/control

@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebas
 Replaces: kdevelop-trinity (<< 4:14.0.0~)
 Breaks: kdevelop-trinity (<< 4:14.0.0~)
 Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
-Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, kiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
+Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
 Description: An IDE for Unix/X11
  KDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 

ubuntu/maverick/metapackages/rename-meta/debian/control

@@ -264,6 +264,12 @@ Depends: tdegraphics-trinity-dbg
 Conflicts: kdegraphics-trinity-dbg (<< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
+Package: kiconedit-trinity
+Architecture: all
+Depends: tdeiconedit-trinity
+Conflicts: kiconedit-trinity (<< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
 Package: kdesvn-trinity
 Architecture: all
 Depends: tdesvn-trinity

ubuntu/maverick/tdegraphics/debian/control

@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdegraphics-kde3 (<< 4:14.0.0~), kdegraphics-trinity (<< 4:14.0.0~)
 Breaks: kdegraphics-kde3 (<< 4:14.0.0~), kdegraphics-trinity (<< 4:14.0.0~)
-Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
+Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), tdeiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
 Suggests: tdegraphics-trinity-doc-html (>= ${source:Version})
 Description: graphics apps from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -176,7 +176,7 @@ Description: PostScript viewer for Trinity
  This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
-Package: kiconedit-trinity
+Package: tdeiconedit-trinity
 Section: graphics
 Architecture: any
 Replaces: kiconedit-kde3 (<< 4:14.0.0~), kiconedit-trinity (<< 4:14.0.0~)

ubuntu/maverick/tdegraphics/debian/control.in

@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdegraphics
 Section: tde
 Architecture: all
-Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), kiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
+Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), tdeiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
 Suggests: tdegraphics-doc-html (>= ${source:Version})
 Description: graphics apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -154,7 +154,7 @@ Description: PostScript viewer for KDE
  This package is part of KDE, as a component of the KDE graphics module.
  See the 'kde' and 'tdegraphics' packages for more information.
 
-Package: kiconedit
+Package: tdeiconedit
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}

ubuntu/maverick/tdegraphics/debian/icons/tdeiconedit-16.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *kiconedit-16[] = {
+static char *tdeiconedit-16[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 20 1",
 "  c black",

ubuntu/maverick/tdegraphics/debian/icons/tdeiconedit.xpm

@@ -1,5 +1,5 @@
 /* XPM */
-static char *kiconedit[] = {
+static char *tdeiconedit[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 242 2",
 "   c #000000",

ubuntu/maverick/tdegraphics/debian/kcoloredit-trinity.menu

@@ -1,4 +1,4 @@
-?package(kcoloredit):\
+?package(kcoloredit-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
@@ -7,7 +7,7 @@
 	icon16x16="/opt/trinity/share/pixmaps/kcolorchooser-16.xpm"\
 	command="/opt/trinity/bin/kcolorchooser"
 
-?package(kcoloredit):\
+?package(kcoloredit-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

ubuntu/maverick/tdegraphics/debian/kdvi-trinity.menu

@@ -1,4 +1,4 @@
-?package(kdvi):\
+?package(kdvi-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,DVI,Documents"\

ubuntu/maverick/tdegraphics/debian/kfax-trinity.menu

@@ -1,4 +1,4 @@
-?package(kfax):\
+?package(kfax-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

ubuntu/maverick/tdegraphics/debian/kfaxview-trinity.menu

@@ -1,4 +1,4 @@
-?package(kfaxview):\
+?package(kfaxview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

ubuntu/maverick/tdegraphics/debian/kghostview-trinity.menu

@@ -1,4 +1,4 @@
-?package(kghostview):\
+?package(kghostview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,Documents"\

ubuntu/maverick/tdegraphics/debian/kiconedit-trinity.install

@@ -1,41 +0,0 @@
-debian/tmp/opt/trinity/bin/kiconedit
-debian/tmp/opt/trinity/share/applications/tde/kiconedit.desktop
-debian/tmp/opt/trinity/share/apps/kiconedit/kiconeditui.rc
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/aim-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/aim.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/airbrush-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/areaselect.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/circle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/colorpicker-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/compressed.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/ellipse.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/eraser-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/fileclose.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/fill-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledcircle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledellipse.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledrectangle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/grayscale.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/grid.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/kdepalette.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/line.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/paintbrush-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/pointer.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/rectangle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/selectcircle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/selectrect.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/source.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/standard.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/transform.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/window_new.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/kiconedit-configuration.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kiconedit.png
-
-debian/icons/kiconedit.xpm		/opt/trinity/share/pixmaps
-debian/icons/kiconedit-16.xpm		/opt/trinity/share/pixmaps

ubuntu/maverick/tdegraphics/debian/kiconedit-trinity.manpages

@@ -1 +0,0 @@
-debian/man/kiconedit.1

ubuntu/maverick/tdegraphics/debian/kiconedit-trinity.menu

@@ -1,11 +0,0 @@
-?package(kiconedit):\
-	needs="X11"\
-	section="Applications/Graphics"\
-	hints="TDE"\
-	title="TDEIconEdit"\
-	icon32x32="/opt/trinity/share/pixmaps/kiconedit.xpm"\
-	icon16x16="/opt/trinity/share/pixmaps/kiconedit-16.xpm"\
-	command="/opt/trinity/bin/kiconedit"
-
-# Icon 32x32 kiconedit/pics/cr32-app-kiconedit.png kiconedit.xpm
-# Icon 16x16 kiconedit/pics/cr16-app-kiconedit.png kiconedit-16.xpm

ubuntu/maverick/tdegraphics/debian/kolourpaint-trinity.menu

@@ -1,4 +1,4 @@
-?package(kolourpaint):\
+?package(kolourpaint-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

ubuntu/maverick/tdegraphics/debian/kooka-trinity.menu

@@ -1,4 +1,4 @@
-?package(kooka):\
+?package(kooka-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

ubuntu/maverick/tdegraphics/debian/kpdf-trinity.menu

@@ -1,4 +1,4 @@
-?package(kpdf):\
+?package(kpdf-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.menu

@@ -1,4 +1,4 @@
-?package(kpovmodeler):\
+?package(kpovmodeler-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE,Modeler"\

ubuntu/maverick/tdegraphics/debian/kruler-trinity.menu

@@ -1,4 +1,4 @@
-?package(kruler):\
+?package(kruler-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

ubuntu/maverick/tdegraphics/debian/ksnapshot-trinity.menu

@@ -1,4 +1,4 @@
-?package(ksnapshot):\
+?package(ksnapshot-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.menu

@@ -1,4 +1,4 @@
-?package(kuickshow):\
+?package(kuickshow-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

ubuntu/maverick/tdegraphics/debian/kview-trinity.menu

@@ -1,4 +1,4 @@
-?package(kview):\
+?package(kview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,Images"\

ubuntu/maverick/tdegraphics/debian/man/tdeiconedit.1

@@ -1,21 +1,21 @@
-.TH KICONEDIT "1" "September 2002" KDE "KDE Application"
+.TH TDEICONEDIT "1" "September 2002" TDE "TDE Application"
 .SH NAME
-kiconedit \- KDE Icon Editor
+tdeiconedit \- TDE Icon Editor
 .SH SYNOPSIS
-.B kiconedit
+.B tdeiconedit
 [\fIQt-options\fR] [\fIKDE-options\fR] [\fIfile(s)\fR]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B TDEIconEdit
-KDE Application.
+TDE Application.
 This manual page was written for the Debian GNU/Linux distribution
 because the original program does not have a manual page.
 .P
 .B TDEIconEdit
-is designed to help create icons for KDE using the standard
+is designed to help create icons for TDE using the standard
 icon palette.  
 .PP
-KDE Icon Editor
+TDE Icon Editor
 .SH AUTHOR
 TDEIconEdit was written by
 .nh
@@ -40,7 +40,7 @@ Show help about options
 \fB\-\-help\-qt\fR
 Show Qt specific options
 .TP
-\fB\-\-help\-kde\fR
+\fB\-\-help\-tde\fR
 Show KDE specific options
 .TP
 \fB\-\-help\-all\fR
@@ -68,7 +68,7 @@ is maintained as a docbook manual.  If the
 .B khelpcenter
 program is properly installed at your site, the command
 .IP
-.B khelpcenter help:/kiconedit
+.B khelpcenter help:/tdeiconedit
 .PP
 should give you access to the complete manual.
 .SH AUTHOR

ubuntu/maverick/tdegraphics/debian/rules

@@ -14,9 +14,21 @@ include /usr/share/cdbs/1/class/cmake.mk
 #include /usr/share/cdbs/1/rules/patchsys-quilt.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" \
--DCMAKE_BUILD_TYPE=RelWithDebInfo
+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/" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DBUILD_ALL="ON" \
+ -DWITH_TIFF="ON" \
+ -DWITH_OPENEXR="ON" \
+ -DWITH_PDF="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
@@ -57,81 +69,49 @@ kuickshow-trinity-tar:
 	cd ..; tar zcf kuickshow-trinity_3.5.8.orig.tar.gz kuickshow-trinity-3.5.8
 
 binary-post-install/kpdf-trinity::
-	#cp -Rp debian/kpdf-trinity/usr/* debian/kpdf-trinity/opt/trinity/
-	#rm -rf debian/kpdf-trinity/usr/
 	mv debian/kpdf-trinity/usr/share/man debian/kpdf-trinity/opt/trinity/share/
 
 binary-post-install/kghostview-trinity::
-	#cp -Rp debian/kghostview-trinity/usr/* debian/kghostview-trinity/opt/trinity/
-	#rm -rf debian/kghostview-trinity/usr/
 	mv debian/kghostview-trinity/usr/share/man debian/kghostview-trinity/opt/trinity/share/
 
 binary-post-install/kcolorchooser-trinity::
-	#cp -Rp debian/kcolorchooser-trinity/usr/* debian/kcolorchooser-trinity/opt/trinity/
-	#rm -rf debian/kcolorchooser-trinity/usr/
 	mv debian/kcolorchooser-trinity/usr/share/man debian/kcolorchooser-trinity/opt/trinity/share/
 
 binary-post-install/kdvi-trinity::
-	#cp -Rp debian/kdvi-trinity/usr/* debian/kdvi-trinity/opt/trinity/
-	#rm -rf debian/kdvi-trinity/usr/
 	mv debian/kdvi-trinity/usr/share/man debian/kdvi-trinity/opt/trinity/share/
 
 binary-post-install/kfaxview-trinity::
-	#cp -Rp debian/kfaxview-trinity/usr/* debian/kfaxview-trinity/opt/trinity/
-	#rm -rf debian/kfaxview-trinity/usr/	
 	mv debian/kfaxview-trinity/usr/share/man debian/kfaxview-trinity/opt/trinity/share/
 
-binary-post-install/kiconedit-trinity::
-	#cp -Rp debian/kiconedit-trinity/usr/* debian/kiconedit-trinity/opt/trinity/
-	#rm -rf debian/kiconedit-trinity/usr/	
-	mv debian/kiconedit-trinity/usr/share/man debian/kiconedit-trinity/opt/trinity/share/
+binary-post-install/tdeiconedit-trinity::
+	mv debian/tdeiconedit-trinity/usr/share/man debian/tdeiconedit-trinity/opt/trinity/share/
 
 binary-post-install/kooka-trinity::
-	#cp -Rp debian/kooka-trinity/usr/* debian/kooka-trinity/opt/trinity/
-	#rm -rf debian/kooka-trinity/usr/
 	mv debian/kooka-trinity/usr/share/man debian/kooka-trinity/opt/trinity/share/
 
 binary-post-install/kpovmodeler-trinity::
-	#cp -Rp debian/kpovmodeler-trinity/usr/* debian/kpovmodeler-trinity/opt/trinity/
-	#rm -rf debian/kpovmodeler-trinity/usr/
 	mv debian/kpovmodeler-trinity/usr/share/man debian/kpovmodeler-trinity/opt/trinity/share/
 
 binary-post-install/ksnapshot-trinity::
-	#cp -Rp debian/ksnapshot-trinity/usr/* debian/ksnapshot-trinity/opt/trinity/
-	#rm -rf debian/ksnapshot-trinity/usr/
 	mv debian/ksnapshot-trinity/usr/share/man debian/ksnapshot-trinity/opt/trinity/share/
 
 binary-post-install/kview-trinity::
-	#cp -Rp debian/kview-trinity/usr/* debian/kview-trinity/opt/trinity/
-	#rm -rf debian/kview-trinity/usr/
 	mv debian/kview-trinity/usr/share/man debian/kview-trinity/opt/trinity/share/
 
 binary-post-install/kcoloredit-trinity::
-	#cp -Rp debian/kcoloredit-trinity/usr/* debian/kcoloredit-trinity/opt/trinity/
-	#rm -rf debian/kcoloredit-trinity/usr/
 	mv debian/kcoloredit-trinity/usr/share/man debian/kcoloredit-trinity/opt/trinity/share/
 
 binary-post-install/kfax-trinity::
-	#cp -Rp debian/kfax-trinity/usr/* debian/kfax-trinity/opt/trinity/
-	#rm -rf debian/kfax-trinity/usr/
 	mv debian/kfax-trinity/usr/share/man debian/kfax-trinity/opt/trinity/share/
 
 binary-post-install/kolourpaint-trinity::
-	#cp -Rp debian/kolourpaint-trinity/usr/* debian/kolourpaint-trinity/opt/trinity/
-	#rm -rf debian/kolourpaint-trinity/usr/
 	mv debian/kolourpaint-trinity/usr/share/man debian/kolourpaint-trinity/opt/trinity/share/
 
 binary-post-install/kruler-trinity::
-	#cp -Rp debian/kruler-trinity/usr/* debian/kruler-trinity/opt/trinity/
-	#rm -rf debian/kruler-trinity/usr/
 	mv debian/kruler-trinity/usr/share/man debian/kruler-trinity/opt/trinity/share/
 
 binary-post-install/kuickshow-trinity::
-	#cp -Rp debian/kuickshow-trinity/usr/* debian/kuickshow-trinity/opt/trinity/
-	#rm -rf debian/kuickshow-trinity/usr/
 	mv debian/kuickshow-trinity/usr/share/man debian/kuickshow-trinity/opt/trinity/share/
 
 binary-post-install/kviewshell-trinity::
-	#cp -Rp debian/kviewshell-trinity/usr/* debian/kviewshell-trinity/opt/trinity/
-	#rm -rf debian/kviewshell-trinity/usr/
 	mv debian/kviewshell-trinity/usr/share/man debian/kviewshell-trinity/opt/trinity/share/

ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera

@@ -5,6 +5,6 @@ Abstract: Kamera allows you to view and download images on a digital camera.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kamera/index.html
-Files: /usr/share/doc/tde/HTML/en/kamera/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kamera/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kamera/*.html
 

ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit

@@ -6,6 +6,6 @@ Abstract: KColorEdit is a palette files editor. It can be used for editing
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kcoloredit/index.html
-Files: /usr/share/doc/tde/HTML/en/kcoloredit/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kcoloredit/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kcoloredit/*.html
 

ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi

@@ -5,6 +5,6 @@ Abstract: This program and KPart allow the user to display *.DVI files from TeX.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kdvi/index.html
-Files: /usr/share/doc/tde/HTML/en/kdvi/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kdvi/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kdvi/*.html
 

ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma

@@ -5,6 +5,6 @@ Abstract: KGamma is a simple tool for monitor gamma correction.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kgamma/index.html
-Files: /usr/share/doc/tde/HTML/en/kgamma/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kgamma/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kgamma/*.html
 

ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview

@@ -6,6 +6,6 @@ Abstract: KGhostView displays and prints PostScript and
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kghostview/index.html
-Files: /usr/share/doc/tde/HTML/en/kghostview/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kghostview/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kghostview/*.html
 

ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint

@@ -5,6 +5,6 @@ Abstract: KolourPaint is a free, easy-to-use paint program for KDE.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kolourpaint/index.html
-Files: /usr/share/doc/tde/HTML/en/kolourpaint/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kolourpaint/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kolourpaint/*.html
 

ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka

@@ -5,6 +5,6 @@ Abstract: Kooka is a very useful KDE scanning application.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kooka/index.html
-Files: /usr/share/doc/tde/HTML/en/kooka/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kooka/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kooka/*.html
 

ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf

@@ -5,6 +5,6 @@ Abstract: KPDF is a KDE PDF viewer based on xpdf code.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpdf/index.html
-Files: /usr/share/doc/tde/HTML/en/kpdf/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpdf/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpdf/*.html
 

ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler

@@ -6,6 +6,6 @@ Abstract: KPovModeler is a graphical 3D modeler, which can generate
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpovmodeler/index.html
-Files: /usr/share/doc/tde/HTML/en/kpovmodeler/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpovmodeler/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpovmodeler/*.html
 

ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler

@@ -5,6 +5,6 @@ Abstract: KRuler can be used to measure objects on the screen.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kruler/index.html
-Files: /usr/share/doc/tde/HTML/en/kruler/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kruler/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kruler/*.html
 

ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot

@@ -5,6 +5,6 @@ Abstract: KSnapshot is a simple applet for taking screenshots.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/ksnapshot/index.html
-Files: /usr/share/doc/tde/HTML/en/ksnapshot/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/ksnapshot/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/ksnapshot/*.html
 

ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow

@@ -5,6 +5,6 @@ Abstract: KuickShow is a comfortable image browser/viewer.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kuickshow/index.html
-Files: /usr/share/doc/tde/HTML/en/kuickshow/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kuickshow/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kuickshow/*.html
 

ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview

@@ -5,6 +5,6 @@ Abstract: KView is an image viewing program.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kview/index.html
-Files: /usr/share/doc/tde/HTML/en/kview/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kview/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kview/*.html
 

ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.tdeiconedit

@@ -1,4 +1,4 @@
-Document: tdegraphics-doc-html-kiconedit
+Document: tdegraphics-doc-html-tdeiconedit
 Title: TDEIconEdit Handbook
 Author: Thomas Tanghus, Lauri Watts
 Abstract: TDEIconEdit is designed to help create icons for KDE using the
@@ -6,6 +6,6 @@ Abstract: TDEIconEdit is designed to help create icons for KDE using the
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kiconedit/index.html
-Files: /usr/share/doc/tde/HTML/en/kiconedit/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/tdeiconedit/*.html
 

ubuntu/maverick/tdegraphics/debian/tdeiconedit-trinity.install

@@ -0,0 +1,41 @@
+debian/tmp/opt/trinity/bin/tdeiconedit
+debian/tmp/opt/trinity/share/applications/tde/tdeiconedit.desktop
+debian/tmp/opt/trinity/share/apps/tdeiconedit/tdeiconeditui.rc
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/aim-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/aim.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/airbrush-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/areaselect.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/circle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/colorpicker-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/compressed.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/ellipse.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/eraser-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/fileclose.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/fill-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledcircle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledellipse.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledrectangle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/grayscale.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/grid.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/kdepalette.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/line.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/paintbrush-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/pointer.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/rectangle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/selectcircle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/selectrect.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/source.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/standard.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/transform.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/window_new.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/tdeiconedit-configuration.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdeiconedit.png
+
+debian/icons/tdeiconedit.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeiconedit-16.xpm		/opt/trinity/share/pixmaps

ubuntu/maverick/tdegraphics/debian/tdeiconedit-trinity.manpages

@@ -0,0 +1 @@
+debian/man/tdeiconedit.1

ubuntu/maverick/tdegraphics/debian/tdeiconedit-trinity.menu

@@ -0,0 +1,11 @@
+?package(tdeiconedit-trinity):\
+	needs="X11"\
+	section="Applications/Graphics"\
+	hints="TDE"\
+	title="TDEIconEdit"\
+	icon32x32="/opt/trinity/share/pixmaps/tdeiconedit.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeiconedit-16.xpm"\
+	command="/opt/trinity/bin/tdeiconedit"
+
+# Icon 32x32 tdeiconedit/pics/cr32-app-tdeiconedit.png tdeiconedit.xpm
+# Icon 16x16 tdeiconedit/pics/cr16-app-tdeiconedit.png tdeiconedit-16.xpm

ubuntu/maverick/tdevelop/debian/control

@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebas
 Replaces: kdevelop-kde3 (<< 4:14.0.0~), kdevelop-trinity (<< 4:14.0.0~)
 Breaks: kdevelop-kde3 (<< 4:14.0.0~), kdevelop-trinity (<< 4:14.0.0~)
 Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
-Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, kiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
+Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
 Description: An IDE for Unix/X11
  KDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 

ubuntu/precise/metapackages/rename-meta/debian/control

@@ -264,6 +264,12 @@ Depends: tdegraphics-trinity-dbg
 Conflicts: kdegraphics-trinity-dbg (<< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
+Package: kiconedit-trinity
+Architecture: all
+Depends: tdeiconedit-trinity
+Conflicts: kiconedit-trinity (<< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
 Package: kdesvn-trinity
 Architecture: all
 Depends: tdesvn-trinity

ubuntu/precise/tdegraphics/debian/control

@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdegraphics-kde3 (<< 4:14.0.0~), kdegraphics-trinity (<< 4:14.0.0~)
 Breaks: kdegraphics-kde3 (<< 4:14.0.0~), kdegraphics-trinity (<< 4:14.0.0~)
-Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
+Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), tdeiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
 Suggests: tdegraphics-trinity-doc-html (>= ${source:Version})
 Description: graphics apps from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -176,7 +176,7 @@ Description: PostScript viewer for Trinity
  This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
-Package: kiconedit-trinity
+Package: tdeiconedit-trinity
 Section: graphics
 Architecture: any
 Replaces: kiconedit-kde3 (<< 4:14.0.0~), kiconedit-trinity (<< 4:14.0.0~)

ubuntu/precise/tdegraphics/debian/control.in

@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdegraphics
 Section: tde
 Architecture: all
-Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), kiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
+Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), tdeiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
 Suggests: tdegraphics-doc-html (>= ${source:Version})
 Description: graphics apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -154,7 +154,7 @@ Description: PostScript viewer for KDE
  This package is part of KDE, as a component of the KDE graphics module.
  See the 'kde' and 'tdegraphics' packages for more information.
 
-Package: kiconedit
+Package: tdeiconedit
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}

ubuntu/precise/tdegraphics/debian/icons/kiconedit-16.xpm

@@ -1,42 +0,0 @@
-/* XPM */
-static char *kiconedit-16[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 20 1",
-"  c black",
-". c navy",
-"X c #0000C0",
-"o c blue",
-"O c #008000",
-"+ c #00C000",
-"@ c green",
-"# c red",
-"$ c #C05800",
-"% c #808000",
-"& c #FF8000",
-"* c #FFA858",
-"= c #C0C000",
-"- c yellow",
-"; c #FFDCA8",
-": c #C0C0FF",
-"> c #C0FFC0",
-", c #FFC0C0",
-"< c #FFFFC0",
-"1 c None",
-/* pixels */
-"111111111111   1",
-"11111111111 $** ",
-"1111111111 ;*$* ",
-"111111111 ;*&& 1",
-"      11 ;*&& 11",
-" ,,## 11 $&& 111",
-" ,,##       1111",
-" ;;&*&& 11111111",
-" &&&*&&   111111",
-" <<=-==%% 111111",
-" ===-==%%   1111",
-" >>+@++OOOO 1111",
-" +++@++OOOO 1111",
-" ::XoXX.X.. 1111",
-" ::XoXX.X.. 1111",
-"            1111"
-};

ubuntu/precise/tdegraphics/debian/icons/kiconedit.xpm

@@ -1,280 +0,0 @@
-/* XPM */
-static char *kiconedit[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 242 2",
-"   c #000000",
-".  c #01010B",
-"X  c #000B00",
-"o  c #0C0500",
-"O  c #0D0B00",
-"+  c #090C09",
-"@  c #000013",
-"#  c #00001B",
-"$  c #001400",
-"%  c #001C00",
-"&  c #130C06",
-"*  c #140E0A",
-"=  c #1A0000",
-"-  c #191007",
-";  c #1D140E",
-":  c #101016",
-">  c #1C1611",
-",  c #1B1812",
-"<  c #000023",
-"1  c #000033",
-"2  c #111120",
-"3  c #1A1A23",
-"4  c #1C1A31",
-"5  c #1E1B39",
-"6  c #002400",
-"7  c #002B00",
-"8  c #003400",
-"9  c #003D00",
-"0  c #1B231B",
-"q  c #290000",
-"w  c #2B0909",
-"e  c #221D16",
-"r  c #2A2405",
-"t  c #2F290F",
-"y  c #22221A",
-"u  c #29271D",
-"i  c #2A281E",
-"p  c #3D2900",
-"a  c #3D2A17",
-"s  c #3B3A00",
-"d  c #273328",
-"f  c #2F3D2E",
-"g  c #3D3A2C",
-"h  c #00004B",
-"j  c #000054",
-"k  c #00005A",
-"l  c #000061",
-"z  c #00006E",
-"x  c #000072",
-"c  c #00007C",
-"v  c #2C2C4C",
-"b  c #2D2D56",
-"n  c #2F2F59",
-"m  c #004D00",
-"M  c #005400",
-"N  c #005F00",
-"B  c #006300",
-"V  c #007700",
-"C  c #007D00",
-"Z  c #3C523E",
-"A  c #460000",
-"S  c #480000",
-"D  c #411A00",
-"F  c #580000",
-"G  c #472F17",
-"H  c #4C331C",
-"J  c #552602",
-"K  c #582702",
-"L  c #592802",
-"P  c #52371E",
-"I  c #52381F",
-"U  c #59391C",
-"Y  c #48362C",
-"T  c #670000",
-"R  c #660909",
-"E  c #770000",
-"W  c #750B0B",
-"Q  c #7B0000",
-"!  c #62320F",
-"~  c #663C17",
-"^  c #603E1F",
-"/  c #454200",
-"(  c #484800",
-")  c #49451E",
-"_  c #5A4806",
-"`  c #575705",
-"'  c #565800",
-"]  c #595600",
-"[  c #5B5A00",
-"{  c #484234",
-"}  c #654014",
-"|  c #7A462F",
-" . c #616100",
-".. c #686900",
-"X. c #737500",
-"o. c #777900",
-"O. c #7A7C00",
-"+. c #707012",
-"@. c #7C7C26",
-"#. c #4B4A64",
-"$. c #476045",
-"%. c #486246",
-"&. c #4A6448",
-"*. c #6D6C55",
-"=. c #796A51",
-"-. c #000083",
-";. c #00008B",
-":. c #000094",
-">. c #000099",
-",. c #0000B5",
-"<. c #0000BB",
-"1. c #0000C2",
-"2. c #0000C8",
-"3. c #544C9B",
-"4. c #76759D",
-"5. c #7B7B9F",
-"6. c #7775A0",
-"7. c #7A78A4",
-"8. c #7C7CE5",
-"9. c #7F7FE9",
-"0. c #008400",
-"q. c #008800",
-"w. c #00BC00",
-"e. c #00C400",
-"r. c #00CA00",
-"t. c green",
-"y. c #7D9E7D",
-"u. c #854200",
-"i. c #964403",
-"p. c #9B4704",
-"a. c #8C4C27",
-"s. c #8E553A",
-"d. c #9F6B3C",
-"f. c #A14B03",
-"g. c #A65300",
-"h. c #AE5700",
-"j. c #A86F3C",
-"k. c #9E5E45",
-"l. c #8F675A",
-"z. c #9C6441",
-"x. c #936B58",
-"c. c #AD6D4F",
-"v. c #AC7645",
-"b. c #AC7E4F",
-"n. c #B37F4C",
-"m. c #FF0202",
-"M. c #FF0B0B",
-"N. c #C35C07",
-"B. c #C76300",
-"V. c #CA6516",
-"C. c #C37A32",
-"Z. c #DF7F3B",
-"A. c #E16E00",
-"S. c #E57100",
-"D. c #F57A0F",
-"F. c #FB7F0F",
-"G. c #F97D13",
-"H. c #858300",
-"J. c #8A8500",
-"K. c #898932",
-"L. c #9FA001",
-"P. c #B5AE00",
-"I. c #BAB400",
-"U. c #ACAC3E",
-"Y. c #909040",
-"T. c #898372",
-"R. c #948163",
-"E. c #9F8567",
-"W. c #9E8B6B",
-"Q. c #9C9C7C",
-"!. c #AA835E",
-"~. c #BD8043",
-"^. c #BE8D5D",
-"/. c #AF8660",
-"(. c #AAAA5C",
-"). c #AEAC77",
-"_. c #BFA57E",
-"`. c #B2B379",
-"'. c #FF8500",
-"]. c #FE8612",
-"[. c #FF8B12",
-"{. c #FF9C34",
-"}. c #C38445",
-"|. c #CC8863",
-" X c #C09273",
-".X c #D6997A",
-"XX c #D89D7D",
-"oX c #ED9C52",
-"OX c #F59241",
-"+X c #FA9D41",
-"@X c #F89C50",
-"#X c #FFA344",
-"$X c #F5A154",
-"%X c #FDAB5B",
-"&X c #FFB05C",
-"*X c #E3B07F",
-"=X c #FBAE60",
-"-X c #FEB362",
-";X c #F5B67A",
-":X c #FDB874",
-">X c #FCBD7D",
-",X c #F5F500",
-"<X c #FEFE00",
-"1X c #D6D67B",
-"2X c #819E81",
-"3X c #ADAB81",
-"4X c #B0AE83",
-"5X c #B4B386",
-"6X c #8181ED",
-"7X c #8484F3",
-"8X c #B9B9F6",
-"9X c #BCBCFA",
-"0X c #BCFABC",
-"qX c #C3A880",
-"wX c #CCA086",
-"eX c #C8AC83",
-"rX c #D3A182",
-"tX c #DCAE8D",
-"yX c #D8BBAB",
-"uX c #F4BD8E",
-"iX c #EBCB9B",
-"pX c #FFCF8F",
-"aX c #F3C094",
-"sX c #F6C09A",
-"dX c #FCCE91",
-"fX c #FED49B",
-"gX c #F1CCB6",
-"hX c #F1CEBB",
-"jX c #F3D2A0",
-"kX c #FADAA6",
-"lX c #FFDDA9",
-"zX c #FFE3AD",
-"xX c #F0F0B5",
-"cX c #F5F5B8",
-"vX c #FBFBBC",
-"bX c #C2C2FE",
-"nX c #C9C9FF",
-"mX c #C4FDC4",
-"MX c #CBFFCB",
-"NX c #FDFDC2",
-"BX c #FFFFC8",
-"VX c None",
-/* pixels */
-"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX        VXVX",
-"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  & , > o   VX",
-"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  & d.*XtXY     ",
-"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  - v.>X@XuXrX>   ",
-"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  ; b.dX=XG.V.z.*   ",
-"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  ; !.fX-X].S.f.D o   ",
-"                        VXVXVXVXVXVXVXVX  ; !.fX-X[.S.f.J o   VX",
-"            w W Q Q q   VXVXVXVXVXVXVX  ; !.fX-X[.S.f.J o   VXVX",
-"      VXVX  R M.m.m.F   VXVXVXVXVXVX  ; /.fX-X[.S.f.J o   VXVXVX",
-"      VXVX  T m.M.m.F   VXVXVXVXVX  ; !.fX-X[.A.f.J o   VXVXVXVX",
-"      VXVX  T m.m.m.F   VXVXVXVX  & b.fX-X].S.f.J o   VXVXVXVXVX",
-"            = A A A =           & v.dX-X].S.f.J o   VXVXVXVXVXVX",
-"  > _.qXeX=.G }.n.}.a u.B.C.^.! j.>X%XG.S.f.J o   VXVXVXVXVXVXVX",
-"  e kXlXzXW.} &X%X&XP h.'.#X>X XaXOXD.A.p.J o   VXVXVXVXVXVXVXVX",
-"  e kXlXzXW.U &X%X%XP h.{.:X|.hXuXZ.N.i.J o   VXVXVXVXVXVXVXVXVX",
-"  e iXiXjXR.U $XoX@XH g.+X;XwXgXXXc.a.K o   VXVXVXVXVXVXVXVXVXVX",
-"  . u u u , O r r r o { T.l.yXXXk.| ~ p o VXVXVXVXVXVXVXVXVXVXVX",
-"  0 xXxXvXQ.[ <X,X<X` Y.1XE.x.s.~ _ ..'   VXVXVXVXVXVXVXVXVXVXVX",
-"  y cXNXNXQ. .<X<X<XK.`.).g ) t  .X.o.[   VXVXVXVXVXVXVXVXVXVXVX",
-"  y NXNXBX3X .<X<X<X@.(.U.+.L.( X.O.J. .  VXVXVXVXVXVXVXVXVXVXVX",
-"  , 3X4X5X*./ I.P.I.s [ J.J.H.s ' [ ] /             VXVXVXVXVXVX",
-"  + Z Z Z d % M m M % 7 9 9 9 X 6 7 7 % X 7 7 7 $   VXVXVXVXVXVX",
-"  0 mXmXMX2XB t.t.t.M 0.r.r.w.% C 0.0.B 6 0.0.q.9   VXVXVXVXVXVX",
-"  0 0X0XmXy.N t.t.t.m 0.e.w.w.% V C 0.N 6 0.C 0.9   VXVXVXVXVXVX",
-"  0 mXmXMX2XN t.t.t.M 0.r.e.w.% C 0.0.B 6 q.0.q.9   VXVXVXVXVXVX",
-"  + &.&.%.f 6 B B B 6 8 m m m X 7 8 8 7 X 8 8 8 %   VXVXVXVXVXVX",
-"  : 4.6.7.#.5 3.3.3.4 j -.c c @ k l l h @ k j j 1   VXVXVXVXVXVX",
-"  3 bXbXnX5.n 7X7X7Xv -.2.1.<.# ;.>.>.x < -.-.-.j . VXVXVXVXVXVX",
-"  3 9XbXnX5.b 7X6X6Xv -.1.<.<.< ;.:.:.x < -.-.-.h . VXVXVXVXVXVX",
-"  3 8X9XbX5.b 9.8.6Xv c 1.<.,.# ;.:.:.z < -.c -.h . VXVXVXVXVXVX",
-"    3 3 3 : . 2 2 2 . @ # # #   @ @ @ .   @ @ @ .   VXVXVXVXVXVX",
-"                                                    VXVXVXVXVXVX"
-};

ubuntu/precise/tdegraphics/debian/icons/tdeiconedit-16.xpm

@@ -0,0 +1,42 @@
+/* XPM */
+static char *tdeiconedit-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 20 1",
+"  c black",
+". c navy",
+"X c #0000C0",
+"o c blue",
+"O c #008000",
+"+ c #00C000",
+"@ c green",
+"# c red",
+"$ c #C05800",
+"% c #808000",
+"& c #FF8000",
+"* c #FFA858",
+"= c #C0C000",
+"- c yellow",
+"; c #FFDCA8",
+": c #C0C0FF",
+"> c #C0FFC0",
+", c #FFC0C0",
+"< c #FFFFC0",
+"1 c None",
+/* pixels */
+"111111111111   1",
+"11111111111 $** ",
+"1111111111 ;*$* ",
+"111111111 ;*&& 1",
+"      11 ;*&& 11",
+" ,,## 11 $&& 111",
+" ,,##       1111",
+" ;;&*&& 11111111",
+" &&&*&&   111111",
+" <<=-==%% 111111",
+" ===-==%%   1111",
+" >>+@++OOOO 1111",
+" +++@++OOOO 1111",
+" ::XoXX.X.. 1111",
+" ::XoXX.X.. 1111",
+"            1111"
+};

ubuntu/precise/tdegraphics/debian/icons/tdeiconedit.xpm

@@ -0,0 +1,280 @@
+/* XPM */
+static char *tdeiconedit[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 242 2",
+"   c #000000",
+".  c #01010B",
+"X  c #000B00",
+"o  c #0C0500",
+"O  c #0D0B00",
+"+  c #090C09",
+"@  c #000013",
+"#  c #00001B",
+"$  c #001400",
+"%  c #001C00",
+"&  c #130C06",
+"*  c #140E0A",
+"=  c #1A0000",
+"-  c #191007",
+";  c #1D140E",
+":  c #101016",
+">  c #1C1611",
+",  c #1B1812",
+"<  c #000023",
+"1  c #000033",
+"2  c #111120",
+"3  c #1A1A23",
+"4  c #1C1A31",
+"5  c #1E1B39",
+"6  c #002400",
+"7  c #002B00",
+"8  c #003400",
+"9  c #003D00",
+"0  c #1B231B",
+"q  c #290000",
+"w  c #2B0909",
+"e  c #221D16",
+"r  c #2A2405",
+"t  c #2F290F",
+"y  c #22221A",
+"u  c #29271D",
+"i  c #2A281E",
+"p  c #3D2900",
+"a  c #3D2A17",
+"s  c #3B3A00",
+"d  c #273328",
+"f  c #2F3D2E",
+"g  c #3D3A2C",
+"h  c #00004B",
+"j  c #000054",
+"k  c #00005A",
+"l  c #000061",
+"z  c #00006E",
+"x  c #000072",
+"c  c #00007C",
+"v  c #2C2C4C",
+"b  c #2D2D56",
+"n  c #2F2F59",
+"m  c #004D00",
+"M  c #005400",
+"N  c #005F00",
+"B  c #006300",
+"V  c #007700",
+"C  c #007D00",
+"Z  c #3C523E",
+"A  c #460000",
+"S  c #480000",
+"D  c #411A00",
+"F  c #580000",
+"G  c #472F17",
+"H  c #4C331C",
+"J  c #552602",
+"K  c #582702",
+"L  c #592802",
+"P  c #52371E",
+"I  c #52381F",
+"U  c #59391C",
+"Y  c #48362C",
+"T  c #670000",
+"R  c #660909",
+"E  c #770000",
+"W  c #750B0B",
+"Q  c #7B0000",
+"!  c #62320F",
+"~  c #663C17",
+"^  c #603E1F",
+"/  c #454200",
+"(  c #484800",
+")  c #49451E",
+"_  c #5A4806",
+"`  c #575705",
+"'  c #565800",
+"]  c #595600",
+"[  c #5B5A00",
+"{  c #484234",
+"}  c #654014",
+"|  c #7A462F",
+" . c #616100",
+".. c #686900",
+"X. c #737500",
+"o. c #777900",
+"O. c #7A7C00",
+"+. c #707012",
+"@. c #7C7C26",
+"#. c #4B4A64",
+"$. c #476045",
+"%. c #486246",
+"&. c #4A6448",
+"*. c #6D6C55",
+"=. c #796A51",
+"-. c #000083",
+";. c #00008B",
+":. c #000094",
+">. c #000099",
+",. c #0000B5",
+"<. c #0000BB",
+"1. c #0000C2",
+"2. c #0000C8",
+"3. c #544C9B",
+"4. c #76759D",
+"5. c #7B7B9F",
+"6. c #7775A0",
+"7. c #7A78A4",
+"8. c #7C7CE5",
+"9. c #7F7FE9",
+"0. c #008400",
+"q. c #008800",
+"w. c #00BC00",
+"e. c #00C400",
+"r. c #00CA00",
+"t. c green",
+"y. c #7D9E7D",
+"u. c #854200",
+"i. c #964403",
+"p. c #9B4704",
+"a. c #8C4C27",
+"s. c #8E553A",
+"d. c #9F6B3C",
+"f. c #A14B03",
+"g. c #A65300",
+"h. c #AE5700",
+"j. c #A86F3C",
+"k. c #9E5E45",
+"l. c #8F675A",
+"z. c #9C6441",
+"x. c #936B58",
+"c. c #AD6D4F",
+"v. c #AC7645",
+"b. c #AC7E4F",
+"n. c #B37F4C",
+"m. c #FF0202",
+"M. c #FF0B0B",
+"N. c #C35C07",
+"B. c #C76300",
+"V. c #CA6516",
+"C. c #C37A32",
+"Z. c #DF7F3B",
+"A. c #E16E00",
+"S. c #E57100",
+"D. c #F57A0F",
+"F. c #FB7F0F",
+"G. c #F97D13",
+"H. c #858300",
+"J. c #8A8500",
+"K. c #898932",
+"L. c #9FA001",
+"P. c #B5AE00",
+"I. c #BAB400",
+"U. c #ACAC3E",
+"Y. c #909040",
+"T. c #898372",
+"R. c #948163",
+"E. c #9F8567",
+"W. c #9E8B6B",
+"Q. c #9C9C7C",
+"!. c #AA835E",
+"~. c #BD8043",
+"^. c #BE8D5D",
+"/. c #AF8660",
+"(. c #AAAA5C",
+"). c #AEAC77",
+"_. c #BFA57E",
+"`. c #B2B379",
+"'. c #FF8500",
+"]. c #FE8612",
+"[. c #FF8B12",
+"{. c #FF9C34",
+"}. c #C38445",
+"|. c #CC8863",
+" X c #C09273",
+".X c #D6997A",
+"XX c #D89D7D",
+"oX c #ED9C52",
+"OX c #F59241",
+"+X c #FA9D41",
+"@X c #F89C50",
+"#X c #FFA344",
+"$X c #F5A154",
+"%X c #FDAB5B",
+"&X c #FFB05C",
+"*X c #E3B07F",
+"=X c #FBAE60",
+"-X c #FEB362",
+";X c #F5B67A",
+":X c #FDB874",
+">X c #FCBD7D",
+",X c #F5F500",
+"<X c #FEFE00",
+"1X c #D6D67B",
+"2X c #819E81",
+"3X c #ADAB81",
+"4X c #B0AE83",
+"5X c #B4B386",
+"6X c #8181ED",
+"7X c #8484F3",
+"8X c #B9B9F6",
+"9X c #BCBCFA",
+"0X c #BCFABC",
+"qX c #C3A880",
+"wX c #CCA086",
+"eX c #C8AC83",
+"rX c #D3A182",
+"tX c #DCAE8D",
+"yX c #D8BBAB",
+"uX c #F4BD8E",
+"iX c #EBCB9B",
+"pX c #FFCF8F",
+"aX c #F3C094",
+"sX c #F6C09A",
+"dX c #FCCE91",
+"fX c #FED49B",
+"gX c #F1CCB6",
+"hX c #F1CEBB",
+"jX c #F3D2A0",
+"kX c #FADAA6",
+"lX c #FFDDA9",
+"zX c #FFE3AD",
+"xX c #F0F0B5",
+"cX c #F5F5B8",
+"vX c #FBFBBC",
+"bX c #C2C2FE",
+"nX c #C9C9FF",
+"mX c #C4FDC4",
+"MX c #CBFFCB",
+"NX c #FDFDC2",
+"BX c #FFFFC8",
+"VX c None",
+/* pixels */
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX        VXVX",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  & , > o   VX",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  & d.*XtXY     ",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  - v.>X@XuXrX>   ",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  ; b.dX=XG.V.z.*   ",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  ; !.fX-X].S.f.D o   ",
+"                        VXVXVXVXVXVXVXVX  ; !.fX-X[.S.f.J o   VX",
+"            w W Q Q q   VXVXVXVXVXVXVX  ; !.fX-X[.S.f.J o   VXVX",
+"      VXVX  R M.m.m.F   VXVXVXVXVXVX  ; /.fX-X[.S.f.J o   VXVXVX",
+"      VXVX  T m.M.m.F   VXVXVXVXVX  ; !.fX-X[.A.f.J o   VXVXVXVX",
+"      VXVX  T m.m.m.F   VXVXVXVX  & b.fX-X].S.f.J o   VXVXVXVXVX",
+"            = A A A =           & v.dX-X].S.f.J o   VXVXVXVXVXVX",
+"  > _.qXeX=.G }.n.}.a u.B.C.^.! j.>X%XG.S.f.J o   VXVXVXVXVXVXVX",
+"  e kXlXzXW.} &X%X&XP h.'.#X>X XaXOXD.A.p.J o   VXVXVXVXVXVXVXVX",
+"  e kXlXzXW.U &X%X%XP h.{.:X|.hXuXZ.N.i.J o   VXVXVXVXVXVXVXVXVX",
+"  e iXiXjXR.U $XoX@XH g.+X;XwXgXXXc.a.K o   VXVXVXVXVXVXVXVXVXVX",
+"  . u u u , O r r r o { T.l.yXXXk.| ~ p o VXVXVXVXVXVXVXVXVXVXVX",
+"  0 xXxXvXQ.[ <X,X<X` Y.1XE.x.s.~ _ ..'   VXVXVXVXVXVXVXVXVXVXVX",
+"  y cXNXNXQ. .<X<X<XK.`.).g ) t  .X.o.[   VXVXVXVXVXVXVXVXVXVXVX",
+"  y NXNXBX3X .<X<X<X@.(.U.+.L.( X.O.J. .  VXVXVXVXVXVXVXVXVXVXVX",
+"  , 3X4X5X*./ I.P.I.s [ J.J.H.s ' [ ] /             VXVXVXVXVXVX",
+"  + Z Z Z d % M m M % 7 9 9 9 X 6 7 7 % X 7 7 7 $   VXVXVXVXVXVX",
+"  0 mXmXMX2XB t.t.t.M 0.r.r.w.% C 0.0.B 6 0.0.q.9   VXVXVXVXVXVX",
+"  0 0X0XmXy.N t.t.t.m 0.e.w.w.% V C 0.N 6 0.C 0.9   VXVXVXVXVXVX",
+"  0 mXmXMX2XN t.t.t.M 0.r.e.w.% C 0.0.B 6 q.0.q.9   VXVXVXVXVXVX",
+"  + &.&.%.f 6 B B B 6 8 m m m X 7 8 8 7 X 8 8 8 %   VXVXVXVXVXVX",
+"  : 4.6.7.#.5 3.3.3.4 j -.c c @ k l l h @ k j j 1   VXVXVXVXVXVX",
+"  3 bXbXnX5.n 7X7X7Xv -.2.1.<.# ;.>.>.x < -.-.-.j . VXVXVXVXVXVX",
+"  3 9XbXnX5.b 7X6X6Xv -.1.<.<.< ;.:.:.x < -.-.-.h . VXVXVXVXVXVX",
+"  3 8X9XbX5.b 9.8.6Xv c 1.<.,.# ;.:.:.z < -.c -.h . VXVXVXVXVXVX",
+"    3 3 3 : . 2 2 2 . @ # # #   @ @ @ .   @ @ @ .   VXVXVXVXVXVX",
+"                                                    VXVXVXVXVXVX"
+};

ubuntu/precise/tdegraphics/debian/kcoloredit-trinity.menu

@@ -1,4 +1,4 @@
-?package(kcoloredit):\
+?package(kcoloredit-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
@@ -7,7 +7,7 @@
 	icon16x16="/opt/trinity/share/pixmaps/kcolorchooser-16.xpm"\
 	command="/opt/trinity/bin/kcolorchooser"
 
-?package(kcoloredit):\
+?package(kcoloredit-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

ubuntu/precise/tdegraphics/debian/kdvi-trinity.menu

@@ -1,4 +1,4 @@
-?package(kdvi):\
+?package(kdvi-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,DVI,Documents"\

ubuntu/precise/tdegraphics/debian/kfax-trinity.menu

@@ -1,4 +1,4 @@
-?package(kfax):\
+?package(kfax-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

ubuntu/precise/tdegraphics/debian/kfaxview-trinity.menu

@@ -1,4 +1,4 @@
-?package(kfaxview):\
+?package(kfaxview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

ubuntu/precise/tdegraphics/debian/kghostview-trinity.menu

@@ -1,4 +1,4 @@
-?package(kghostview):\
+?package(kghostview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,Documents"\

ubuntu/precise/tdegraphics/debian/kiconedit-trinity.install

@@ -1,41 +0,0 @@
-debian/tmp/opt/trinity/bin/kiconedit
-debian/tmp/opt/trinity/share/applications/tde/kiconedit.desktop
-debian/tmp/opt/trinity/share/apps/kiconedit/kiconeditui.rc
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/aim-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/aim.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/airbrush-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/areaselect.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/circle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/colorpicker-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/compressed.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/ellipse.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/eraser-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/fileclose.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/fill-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledcircle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledellipse.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledrectangle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/grayscale.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/grid.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/kdepalette.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/line.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/paintbrush-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/pointer.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/rectangle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/selectcircle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/selectrect.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/source.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/standard.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/transform.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/window_new.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/kiconedit-configuration.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kiconedit.png
-
-debian/icons/kiconedit.xpm		/opt/trinity/share/pixmaps
-debian/icons/kiconedit-16.xpm		/opt/trinity/share/pixmaps

ubuntu/precise/tdegraphics/debian/kiconedit-trinity.manpages

@@ -1 +0,0 @@
-debian/man/kiconedit.1

ubuntu/precise/tdegraphics/debian/kiconedit-trinity.menu

@@ -1,11 +0,0 @@
-?package(kiconedit):\
-	needs="X11"\
-	section="Applications/Graphics"\
-	hints="TDE"\
-	title="TDEIconEdit"\
-	icon32x32="/opt/trinity/share/pixmaps/kiconedit.xpm"\
-	icon16x16="/opt/trinity/share/pixmaps/kiconedit-16.xpm"\
-	command="/opt/trinity/bin/kiconedit"
-
-# Icon 32x32 kiconedit/pics/cr32-app-kiconedit.png kiconedit.xpm
-# Icon 16x16 kiconedit/pics/cr16-app-kiconedit.png kiconedit-16.xpm

ubuntu/precise/tdegraphics/debian/kolourpaint-trinity.menu

@@ -1,4 +1,4 @@
-?package(kolourpaint):\
+?package(kolourpaint-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

ubuntu/precise/tdegraphics/debian/kooka-trinity.menu

@@ -1,4 +1,4 @@
-?package(kooka):\
+?package(kooka-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

ubuntu/precise/tdegraphics/debian/kpdf-trinity.menu

@@ -1,4 +1,4 @@
-?package(kpdf):\
+?package(kpdf-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

ubuntu/precise/tdegraphics/debian/kpovmodeler-trinity.menu

@@ -1,4 +1,4 @@
-?package(kpovmodeler):\
+?package(kpovmodeler-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE,Modeler"\

ubuntu/precise/tdegraphics/debian/kruler-trinity.menu

@@ -1,4 +1,4 @@
-?package(kruler):\
+?package(kruler-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

ubuntu/precise/tdegraphics/debian/ksnapshot-trinity.menu

@@ -1,4 +1,4 @@
-?package(ksnapshot):\
+?package(ksnapshot-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

ubuntu/precise/tdegraphics/debian/kuickshow-trinity.menu

@@ -1,4 +1,4 @@
-?package(kuickshow):\
+?package(kuickshow-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

ubuntu/precise/tdegraphics/debian/kview-trinity.menu

@@ -1,4 +1,4 @@
-?package(kview):\
+?package(kview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,Images"\

ubuntu/precise/tdegraphics/debian/man/kiconedit.1

@@ -1,89 +0,0 @@
-.TH KICONEDIT "1" "September 2002" KDE "KDE Application"
-.SH NAME
-kiconedit \- KDE Icon Editor
-.SH SYNOPSIS
-.B kiconedit
-[\fIQt-options\fR] [\fIKDE-options\fR] [\fIfile(s)\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B TDEIconEdit
-KDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B TDEIconEdit
-is designed to help create icons for KDE using the standard
-icon palette.  
-.PP
-KDE Icon Editor
-.SH AUTHOR
-TDEIconEdit was written by
-.nh
-Thomas Tanghus <tanghus@kde.org>,
-John Califf <jcaliff@compuzone.net>,
-Laurent Montel <lmontel@mandrakesoft.com> and
-Aaron J. Seigo <aseigo@olympusproject.org>.
-.hy
-.br
-Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-kde\fR
-Show KDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-file(s)
-Icon file(s) to open
-.SH "SEE ALSO"
-The full documentation for
-.B TDEIconEdit
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kiconedit
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-TDEIconEdit was written by
-.nh
-Thomas Tanghus <tanghus@kde.org>,
-John Califf <jcaliff@compuzone.net>,
-Laurent Montel <lmontel@mandrakesoft.com>
-and Aaron J. Seigo <aseigo@olympusproject.org>.
-.hy
-.br
-Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).

ubuntu/precise/tdegraphics/debian/man/tdeiconedit.1

@@ -0,0 +1,89 @@
+.TH TDEICONEDIT "1" "September 2002" TDE "TDE Application"
+.SH NAME
+tdeiconedit \- TDE Icon Editor
+.SH SYNOPSIS
+.B tdeiconedit
+[\fIQt-options\fR] [\fIKDE-options\fR] [\fIfile(s)\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B TDEIconEdit
+TDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.P
+.B TDEIconEdit
+is designed to help create icons for TDE using the standard
+icon palette.  
+.PP
+TDE Icon Editor
+.SH AUTHOR
+TDEIconEdit was written by
+.nh
+Thomas Tanghus <tanghus@kde.org>,
+John Califf <jcaliff@compuzone.net>,
+Laurent Montel <lmontel@mandrakesoft.com> and
+Aaron J. Seigo <aseigo@olympusproject.org>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-tde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SS "Arguments:"
+.TP
+file(s)
+Icon file(s) to open
+.SH "SEE ALSO"
+The full documentation for
+.B TDEIconEdit
+is maintained as a docbook manual.  If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/tdeiconedit
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+TDEIconEdit was written by
+.nh
+Thomas Tanghus <tanghus@kde.org>,
+John Califf <jcaliff@compuzone.net>,
+Laurent Montel <lmontel@mandrakesoft.com>
+and Aaron J. Seigo <aseigo@olympusproject.org>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).

ubuntu/precise/tdegraphics/debian/rules

@@ -14,9 +14,21 @@ include /usr/share/cdbs/1/class/cmake.mk
 #include /usr/share/cdbs/1/rules/patchsys-quilt.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" \
--DCMAKE_BUILD_TYPE=RelWithDebInfo
+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/" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DBUILD_ALL="ON" \
+ -DWITH_TIFF="ON" \
+ -DWITH_OPENEXR="ON" \
+ -DWITH_PDF="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
@@ -57,81 +69,49 @@ kuickshow-trinity-tar:
 	cd ..; tar zcf kuickshow-trinity_3.5.8.orig.tar.gz kuickshow-trinity-3.5.8
 
 binary-post-install/kpdf-trinity::
-	#cp -Rp debian/kpdf-trinity/usr/* debian/kpdf-trinity/opt/trinity/
-	#rm -rf debian/kpdf-trinity/usr/
 	mv debian/kpdf-trinity/usr/share/man debian/kpdf-trinity/opt/trinity/share/
 
 binary-post-install/kghostview-trinity::
-	#cp -Rp debian/kghostview-trinity/usr/* debian/kghostview-trinity/opt/trinity/
-	#rm -rf debian/kghostview-trinity/usr/
 	mv debian/kghostview-trinity/usr/share/man debian/kghostview-trinity/opt/trinity/share/
 
 binary-post-install/kcolorchooser-trinity::
-	#cp -Rp debian/kcolorchooser-trinity/usr/* debian/kcolorchooser-trinity/opt/trinity/
-	#rm -rf debian/kcolorchooser-trinity/usr/
 	mv debian/kcolorchooser-trinity/usr/share/man debian/kcolorchooser-trinity/opt/trinity/share/
 
 binary-post-install/kdvi-trinity::
-	#cp -Rp debian/kdvi-trinity/usr/* debian/kdvi-trinity/opt/trinity/
-	#rm -rf debian/kdvi-trinity/usr/
 	mv debian/kdvi-trinity/usr/share/man debian/kdvi-trinity/opt/trinity/share/
 
 binary-post-install/kfaxview-trinity::
-	#cp -Rp debian/kfaxview-trinity/usr/* debian/kfaxview-trinity/opt/trinity/
-	#rm -rf debian/kfaxview-trinity/usr/	
 	mv debian/kfaxview-trinity/usr/share/man debian/kfaxview-trinity/opt/trinity/share/
 
-binary-post-install/kiconedit-trinity::
-	#cp -Rp debian/kiconedit-trinity/usr/* debian/kiconedit-trinity/opt/trinity/
-	#rm -rf debian/kiconedit-trinity/usr/	
-	mv debian/kiconedit-trinity/usr/share/man debian/kiconedit-trinity/opt/trinity/share/
+binary-post-install/tdeiconedit-trinity::
+	mv debian/tdeiconedit-trinity/usr/share/man debian/tdeiconedit-trinity/opt/trinity/share/
 
 binary-post-install/kooka-trinity::
-	#cp -Rp debian/kooka-trinity/usr/* debian/kooka-trinity/opt/trinity/
-	#rm -rf debian/kooka-trinity/usr/
 	mv debian/kooka-trinity/usr/share/man debian/kooka-trinity/opt/trinity/share/
 
 binary-post-install/kpovmodeler-trinity::
-	#cp -Rp debian/kpovmodeler-trinity/usr/* debian/kpovmodeler-trinity/opt/trinity/
-	#rm -rf debian/kpovmodeler-trinity/usr/
 	mv debian/kpovmodeler-trinity/usr/share/man debian/kpovmodeler-trinity/opt/trinity/share/
 
 binary-post-install/ksnapshot-trinity::
-	#cp -Rp debian/ksnapshot-trinity/usr/* debian/ksnapshot-trinity/opt/trinity/
-	#rm -rf debian/ksnapshot-trinity/usr/
 	mv debian/ksnapshot-trinity/usr/share/man debian/ksnapshot-trinity/opt/trinity/share/
 
 binary-post-install/kview-trinity::
-	#cp -Rp debian/kview-trinity/usr/* debian/kview-trinity/opt/trinity/
-	#rm -rf debian/kview-trinity/usr/
 	mv debian/kview-trinity/usr/share/man debian/kview-trinity/opt/trinity/share/
 
 binary-post-install/kcoloredit-trinity::
-	#cp -Rp debian/kcoloredit-trinity/usr/* debian/kcoloredit-trinity/opt/trinity/
-	#rm -rf debian/kcoloredit-trinity/usr/
 	mv debian/kcoloredit-trinity/usr/share/man debian/kcoloredit-trinity/opt/trinity/share/
 
 binary-post-install/kfax-trinity::
-	#cp -Rp debian/kfax-trinity/usr/* debian/kfax-trinity/opt/trinity/
-	#rm -rf debian/kfax-trinity/usr/
 	mv debian/kfax-trinity/usr/share/man debian/kfax-trinity/opt/trinity/share/
 
 binary-post-install/kolourpaint-trinity::
-	#cp -Rp debian/kolourpaint-trinity/usr/* debian/kolourpaint-trinity/opt/trinity/
-	#rm -rf debian/kolourpaint-trinity/usr/
 	mv debian/kolourpaint-trinity/usr/share/man debian/kolourpaint-trinity/opt/trinity/share/
 
 binary-post-install/kruler-trinity::
-	#cp -Rp debian/kruler-trinity/usr/* debian/kruler-trinity/opt/trinity/
-	#rm -rf debian/kruler-trinity/usr/
 	mv debian/kruler-trinity/usr/share/man debian/kruler-trinity/opt/trinity/share/
 
 binary-post-install/kuickshow-trinity::
-	#cp -Rp debian/kuickshow-trinity/usr/* debian/kuickshow-trinity/opt/trinity/
-	#rm -rf debian/kuickshow-trinity/usr/
 	mv debian/kuickshow-trinity/usr/share/man debian/kuickshow-trinity/opt/trinity/share/
 
 binary-post-install/kviewshell-trinity::
-	#cp -Rp debian/kviewshell-trinity/usr/* debian/kviewshell-trinity/opt/trinity/
-	#rm -rf debian/kviewshell-trinity/usr/
 	mv debian/kviewshell-trinity/usr/share/man debian/kviewshell-trinity/opt/trinity/share/

ubuntu/precise/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera

@@ -5,6 +5,6 @@ Abstract: Kamera allows you to view and download images on a digital camera.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kamera/index.html
-Files: /usr/share/doc/tde/HTML/en/kamera/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kamera/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kamera/*.html
 

ubuntu/precise/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit

@@ -6,6 +6,6 @@ Abstract: KColorEdit is a palette files editor. It can be used for editing
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kcoloredit/index.html
-Files: /usr/share/doc/tde/HTML/en/kcoloredit/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kcoloredit/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kcoloredit/*.html
 

ubuntu/precise/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi

@@ -5,6 +5,6 @@ Abstract: This program and KPart allow the user to display *.DVI files from TeX.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kdvi/index.html
-Files: /usr/share/doc/tde/HTML/en/kdvi/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kdvi/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kdvi/*.html
 

ubuntu/precise/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma

@@ -5,6 +5,6 @@ Abstract: KGamma is a simple tool for monitor gamma correction.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kgamma/index.html
-Files: /usr/share/doc/tde/HTML/en/kgamma/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kgamma/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kgamma/*.html
 

ubuntu/precise/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview

@@ -6,6 +6,6 @@ Abstract: KGhostView displays and prints PostScript and
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kghostview/index.html
-Files: /usr/share/doc/tde/HTML/en/kghostview/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kghostview/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kghostview/*.html
 

ubuntu/precise/tdegraphics/debian/tdegraphics-doc-html.doc-base.kiconedit

@@ -1,11 +0,0 @@
-Document: tdegraphics-doc-html-kiconedit
-Title: TDEIconEdit Handbook
-Author: Thomas Tanghus, Lauri Watts
-Abstract: TDEIconEdit is designed to help create icons for KDE using the
- standard icon palette.
-Section: Apps/Graphics
-
-Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kiconedit/index.html
-Files: /usr/share/doc/tde/HTML/en/kiconedit/*.html
-

ubuntu/precise/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint

@@ -5,6 +5,6 @@ Abstract: KolourPaint is a free, easy-to-use paint program for KDE.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kolourpaint/index.html
-Files: /usr/share/doc/tde/HTML/en/kolourpaint/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kolourpaint/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kolourpaint/*.html
 

ubuntu/precise/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka

@@ -5,6 +5,6 @@ Abstract: Kooka is a very useful KDE scanning application.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kooka/index.html
-Files: /usr/share/doc/tde/HTML/en/kooka/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kooka/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kooka/*.html
 

ubuntu/precise/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf

@@ -5,6 +5,6 @@ Abstract: KPDF is a KDE PDF viewer based on xpdf code.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpdf/index.html
-Files: /usr/share/doc/tde/HTML/en/kpdf/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpdf/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpdf/*.html
 

ubuntu/precise/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler

@@ -6,6 +6,6 @@ Abstract: KPovModeler is a graphical 3D modeler, which can generate
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpovmodeler/index.html
-Files: /usr/share/doc/tde/HTML/en/kpovmodeler/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpovmodeler/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpovmodeler/*.html
 

ubuntu/precise/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler

@@ -5,6 +5,6 @@ Abstract: KRuler can be used to measure objects on the screen.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kruler/index.html
-Files: /usr/share/doc/tde/HTML/en/kruler/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kruler/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kruler/*.html
 

ubuntu/precise/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot

@@ -5,6 +5,6 @@ Abstract: KSnapshot is a simple applet for taking screenshots.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/ksnapshot/index.html
-Files: /usr/share/doc/tde/HTML/en/ksnapshot/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/ksnapshot/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/ksnapshot/*.html
 

ubuntu/precise/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow

@@ -5,6 +5,6 @@ Abstract: KuickShow is a comfortable image browser/viewer.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kuickshow/index.html
-Files: /usr/share/doc/tde/HTML/en/kuickshow/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kuickshow/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kuickshow/*.html
 

ubuntu/precise/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview

@@ -5,6 +5,6 @@ Abstract: KView is an image viewing program.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kview/index.html
-Files: /usr/share/doc/tde/HTML/en/kview/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kview/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kview/*.html
 

ubuntu/precise/tdegraphics/debian/tdegraphics-doc-html.doc-base.tdeiconedit

@@ -0,0 +1,11 @@
+Document: tdegraphics-doc-html-tdeiconedit
+Title: TDEIconEdit Handbook
+Author: Thomas Tanghus, Lauri Watts
+Abstract: TDEIconEdit is designed to help create icons for KDE using the
+ standard icon palette.
+Section: Apps/Graphics
+
+Format: HTML
+Index: /opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/tdeiconedit/*.html
+

ubuntu/precise/tdegraphics/debian/tdeiconedit-trinity.install

@@ -0,0 +1,41 @@
+debian/tmp/opt/trinity/bin/tdeiconedit
+debian/tmp/opt/trinity/share/applications/tde/tdeiconedit.desktop
+debian/tmp/opt/trinity/share/apps/tdeiconedit/tdeiconeditui.rc
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/aim-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/aim.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/airbrush-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/areaselect.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/circle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/colorpicker-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/compressed.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/ellipse.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/eraser-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/fileclose.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/fill-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledcircle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledellipse.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledrectangle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/grayscale.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/grid.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/kdepalette.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/line.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/paintbrush-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/pointer.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/rectangle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/selectcircle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/selectrect.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/source.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/standard.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/transform.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/window_new.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/tdeiconedit-configuration.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdeiconedit.png
+
+debian/icons/tdeiconedit.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeiconedit-16.xpm		/opt/trinity/share/pixmaps

ubuntu/precise/tdegraphics/debian/tdeiconedit-trinity.manpages

@@ -0,0 +1 @@
+debian/man/tdeiconedit.1

ubuntu/precise/tdegraphics/debian/tdeiconedit-trinity.menu

@@ -0,0 +1,11 @@
+?package(tdeiconedit-trinity):\
+	needs="X11"\
+	section="Applications/Graphics"\
+	hints="TDE"\
+	title="TDEIconEdit"\
+	icon32x32="/opt/trinity/share/pixmaps/tdeiconedit.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeiconedit-16.xpm"\
+	command="/opt/trinity/bin/tdeiconedit"
+
+# Icon 32x32 tdeiconedit/pics/cr32-app-tdeiconedit.png tdeiconedit.xpm
+# Icon 16x16 tdeiconedit/pics/cr16-app-tdeiconedit.png tdeiconedit-16.xpm

ubuntu/precise/tdevelop/debian/control

@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebas
 Replaces: kdevelop-kde3 (<< 4:14.0.0~), kdevelop-trinity (<< 4:14.0.0~)
 Breaks: kdevelop-kde3 (<< 4:14.0.0~), kdevelop-trinity (<< 4:14.0.0~)
 Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
-Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, kiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
+Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
 Description: An IDE for Unix/X11
  KDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 

ubuntu/raring/metapackages/rename-meta/debian/control

@@ -264,6 +264,12 @@ Depends: tdegraphics-trinity-dbg
 Conflicts: kdegraphics-trinity-dbg (<< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
+Package: kiconedit-trinity
+Architecture: all
+Depends: tdeiconedit-trinity
+Conflicts: kiconedit-trinity (<< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
 Package: kdesvn-trinity
 Architecture: all
 Depends: tdesvn-trinity

ubuntu/raring/tdegraphics/debian/control

@@ -12,7 +12,7 @@ Section: tde
 Architecture: all
 Replaces: kdegraphics-kde3 (<< 4:14.0.0~), kdegraphics-trinity (<< 4:14.0.0~)
 Breaks: kdegraphics-kde3 (<< 4:14.0.0~), kdegraphics-trinity (<< 4:14.0.0~)
-Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), kiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
+Depends: kamera-trinity (>= ${source:Version}), kcoloredit-trinity (>= ${source:Version}), tdegraphics-tdefile-plugins-trinity (>= ${source:Version}), kdvi-trinity (>= ${source:Version}), kfax-trinity (>= ${source:Version}), kfaxview-trinity (>= ${source:Version}), kgamma-trinity (>= ${source:Version}), kghostview-trinity (>= ${source:Version}), tdeiconedit-trinity (>= ${source:Version}), kmrml-trinity (>= ${source:Version}), kolourpaint-trinity (>= ${source:Version}), kooka-trinity (>= ${source:Version}), kpdf-trinity (>= ${source:Version}), kpovmodeler-trinity (>= ${source:Version}), kruler-trinity (>= ${source:Version}), ksnapshot-trinity (>= ${source:Version}), ksvg-trinity (>= ${source:Version}), kview-trinity (>= ${source:Version}), kviewshell-trinity (>= ${source:Version}), libkscan1-trinity (>= ${source:Version})
 Suggests: tdegraphics-trinity-doc-html (>= ${source:Version})
 Description: graphics apps from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -176,7 +176,7 @@ Description: PostScript viewer for Trinity
  This package is part of Trinity, as a component of the KDE graphics module.
  See the 'kde-trinity' and 'tdegraphics-trinity' packages for more information.
 
-Package: kiconedit-trinity
+Package: tdeiconedit-trinity
 Section: graphics
 Architecture: any
 Replaces: kiconedit-kde3 (<< 4:14.0.0~), kiconedit-trinity (<< 4:14.0.0~)

ubuntu/raring/tdegraphics/debian/control.in

@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdegraphics
 Section: tde
 Architecture: all
-Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), kiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
+Depends: kamera (>= ${source:Version}), kcoloredit (>= ${source:Version}), tdegraphics-tdefile-plugins (>= ${source:Version}), kdvi (>= ${source:Version}), kfax (>= ${source:Version}), kfaxview (>= ${source:Version}), kgamma (>= ${source:Version}), kghostview (>= ${source:Version}), tdeiconedit (>= ${source:Version}), kmrml (>= ${source:Version}), kolourpaint (>= ${source:Version}), kooka (>= ${source:Version}), kpdf (>= ${source:Version}), kpovmodeler (>= ${source:Version}), kruler (>= ${source:Version}), ksnapshot (>= ${source:Version}), ksvg (>= ${source:Version}), kuickshow (>= ${source:Version}), kview (>= ${source:Version}), kviewshell (>= ${source:Version}), libkscan1 (>= ${source:Version})
 Suggests: tdegraphics-doc-html (>= ${source:Version})
 Description: graphics apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -154,7 +154,7 @@ Description: PostScript viewer for KDE
  This package is part of KDE, as a component of the KDE graphics module.
  See the 'kde' and 'tdegraphics' packages for more information.
 
-Package: kiconedit
+Package: tdeiconedit
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}

ubuntu/raring/tdegraphics/debian/icons/kiconedit-16.xpm

@@ -1,42 +0,0 @@
-/* XPM */
-static char *kiconedit-16[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 20 1",
-"  c black",
-". c navy",
-"X c #0000C0",
-"o c blue",
-"O c #008000",
-"+ c #00C000",
-"@ c green",
-"# c red",
-"$ c #C05800",
-"% c #808000",
-"& c #FF8000",
-"* c #FFA858",
-"= c #C0C000",
-"- c yellow",
-"; c #FFDCA8",
-": c #C0C0FF",
-"> c #C0FFC0",
-", c #FFC0C0",
-"< c #FFFFC0",
-"1 c None",
-/* pixels */
-"111111111111   1",
-"11111111111 $** ",
-"1111111111 ;*$* ",
-"111111111 ;*&& 1",
-"      11 ;*&& 11",
-" ,,## 11 $&& 111",
-" ,,##       1111",
-" ;;&*&& 11111111",
-" &&&*&&   111111",
-" <<=-==%% 111111",
-" ===-==%%   1111",
-" >>+@++OOOO 1111",
-" +++@++OOOO 1111",
-" ::XoXX.X.. 1111",
-" ::XoXX.X.. 1111",
-"            1111"
-};

ubuntu/raring/tdegraphics/debian/icons/kiconedit.xpm

@@ -1,280 +0,0 @@
-/* XPM */
-static char *kiconedit[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 242 2",
-"   c #000000",
-".  c #01010B",
-"X  c #000B00",
-"o  c #0C0500",
-"O  c #0D0B00",
-"+  c #090C09",
-"@  c #000013",
-"#  c #00001B",
-"$  c #001400",
-"%  c #001C00",
-"&  c #130C06",
-"*  c #140E0A",
-"=  c #1A0000",
-"-  c #191007",
-";  c #1D140E",
-":  c #101016",
-">  c #1C1611",
-",  c #1B1812",
-"<  c #000023",
-"1  c #000033",
-"2  c #111120",
-"3  c #1A1A23",
-"4  c #1C1A31",
-"5  c #1E1B39",
-"6  c #002400",
-"7  c #002B00",
-"8  c #003400",
-"9  c #003D00",
-"0  c #1B231B",
-"q  c #290000",
-"w  c #2B0909",
-"e  c #221D16",
-"r  c #2A2405",
-"t  c #2F290F",
-"y  c #22221A",
-"u  c #29271D",
-"i  c #2A281E",
-"p  c #3D2900",
-"a  c #3D2A17",
-"s  c #3B3A00",
-"d  c #273328",
-"f  c #2F3D2E",
-"g  c #3D3A2C",
-"h  c #00004B",
-"j  c #000054",
-"k  c #00005A",
-"l  c #000061",
-"z  c #00006E",
-"x  c #000072",
-"c  c #00007C",
-"v  c #2C2C4C",
-"b  c #2D2D56",
-"n  c #2F2F59",
-"m  c #004D00",
-"M  c #005400",
-"N  c #005F00",
-"B  c #006300",
-"V  c #007700",
-"C  c #007D00",
-"Z  c #3C523E",
-"A  c #460000",
-"S  c #480000",
-"D  c #411A00",
-"F  c #580000",
-"G  c #472F17",
-"H  c #4C331C",
-"J  c #552602",
-"K  c #582702",
-"L  c #592802",
-"P  c #52371E",
-"I  c #52381F",
-"U  c #59391C",
-"Y  c #48362C",
-"T  c #670000",
-"R  c #660909",
-"E  c #770000",
-"W  c #750B0B",
-"Q  c #7B0000",
-"!  c #62320F",
-"~  c #663C17",
-"^  c #603E1F",
-"/  c #454200",
-"(  c #484800",
-")  c #49451E",
-"_  c #5A4806",
-"`  c #575705",
-"'  c #565800",
-"]  c #595600",
-"[  c #5B5A00",
-"{  c #484234",
-"}  c #654014",
-"|  c #7A462F",
-" . c #616100",
-".. c #686900",
-"X. c #737500",
-"o. c #777900",
-"O. c #7A7C00",
-"+. c #707012",
-"@. c #7C7C26",
-"#. c #4B4A64",
-"$. c #476045",
-"%. c #486246",
-"&. c #4A6448",
-"*. c #6D6C55",
-"=. c #796A51",
-"-. c #000083",
-";. c #00008B",
-":. c #000094",
-">. c #000099",
-",. c #0000B5",
-"<. c #0000BB",
-"1. c #0000C2",
-"2. c #0000C8",
-"3. c #544C9B",
-"4. c #76759D",
-"5. c #7B7B9F",
-"6. c #7775A0",
-"7. c #7A78A4",
-"8. c #7C7CE5",
-"9. c #7F7FE9",
-"0. c #008400",
-"q. c #008800",
-"w. c #00BC00",
-"e. c #00C400",
-"r. c #00CA00",
-"t. c green",
-"y. c #7D9E7D",
-"u. c #854200",
-"i. c #964403",
-"p. c #9B4704",
-"a. c #8C4C27",
-"s. c #8E553A",
-"d. c #9F6B3C",
-"f. c #A14B03",
-"g. c #A65300",
-"h. c #AE5700",
-"j. c #A86F3C",
-"k. c #9E5E45",
-"l. c #8F675A",
-"z. c #9C6441",
-"x. c #936B58",
-"c. c #AD6D4F",
-"v. c #AC7645",
-"b. c #AC7E4F",
-"n. c #B37F4C",
-"m. c #FF0202",
-"M. c #FF0B0B",
-"N. c #C35C07",
-"B. c #C76300",
-"V. c #CA6516",
-"C. c #C37A32",
-"Z. c #DF7F3B",
-"A. c #E16E00",
-"S. c #E57100",
-"D. c #F57A0F",
-"F. c #FB7F0F",
-"G. c #F97D13",
-"H. c #858300",
-"J. c #8A8500",
-"K. c #898932",
-"L. c #9FA001",
-"P. c #B5AE00",
-"I. c #BAB400",
-"U. c #ACAC3E",
-"Y. c #909040",
-"T. c #898372",
-"R. c #948163",
-"E. c #9F8567",
-"W. c #9E8B6B",
-"Q. c #9C9C7C",
-"!. c #AA835E",
-"~. c #BD8043",
-"^. c #BE8D5D",
-"/. c #AF8660",
-"(. c #AAAA5C",
-"). c #AEAC77",
-"_. c #BFA57E",
-"`. c #B2B379",
-"'. c #FF8500",
-"]. c #FE8612",
-"[. c #FF8B12",
-"{. c #FF9C34",
-"}. c #C38445",
-"|. c #CC8863",
-" X c #C09273",
-".X c #D6997A",
-"XX c #D89D7D",
-"oX c #ED9C52",
-"OX c #F59241",
-"+X c #FA9D41",
-"@X c #F89C50",
-"#X c #FFA344",
-"$X c #F5A154",
-"%X c #FDAB5B",
-"&X c #FFB05C",
-"*X c #E3B07F",
-"=X c #FBAE60",
-"-X c #FEB362",
-";X c #F5B67A",
-":X c #FDB874",
-">X c #FCBD7D",
-",X c #F5F500",
-"<X c #FEFE00",
-"1X c #D6D67B",
-"2X c #819E81",
-"3X c #ADAB81",
-"4X c #B0AE83",
-"5X c #B4B386",
-"6X c #8181ED",
-"7X c #8484F3",
-"8X c #B9B9F6",
-"9X c #BCBCFA",
-"0X c #BCFABC",
-"qX c #C3A880",
-"wX c #CCA086",
-"eX c #C8AC83",
-"rX c #D3A182",
-"tX c #DCAE8D",
-"yX c #D8BBAB",
-"uX c #F4BD8E",
-"iX c #EBCB9B",
-"pX c #FFCF8F",
-"aX c #F3C094",
-"sX c #F6C09A",
-"dX c #FCCE91",
-"fX c #FED49B",
-"gX c #F1CCB6",
-"hX c #F1CEBB",
-"jX c #F3D2A0",
-"kX c #FADAA6",
-"lX c #FFDDA9",
-"zX c #FFE3AD",
-"xX c #F0F0B5",
-"cX c #F5F5B8",
-"vX c #FBFBBC",
-"bX c #C2C2FE",
-"nX c #C9C9FF",
-"mX c #C4FDC4",
-"MX c #CBFFCB",
-"NX c #FDFDC2",
-"BX c #FFFFC8",
-"VX c None",
-/* pixels */
-"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX        VXVX",
-"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  & , > o   VX",
-"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  & d.*XtXY     ",
-"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  - v.>X@XuXrX>   ",
-"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  ; b.dX=XG.V.z.*   ",
-"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  ; !.fX-X].S.f.D o   ",
-"                        VXVXVXVXVXVXVXVX  ; !.fX-X[.S.f.J o   VX",
-"            w W Q Q q   VXVXVXVXVXVXVX  ; !.fX-X[.S.f.J o   VXVX",
-"      VXVX  R M.m.m.F   VXVXVXVXVXVX  ; /.fX-X[.S.f.J o   VXVXVX",
-"      VXVX  T m.M.m.F   VXVXVXVXVX  ; !.fX-X[.A.f.J o   VXVXVXVX",
-"      VXVX  T m.m.m.F   VXVXVXVX  & b.fX-X].S.f.J o   VXVXVXVXVX",
-"            = A A A =           & v.dX-X].S.f.J o   VXVXVXVXVXVX",
-"  > _.qXeX=.G }.n.}.a u.B.C.^.! j.>X%XG.S.f.J o   VXVXVXVXVXVXVX",
-"  e kXlXzXW.} &X%X&XP h.'.#X>X XaXOXD.A.p.J o   VXVXVXVXVXVXVXVX",
-"  e kXlXzXW.U &X%X%XP h.{.:X|.hXuXZ.N.i.J o   VXVXVXVXVXVXVXVXVX",
-"  e iXiXjXR.U $XoX@XH g.+X;XwXgXXXc.a.K o   VXVXVXVXVXVXVXVXVXVX",
-"  . u u u , O r r r o { T.l.yXXXk.| ~ p o VXVXVXVXVXVXVXVXVXVXVX",
-"  0 xXxXvXQ.[ <X,X<X` Y.1XE.x.s.~ _ ..'   VXVXVXVXVXVXVXVXVXVXVX",
-"  y cXNXNXQ. .<X<X<XK.`.).g ) t  .X.o.[   VXVXVXVXVXVXVXVXVXVXVX",
-"  y NXNXBX3X .<X<X<X@.(.U.+.L.( X.O.J. .  VXVXVXVXVXVXVXVXVXVXVX",
-"  , 3X4X5X*./ I.P.I.s [ J.J.H.s ' [ ] /             VXVXVXVXVXVX",
-"  + Z Z Z d % M m M % 7 9 9 9 X 6 7 7 % X 7 7 7 $   VXVXVXVXVXVX",
-"  0 mXmXMX2XB t.t.t.M 0.r.r.w.% C 0.0.B 6 0.0.q.9   VXVXVXVXVXVX",
-"  0 0X0XmXy.N t.t.t.m 0.e.w.w.% V C 0.N 6 0.C 0.9   VXVXVXVXVXVX",
-"  0 mXmXMX2XN t.t.t.M 0.r.e.w.% C 0.0.B 6 q.0.q.9   VXVXVXVXVXVX",
-"  + &.&.%.f 6 B B B 6 8 m m m X 7 8 8 7 X 8 8 8 %   VXVXVXVXVXVX",
-"  : 4.6.7.#.5 3.3.3.4 j -.c c @ k l l h @ k j j 1   VXVXVXVXVXVX",
-"  3 bXbXnX5.n 7X7X7Xv -.2.1.<.# ;.>.>.x < -.-.-.j . VXVXVXVXVXVX",
-"  3 9XbXnX5.b 7X6X6Xv -.1.<.<.< ;.:.:.x < -.-.-.h . VXVXVXVXVXVX",
-"  3 8X9XbX5.b 9.8.6Xv c 1.<.,.# ;.:.:.z < -.c -.h . VXVXVXVXVXVX",
-"    3 3 3 : . 2 2 2 . @ # # #   @ @ @ .   @ @ @ .   VXVXVXVXVXVX",
-"                                                    VXVXVXVXVXVX"
-};

ubuntu/raring/tdegraphics/debian/icons/tdeiconedit-16.xpm

@@ -0,0 +1,42 @@
+/* XPM */
+static char *tdeiconedit-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 20 1",
+"  c black",
+". c navy",
+"X c #0000C0",
+"o c blue",
+"O c #008000",
+"+ c #00C000",
+"@ c green",
+"# c red",
+"$ c #C05800",
+"% c #808000",
+"& c #FF8000",
+"* c #FFA858",
+"= c #C0C000",
+"- c yellow",
+"; c #FFDCA8",
+": c #C0C0FF",
+"> c #C0FFC0",
+", c #FFC0C0",
+"< c #FFFFC0",
+"1 c None",
+/* pixels */
+"111111111111   1",
+"11111111111 $** ",
+"1111111111 ;*$* ",
+"111111111 ;*&& 1",
+"      11 ;*&& 11",
+" ,,## 11 $&& 111",
+" ,,##       1111",
+" ;;&*&& 11111111",
+" &&&*&&   111111",
+" <<=-==%% 111111",
+" ===-==%%   1111",
+" >>+@++OOOO 1111",
+" +++@++OOOO 1111",
+" ::XoXX.X.. 1111",
+" ::XoXX.X.. 1111",
+"            1111"
+};

ubuntu/raring/tdegraphics/debian/icons/tdeiconedit.xpm

@@ -0,0 +1,280 @@
+/* XPM */
+static char *tdeiconedit[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 242 2",
+"   c #000000",
+".  c #01010B",
+"X  c #000B00",
+"o  c #0C0500",
+"O  c #0D0B00",
+"+  c #090C09",
+"@  c #000013",
+"#  c #00001B",
+"$  c #001400",
+"%  c #001C00",
+"&  c #130C06",
+"*  c #140E0A",
+"=  c #1A0000",
+"-  c #191007",
+";  c #1D140E",
+":  c #101016",
+">  c #1C1611",
+",  c #1B1812",
+"<  c #000023",
+"1  c #000033",
+"2  c #111120",
+"3  c #1A1A23",
+"4  c #1C1A31",
+"5  c #1E1B39",
+"6  c #002400",
+"7  c #002B00",
+"8  c #003400",
+"9  c #003D00",
+"0  c #1B231B",
+"q  c #290000",
+"w  c #2B0909",
+"e  c #221D16",
+"r  c #2A2405",
+"t  c #2F290F",
+"y  c #22221A",
+"u  c #29271D",
+"i  c #2A281E",
+"p  c #3D2900",
+"a  c #3D2A17",
+"s  c #3B3A00",
+"d  c #273328",
+"f  c #2F3D2E",
+"g  c #3D3A2C",
+"h  c #00004B",
+"j  c #000054",
+"k  c #00005A",
+"l  c #000061",
+"z  c #00006E",
+"x  c #000072",
+"c  c #00007C",
+"v  c #2C2C4C",
+"b  c #2D2D56",
+"n  c #2F2F59",
+"m  c #004D00",
+"M  c #005400",
+"N  c #005F00",
+"B  c #006300",
+"V  c #007700",
+"C  c #007D00",
+"Z  c #3C523E",
+"A  c #460000",
+"S  c #480000",
+"D  c #411A00",
+"F  c #580000",
+"G  c #472F17",
+"H  c #4C331C",
+"J  c #552602",
+"K  c #582702",
+"L  c #592802",
+"P  c #52371E",
+"I  c #52381F",
+"U  c #59391C",
+"Y  c #48362C",
+"T  c #670000",
+"R  c #660909",
+"E  c #770000",
+"W  c #750B0B",
+"Q  c #7B0000",
+"!  c #62320F",
+"~  c #663C17",
+"^  c #603E1F",
+"/  c #454200",
+"(  c #484800",
+")  c #49451E",
+"_  c #5A4806",
+"`  c #575705",
+"'  c #565800",
+"]  c #595600",
+"[  c #5B5A00",
+"{  c #484234",
+"}  c #654014",
+"|  c #7A462F",
+" . c #616100",
+".. c #686900",
+"X. c #737500",
+"o. c #777900",
+"O. c #7A7C00",
+"+. c #707012",
+"@. c #7C7C26",
+"#. c #4B4A64",
+"$. c #476045",
+"%. c #486246",
+"&. c #4A6448",
+"*. c #6D6C55",
+"=. c #796A51",
+"-. c #000083",
+";. c #00008B",
+":. c #000094",
+">. c #000099",
+",. c #0000B5",
+"<. c #0000BB",
+"1. c #0000C2",
+"2. c #0000C8",
+"3. c #544C9B",
+"4. c #76759D",
+"5. c #7B7B9F",
+"6. c #7775A0",
+"7. c #7A78A4",
+"8. c #7C7CE5",
+"9. c #7F7FE9",
+"0. c #008400",
+"q. c #008800",
+"w. c #00BC00",
+"e. c #00C400",
+"r. c #00CA00",
+"t. c green",
+"y. c #7D9E7D",
+"u. c #854200",
+"i. c #964403",
+"p. c #9B4704",
+"a. c #8C4C27",
+"s. c #8E553A",
+"d. c #9F6B3C",
+"f. c #A14B03",
+"g. c #A65300",
+"h. c #AE5700",
+"j. c #A86F3C",
+"k. c #9E5E45",
+"l. c #8F675A",
+"z. c #9C6441",
+"x. c #936B58",
+"c. c #AD6D4F",
+"v. c #AC7645",
+"b. c #AC7E4F",
+"n. c #B37F4C",
+"m. c #FF0202",
+"M. c #FF0B0B",
+"N. c #C35C07",
+"B. c #C76300",
+"V. c #CA6516",
+"C. c #C37A32",
+"Z. c #DF7F3B",
+"A. c #E16E00",
+"S. c #E57100",
+"D. c #F57A0F",
+"F. c #FB7F0F",
+"G. c #F97D13",
+"H. c #858300",
+"J. c #8A8500",
+"K. c #898932",
+"L. c #9FA001",
+"P. c #B5AE00",
+"I. c #BAB400",
+"U. c #ACAC3E",
+"Y. c #909040",
+"T. c #898372",
+"R. c #948163",
+"E. c #9F8567",
+"W. c #9E8B6B",
+"Q. c #9C9C7C",
+"!. c #AA835E",
+"~. c #BD8043",
+"^. c #BE8D5D",
+"/. c #AF8660",
+"(. c #AAAA5C",
+"). c #AEAC77",
+"_. c #BFA57E",
+"`. c #B2B379",
+"'. c #FF8500",
+"]. c #FE8612",
+"[. c #FF8B12",
+"{. c #FF9C34",
+"}. c #C38445",
+"|. c #CC8863",
+" X c #C09273",
+".X c #D6997A",
+"XX c #D89D7D",
+"oX c #ED9C52",
+"OX c #F59241",
+"+X c #FA9D41",
+"@X c #F89C50",
+"#X c #FFA344",
+"$X c #F5A154",
+"%X c #FDAB5B",
+"&X c #FFB05C",
+"*X c #E3B07F",
+"=X c #FBAE60",
+"-X c #FEB362",
+";X c #F5B67A",
+":X c #FDB874",
+">X c #FCBD7D",
+",X c #F5F500",
+"<X c #FEFE00",
+"1X c #D6D67B",
+"2X c #819E81",
+"3X c #ADAB81",
+"4X c #B0AE83",
+"5X c #B4B386",
+"6X c #8181ED",
+"7X c #8484F3",
+"8X c #B9B9F6",
+"9X c #BCBCFA",
+"0X c #BCFABC",
+"qX c #C3A880",
+"wX c #CCA086",
+"eX c #C8AC83",
+"rX c #D3A182",
+"tX c #DCAE8D",
+"yX c #D8BBAB",
+"uX c #F4BD8E",
+"iX c #EBCB9B",
+"pX c #FFCF8F",
+"aX c #F3C094",
+"sX c #F6C09A",
+"dX c #FCCE91",
+"fX c #FED49B",
+"gX c #F1CCB6",
+"hX c #F1CEBB",
+"jX c #F3D2A0",
+"kX c #FADAA6",
+"lX c #FFDDA9",
+"zX c #FFE3AD",
+"xX c #F0F0B5",
+"cX c #F5F5B8",
+"vX c #FBFBBC",
+"bX c #C2C2FE",
+"nX c #C9C9FF",
+"mX c #C4FDC4",
+"MX c #CBFFCB",
+"NX c #FDFDC2",
+"BX c #FFFFC8",
+"VX c None",
+/* pixels */
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX        VXVX",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  & , > o   VX",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  & d.*XtXY     ",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  - v.>X@XuXrX>   ",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  ; b.dX=XG.V.z.*   ",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  ; !.fX-X].S.f.D o   ",
+"                        VXVXVXVXVXVXVXVX  ; !.fX-X[.S.f.J o   VX",
+"            w W Q Q q   VXVXVXVXVXVXVX  ; !.fX-X[.S.f.J o   VXVX",
+"      VXVX  R M.m.m.F   VXVXVXVXVXVX  ; /.fX-X[.S.f.J o   VXVXVX",
+"      VXVX  T m.M.m.F   VXVXVXVXVX  ; !.fX-X[.A.f.J o   VXVXVXVX",
+"      VXVX  T m.m.m.F   VXVXVXVX  & b.fX-X].S.f.J o   VXVXVXVXVX",
+"            = A A A =           & v.dX-X].S.f.J o   VXVXVXVXVXVX",
+"  > _.qXeX=.G }.n.}.a u.B.C.^.! j.>X%XG.S.f.J o   VXVXVXVXVXVXVX",
+"  e kXlXzXW.} &X%X&XP h.'.#X>X XaXOXD.A.p.J o   VXVXVXVXVXVXVXVX",
+"  e kXlXzXW.U &X%X%XP h.{.:X|.hXuXZ.N.i.J o   VXVXVXVXVXVXVXVXVX",
+"  e iXiXjXR.U $XoX@XH g.+X;XwXgXXXc.a.K o   VXVXVXVXVXVXVXVXVXVX",
+"  . u u u , O r r r o { T.l.yXXXk.| ~ p o VXVXVXVXVXVXVXVXVXVXVX",
+"  0 xXxXvXQ.[ <X,X<X` Y.1XE.x.s.~ _ ..'   VXVXVXVXVXVXVXVXVXVXVX",
+"  y cXNXNXQ. .<X<X<XK.`.).g ) t  .X.o.[   VXVXVXVXVXVXVXVXVXVXVX",
+"  y NXNXBX3X .<X<X<X@.(.U.+.L.( X.O.J. .  VXVXVXVXVXVXVXVXVXVXVX",
+"  , 3X4X5X*./ I.P.I.s [ J.J.H.s ' [ ] /             VXVXVXVXVXVX",
+"  + Z Z Z d % M m M % 7 9 9 9 X 6 7 7 % X 7 7 7 $   VXVXVXVXVXVX",
+"  0 mXmXMX2XB t.t.t.M 0.r.r.w.% C 0.0.B 6 0.0.q.9   VXVXVXVXVXVX",
+"  0 0X0XmXy.N t.t.t.m 0.e.w.w.% V C 0.N 6 0.C 0.9   VXVXVXVXVXVX",
+"  0 mXmXMX2XN t.t.t.M 0.r.e.w.% C 0.0.B 6 q.0.q.9   VXVXVXVXVXVX",
+"  + &.&.%.f 6 B B B 6 8 m m m X 7 8 8 7 X 8 8 8 %   VXVXVXVXVXVX",
+"  : 4.6.7.#.5 3.3.3.4 j -.c c @ k l l h @ k j j 1   VXVXVXVXVXVX",
+"  3 bXbXnX5.n 7X7X7Xv -.2.1.<.# ;.>.>.x < -.-.-.j . VXVXVXVXVXVX",
+"  3 9XbXnX5.b 7X6X6Xv -.1.<.<.< ;.:.:.x < -.-.-.h . VXVXVXVXVXVX",
+"  3 8X9XbX5.b 9.8.6Xv c 1.<.,.# ;.:.:.z < -.c -.h . VXVXVXVXVXVX",
+"    3 3 3 : . 2 2 2 . @ # # #   @ @ @ .   @ @ @ .   VXVXVXVXVXVX",
+"                                                    VXVXVXVXVXVX"
+};

ubuntu/raring/tdegraphics/debian/kcoloredit-trinity.menu

@@ -1,4 +1,4 @@
-?package(kcoloredit):\
+?package(kcoloredit-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\
@@ -7,7 +7,7 @@
 	icon16x16="/opt/trinity/share/pixmaps/kcolorchooser-16.xpm"\
 	command="/opt/trinity/bin/kcolorchooser"
 
-?package(kcoloredit):\
+?package(kcoloredit-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

ubuntu/raring/tdegraphics/debian/kdvi-trinity.menu

@@ -1,4 +1,4 @@
-?package(kdvi):\
+?package(kdvi-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,DVI,Documents"\

ubuntu/raring/tdegraphics/debian/kfax-trinity.menu

@@ -1,4 +1,4 @@
-?package(kfax):\
+?package(kfax-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

ubuntu/raring/tdegraphics/debian/kfaxview-trinity.menu

@@ -1,4 +1,4 @@
-?package(kfaxview):\
+?package(kfaxview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

ubuntu/raring/tdegraphics/debian/kghostview-trinity.menu

@@ -1,4 +1,4 @@
-?package(kghostview):\
+?package(kghostview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,Documents"\

ubuntu/raring/tdegraphics/debian/kiconedit-trinity.install

@@ -1,41 +0,0 @@
-debian/tmp/opt/trinity/bin/kiconedit
-debian/tmp/opt/trinity/share/applications/tde/kiconedit.desktop
-debian/tmp/opt/trinity/share/apps/kiconedit/kiconeditui.rc
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/aim-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/aim.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/airbrush-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/areaselect.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/circle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/colorpicker-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/compressed.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/ellipse.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/eraser-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/fileclose.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/fill-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledcircle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledellipse.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/filledrectangle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/grayscale.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/grid.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/kdepalette.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/line.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/paintbrush-cursor.xpm
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/pointer.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/rectangle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/selectcircle.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/selectrect.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/source.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/standard.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/transform.png
-debian/tmp/opt/trinity/share/apps/kiconedit/pics/window_new.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kiconedit/kiconedit-configuration.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kiconedit.png
-debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kiconedit.png
-
-debian/icons/kiconedit.xpm		/opt/trinity/share/pixmaps
-debian/icons/kiconedit-16.xpm		/opt/trinity/share/pixmaps

ubuntu/raring/tdegraphics/debian/kiconedit-trinity.manpages

@@ -1 +0,0 @@
-debian/man/kiconedit.1

ubuntu/raring/tdegraphics/debian/kiconedit-trinity.menu

@@ -1,11 +0,0 @@
-?package(kiconedit):\
-	needs="X11"\
-	section="Applications/Graphics"\
-	hints="TDE"\
-	title="TDEIconEdit"\
-	icon32x32="/opt/trinity/share/pixmaps/kiconedit.xpm"\
-	icon16x16="/opt/trinity/share/pixmaps/kiconedit-16.xpm"\
-	command="/opt/trinity/bin/kiconedit"
-
-# Icon 32x32 kiconedit/pics/cr32-app-kiconedit.png kiconedit.xpm
-# Icon 16x16 kiconedit/pics/cr16-app-kiconedit.png kiconedit-16.xpm

ubuntu/raring/tdegraphics/debian/kolourpaint-trinity.menu

@@ -1,4 +1,4 @@
-?package(kolourpaint):\
+?package(kolourpaint-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

ubuntu/raring/tdegraphics/debian/kooka-trinity.menu

@@ -1,4 +1,4 @@
-?package(kooka):\
+?package(kooka-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

ubuntu/raring/tdegraphics/debian/kpdf-trinity.menu

@@ -1,4 +1,4 @@
-?package(kpdf):\
+?package(kpdf-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

ubuntu/raring/tdegraphics/debian/kpovmodeler-trinity.menu

@@ -1,4 +1,4 @@
-?package(kpovmodeler):\
+?package(kpovmodeler-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE,Modeler"\

ubuntu/raring/tdegraphics/debian/kruler-trinity.menu

@@ -1,4 +1,4 @@
-?package(kruler):\
+?package(kruler-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

ubuntu/raring/tdegraphics/debian/ksnapshot-trinity.menu

@@ -1,4 +1,4 @@
-?package(ksnapshot):\
+?package(ksnapshot-trinity):\
 	needs="X11"\
 	section="Applications/Graphics"\
 	hints="TDE"\

ubuntu/raring/tdegraphics/debian/kuickshow-trinity.menu

@@ -1,4 +1,4 @@
-?package(kuickshow):\
+?package(kuickshow-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE"\

ubuntu/raring/tdegraphics/debian/kview-trinity.menu

@@ -1,4 +1,4 @@
-?package(kview):\
+?package(kview-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	hints="TDE,Images"\

ubuntu/raring/tdegraphics/debian/man/kiconedit.1

@@ -1,89 +0,0 @@
-.TH KICONEDIT "1" "September 2002" KDE "KDE Application"
-.SH NAME
-kiconedit \- KDE Icon Editor
-.SH SYNOPSIS
-.B kiconedit
-[\fIQt-options\fR] [\fIKDE-options\fR] [\fIfile(s)\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B TDEIconEdit
-KDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B TDEIconEdit
-is designed to help create icons for KDE using the standard
-icon palette.  
-.PP
-KDE Icon Editor
-.SH AUTHOR
-TDEIconEdit was written by
-.nh
-Thomas Tanghus <tanghus@kde.org>,
-John Califf <jcaliff@compuzone.net>,
-Laurent Montel <lmontel@mandrakesoft.com> and
-Aaron J. Seigo <aseigo@olympusproject.org>.
-.hy
-.br
-Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-kde\fR
-Show KDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-file(s)
-Icon file(s) to open
-.SH "SEE ALSO"
-The full documentation for
-.B TDEIconEdit
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kiconedit
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-TDEIconEdit was written by
-.nh
-Thomas Tanghus <tanghus@kde.org>,
-John Califf <jcaliff@compuzone.net>,
-Laurent Montel <lmontel@mandrakesoft.com>
-and Aaron J. Seigo <aseigo@olympusproject.org>.
-.hy
-.br
-Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).

ubuntu/raring/tdegraphics/debian/man/tdeiconedit.1

@@ -0,0 +1,89 @@
+.TH TDEICONEDIT "1" "September 2002" TDE "TDE Application"
+.SH NAME
+tdeiconedit \- TDE Icon Editor
+.SH SYNOPSIS
+.B tdeiconedit
+[\fIQt-options\fR] [\fIKDE-options\fR] [\fIfile(s)\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B TDEIconEdit
+TDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.P
+.B TDEIconEdit
+is designed to help create icons for TDE using the standard
+icon palette.  
+.PP
+TDE Icon Editor
+.SH AUTHOR
+TDEIconEdit was written by
+.nh
+Thomas Tanghus <tanghus@kde.org>,
+John Califf <jcaliff@compuzone.net>,
+Laurent Montel <lmontel@mandrakesoft.com> and
+Aaron J. Seigo <aseigo@olympusproject.org>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-tde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SS "Arguments:"
+.TP
+file(s)
+Icon file(s) to open
+.SH "SEE ALSO"
+The full documentation for
+.B TDEIconEdit
+is maintained as a docbook manual.  If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/tdeiconedit
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+TDEIconEdit was written by
+.nh
+Thomas Tanghus <tanghus@kde.org>,
+John Califf <jcaliff@compuzone.net>,
+Laurent Montel <lmontel@mandrakesoft.com>
+and Aaron J. Seigo <aseigo@olympusproject.org>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).

ubuntu/raring/tdegraphics/debian/rules

@@ -14,9 +14,21 @@ include /usr/share/cdbs/1/class/cmake.mk
 #include /usr/share/cdbs/1/rules/patchsys-quilt.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" \
--DCMAKE_BUILD_TYPE=RelWithDebInfo
+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/" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DBUILD_ALL="ON" \
+ -DWITH_TIFF="ON" \
+ -DWITH_OPENEXR="ON" \
+ -DWITH_PDF="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
@@ -57,81 +69,49 @@ kuickshow-trinity-tar:
 	cd ..; tar zcf kuickshow-trinity_3.5.8.orig.tar.gz kuickshow-trinity-3.5.8
 
 binary-post-install/kpdf-trinity::
-	#cp -Rp debian/kpdf-trinity/usr/* debian/kpdf-trinity/opt/trinity/
-	#rm -rf debian/kpdf-trinity/usr/
 	mv debian/kpdf-trinity/usr/share/man debian/kpdf-trinity/opt/trinity/share/
 
 binary-post-install/kghostview-trinity::
-	#cp -Rp debian/kghostview-trinity/usr/* debian/kghostview-trinity/opt/trinity/
-	#rm -rf debian/kghostview-trinity/usr/
 	mv debian/kghostview-trinity/usr/share/man debian/kghostview-trinity/opt/trinity/share/
 
 binary-post-install/kcolorchooser-trinity::
-	#cp -Rp debian/kcolorchooser-trinity/usr/* debian/kcolorchooser-trinity/opt/trinity/
-	#rm -rf debian/kcolorchooser-trinity/usr/
 	mv debian/kcolorchooser-trinity/usr/share/man debian/kcolorchooser-trinity/opt/trinity/share/
 
 binary-post-install/kdvi-trinity::
-	#cp -Rp debian/kdvi-trinity/usr/* debian/kdvi-trinity/opt/trinity/
-	#rm -rf debian/kdvi-trinity/usr/
 	mv debian/kdvi-trinity/usr/share/man debian/kdvi-trinity/opt/trinity/share/
 
 binary-post-install/kfaxview-trinity::
-	#cp -Rp debian/kfaxview-trinity/usr/* debian/kfaxview-trinity/opt/trinity/
-	#rm -rf debian/kfaxview-trinity/usr/	
 	mv debian/kfaxview-trinity/usr/share/man debian/kfaxview-trinity/opt/trinity/share/
 
-binary-post-install/kiconedit-trinity::
-	#cp -Rp debian/kiconedit-trinity/usr/* debian/kiconedit-trinity/opt/trinity/
-	#rm -rf debian/kiconedit-trinity/usr/	
-	mv debian/kiconedit-trinity/usr/share/man debian/kiconedit-trinity/opt/trinity/share/
+binary-post-install/tdeiconedit-trinity::
+	mv debian/tdeiconedit-trinity/usr/share/man debian/tdeiconedit-trinity/opt/trinity/share/
 
 binary-post-install/kooka-trinity::
-	#cp -Rp debian/kooka-trinity/usr/* debian/kooka-trinity/opt/trinity/
-	#rm -rf debian/kooka-trinity/usr/
 	mv debian/kooka-trinity/usr/share/man debian/kooka-trinity/opt/trinity/share/
 
 binary-post-install/kpovmodeler-trinity::
-	#cp -Rp debian/kpovmodeler-trinity/usr/* debian/kpovmodeler-trinity/opt/trinity/
-	#rm -rf debian/kpovmodeler-trinity/usr/
 	mv debian/kpovmodeler-trinity/usr/share/man debian/kpovmodeler-trinity/opt/trinity/share/
 
 binary-post-install/ksnapshot-trinity::
-	#cp -Rp debian/ksnapshot-trinity/usr/* debian/ksnapshot-trinity/opt/trinity/
-	#rm -rf debian/ksnapshot-trinity/usr/
 	mv debian/ksnapshot-trinity/usr/share/man debian/ksnapshot-trinity/opt/trinity/share/
 
 binary-post-install/kview-trinity::
-	#cp -Rp debian/kview-trinity/usr/* debian/kview-trinity/opt/trinity/
-	#rm -rf debian/kview-trinity/usr/
 	mv debian/kview-trinity/usr/share/man debian/kview-trinity/opt/trinity/share/
 
 binary-post-install/kcoloredit-trinity::
-	#cp -Rp debian/kcoloredit-trinity/usr/* debian/kcoloredit-trinity/opt/trinity/
-	#rm -rf debian/kcoloredit-trinity/usr/
 	mv debian/kcoloredit-trinity/usr/share/man debian/kcoloredit-trinity/opt/trinity/share/
 
 binary-post-install/kfax-trinity::
-	#cp -Rp debian/kfax-trinity/usr/* debian/kfax-trinity/opt/trinity/
-	#rm -rf debian/kfax-trinity/usr/
 	mv debian/kfax-trinity/usr/share/man debian/kfax-trinity/opt/trinity/share/
 
 binary-post-install/kolourpaint-trinity::
-	#cp -Rp debian/kolourpaint-trinity/usr/* debian/kolourpaint-trinity/opt/trinity/
-	#rm -rf debian/kolourpaint-trinity/usr/
 	mv debian/kolourpaint-trinity/usr/share/man debian/kolourpaint-trinity/opt/trinity/share/
 
 binary-post-install/kruler-trinity::
-	#cp -Rp debian/kruler-trinity/usr/* debian/kruler-trinity/opt/trinity/
-	#rm -rf debian/kruler-trinity/usr/
 	mv debian/kruler-trinity/usr/share/man debian/kruler-trinity/opt/trinity/share/
 
 binary-post-install/kuickshow-trinity::
-	#cp -Rp debian/kuickshow-trinity/usr/* debian/kuickshow-trinity/opt/trinity/
-	#rm -rf debian/kuickshow-trinity/usr/
 	mv debian/kuickshow-trinity/usr/share/man debian/kuickshow-trinity/opt/trinity/share/
 
 binary-post-install/kviewshell-trinity::
-	#cp -Rp debian/kviewshell-trinity/usr/* debian/kviewshell-trinity/opt/trinity/
-	#rm -rf debian/kviewshell-trinity/usr/
 	mv debian/kviewshell-trinity/usr/share/man debian/kviewshell-trinity/opt/trinity/share/

ubuntu/raring/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera

@@ -5,6 +5,6 @@ Abstract: Kamera allows you to view and download images on a digital camera.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kamera/index.html
-Files: /usr/share/doc/tde/HTML/en/kamera/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kamera/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kamera/*.html
 

ubuntu/raring/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit

@@ -6,6 +6,6 @@ Abstract: KColorEdit is a palette files editor. It can be used for editing
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kcoloredit/index.html
-Files: /usr/share/doc/tde/HTML/en/kcoloredit/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kcoloredit/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kcoloredit/*.html
 

ubuntu/raring/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi

@@ -5,6 +5,6 @@ Abstract: This program and KPart allow the user to display *.DVI files from TeX.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kdvi/index.html
-Files: /usr/share/doc/tde/HTML/en/kdvi/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kdvi/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kdvi/*.html
 

ubuntu/raring/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma

@@ -5,6 +5,6 @@ Abstract: KGamma is a simple tool for monitor gamma correction.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kgamma/index.html
-Files: /usr/share/doc/tde/HTML/en/kgamma/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kgamma/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kgamma/*.html
 

ubuntu/raring/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview

@@ -6,6 +6,6 @@ Abstract: KGhostView displays and prints PostScript and
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kghostview/index.html
-Files: /usr/share/doc/tde/HTML/en/kghostview/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kghostview/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kghostview/*.html
 

ubuntu/raring/tdegraphics/debian/tdegraphics-doc-html.doc-base.kiconedit

@@ -1,11 +0,0 @@
-Document: tdegraphics-doc-html-kiconedit
-Title: TDEIconEdit Handbook
-Author: Thomas Tanghus, Lauri Watts
-Abstract: TDEIconEdit is designed to help create icons for KDE using the
- standard icon palette.
-Section: Apps/Graphics
-
-Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kiconedit/index.html
-Files: /usr/share/doc/tde/HTML/en/kiconedit/*.html
-

ubuntu/raring/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint

@@ -5,6 +5,6 @@ Abstract: KolourPaint is a free, easy-to-use paint program for KDE.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kolourpaint/index.html
-Files: /usr/share/doc/tde/HTML/en/kolourpaint/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kolourpaint/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kolourpaint/*.html
 

ubuntu/raring/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka

@@ -5,6 +5,6 @@ Abstract: Kooka is a very useful KDE scanning application.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kooka/index.html
-Files: /usr/share/doc/tde/HTML/en/kooka/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kooka/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kooka/*.html
 

ubuntu/raring/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf

@@ -5,6 +5,6 @@ Abstract: KPDF is a KDE PDF viewer based on xpdf code.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpdf/index.html
-Files: /usr/share/doc/tde/HTML/en/kpdf/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpdf/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpdf/*.html
 

ubuntu/raring/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler

@@ -6,6 +6,6 @@ Abstract: KPovModeler is a graphical 3D modeler, which can generate
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kpovmodeler/index.html
-Files: /usr/share/doc/tde/HTML/en/kpovmodeler/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kpovmodeler/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kpovmodeler/*.html
 

ubuntu/raring/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler

@@ -5,6 +5,6 @@ Abstract: KRuler can be used to measure objects on the screen.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kruler/index.html
-Files: /usr/share/doc/tde/HTML/en/kruler/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kruler/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kruler/*.html
 

ubuntu/raring/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot

@@ -5,6 +5,6 @@ Abstract: KSnapshot is a simple applet for taking screenshots.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/ksnapshot/index.html
-Files: /usr/share/doc/tde/HTML/en/ksnapshot/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/ksnapshot/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/ksnapshot/*.html
 

ubuntu/raring/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow

@@ -5,6 +5,6 @@ Abstract: KuickShow is a comfortable image browser/viewer.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kuickshow/index.html
-Files: /usr/share/doc/tde/HTML/en/kuickshow/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kuickshow/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kuickshow/*.html
 

ubuntu/raring/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview

@@ -5,6 +5,6 @@ Abstract: KView is an image viewing program.
 Section: Apps/Graphics
 
 Format: HTML
-Index: /usr/share/doc/tde/HTML/en/kview/index.html
-Files: /usr/share/doc/tde/HTML/en/kview/*.html
+Index: /opt/trinity/share/doc/tde/HTML/en/kview/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kview/*.html
 

ubuntu/raring/tdegraphics/debian/tdegraphics-doc-html.doc-base.tdeiconedit

@@ -0,0 +1,11 @@
+Document: tdegraphics-doc-html-tdeiconedit
+Title: TDEIconEdit Handbook
+Author: Thomas Tanghus, Lauri Watts
+Abstract: TDEIconEdit is designed to help create icons for KDE using the
+ standard icon palette.
+Section: Apps/Graphics
+
+Format: HTML
+Index: /opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/tdeiconedit/*.html
+

ubuntu/raring/tdegraphics/debian/tdeiconedit-trinity.install

@@ -0,0 +1,41 @@
+debian/tmp/opt/trinity/bin/tdeiconedit
+debian/tmp/opt/trinity/share/applications/tde/tdeiconedit.desktop
+debian/tmp/opt/trinity/share/apps/tdeiconedit/tdeiconeditui.rc
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/aim-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/aim.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/airbrush-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/areaselect.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/circle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/colorpicker-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/compressed.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/ellipse.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/eraser-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/fileclose.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/fill-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledcircle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledellipse.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/filledrectangle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/grayscale.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/grid.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/kdepalette.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/line.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/paintbrush-cursor.xpm
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/pointer.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/rectangle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/selectcircle.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/selectrect.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/source.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/standard.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/transform.png
+debian/tmp/opt/trinity/share/apps/tdeiconedit/pics/window_new.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeiconedit/tdeiconedit-configuration.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdeiconedit.png
+
+debian/icons/tdeiconedit.xpm		/opt/trinity/share/pixmaps
+debian/icons/tdeiconedit-16.xpm		/opt/trinity/share/pixmaps

ubuntu/raring/tdegraphics/debian/tdeiconedit-trinity.manpages

@@ -0,0 +1 @@
+debian/man/tdeiconedit.1

ubuntu/raring/tdegraphics/debian/tdeiconedit-trinity.menu

@@ -0,0 +1,11 @@
+?package(tdeiconedit-trinity):\
+	needs="X11"\
+	section="Applications/Graphics"\
+	hints="TDE"\
+	title="TDEIconEdit"\
+	icon32x32="/opt/trinity/share/pixmaps/tdeiconedit.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/tdeiconedit-16.xpm"\
+	command="/opt/trinity/bin/tdeiconedit"
+
+# Icon 32x32 tdeiconedit/pics/cr32-app-tdeiconedit.png tdeiconedit.xpm
+# Icon 16x16 tdeiconedit/pics/cr16-app-tdeiconedit.png tdeiconedit-16.xpm

ubuntu/raring/tdevelop/debian/control

@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebas
 Replaces: kdevelop-kde3 (<< 4:14.0.0~), kdevelop-trinity (<< 4:14.0.0~)
 Breaks: kdevelop-kde3 (<< 4:14.0.0~), kdevelop-trinity (<< 4:14.0.0~)
 Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
-Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, kiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
+Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
 Description: An IDE for Unix/X11
  KDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features