summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-04-28 12:46:53 +0200
committerFrancois Andriot <francois.andriot@free.fr>2012-04-28 12:46:53 +0200
commit9016533d378890aeefb6e8e27a8aafab5b1011d3 (patch)
tree2fef4d2be93405380bb5537cd118f927e398911a /ubuntu
parentbd0db9f63504d679c55f4b2700d45a809530c7d7 (diff)
parenteff3fa7ee77d8b4f288b794fa3cf11c710494d85 (diff)
downloadtde-packaging-9016533d378890aeefb6e8e27a8aafab5b1011d3.tar.gz
tde-packaging-9016533d378890aeefb6e8e27a8aafab5b1011d3.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu')
-rwxr-xr-xubuntu/maverick/applications/kvirc/debian/rules1
-rw-r--r--ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install12
2 files changed, 13 insertions, 0 deletions
diff --git a/ubuntu/maverick/applications/kvirc/debian/rules b/ubuntu/maverick/applications/kvirc/debian/rules
index bd103aecd..2ed9f4000 100755
--- a/ubuntu/maverick/applications/kvirc/debian/rules
+++ b/ubuntu/maverick/applications/kvirc/debian/rules
@@ -82,6 +82,7 @@ common-install-indep::
mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/icons $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/hicolor
mkdir -p $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/icons
mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/hicolor $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/icons/
+ mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/kvirc $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/lib/
post-patches:: debian/stamp-bootstrap
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
index fd084886c..b13eb6275 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
@@ -1853,6 +1853,8 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/smart_media_unmoun
debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/system.png
debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/usbpendrive_mount.png
debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/usbpendrive_unmount.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/tape_mount.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/devices/tape_unmount.png
debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/desktop.png
debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/exec.png
debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/filesystems/file_broken.png
@@ -2267,6 +2269,8 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/tablet.png
debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/tv.png
debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/usbpendrive_mount.png
debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/usbpendrive_unmount.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/tape_mount.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/tape_unmount.png
debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/zip_mount.png
debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/zip_unmount.png
debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/filesystems/desktop.png
@@ -2655,6 +2659,8 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/smart_media_unmount.
debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/system.png
debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/usbpendrive_mount.png
debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/usbpendrive_unmount.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/tape_mount.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/tape_unmount.png
debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/desktop.png
debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/folder_green_open.png
debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/filesystems/folder_green.png
@@ -3006,6 +3012,8 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/tablet.png
debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/tv.png
debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/usbpendrive_mount.png
debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/usbpendrive_unmount.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/tape_mount.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/tape_unmount.png
debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/zip_mount.png
debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/zip_unmount.png
debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/filesystems/desktop.png
@@ -3228,6 +3236,8 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/tablet.png
debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/tv.png
debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/usbpendrive_mount.png
debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/usbpendrive_unmount.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/tape_mount.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/tape_unmount.png
debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/zip_mount.png
debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/zip_unmount.png
debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/filesystems/desktop.png
@@ -3416,6 +3426,8 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/tablet.png
debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/tv.png
debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/usbpendrive_mount.png
debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/usbpendrive_unmount.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/tape_mount.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/tape_unmount.png
debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/zip_mount.png
debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/zip_unmount.png
debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/filesystems/desktop.png