summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/defaultsettings/redmond-default-settings-ii
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-04-01 22:18:18 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-04-01 22:18:18 -0500
commit09faf92fbfa23a03fb6b723533a1aebf1a1a705d (patch)
tree18173ca496fd4347dc292adbc4343c915a79bf9a /ubuntu/maverick/defaultsettings/redmond-default-settings-ii
parent5e707183285c803bf1a4e0281ad05f90544cf2bd (diff)
downloadtde-packaging-09faf92fbfa23a03fb6b723533a1aebf1a1a705d.tar.gz
tde-packaging-09faf92fbfa23a03fb6b723533a1aebf1a1a705d.zip
Remove HAL dependency from metapackages and default settings
Diffstat (limited to 'ubuntu/maverick/defaultsettings/redmond-default-settings-ii')
-rw-r--r--ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile2
-rw-r--r--ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control2
-rw-r--r--ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postinst10
-rw-r--r--ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm4
4 files changed, 3 insertions, 15 deletions
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile
index 53421bde5..63142dc6b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile
@@ -298,7 +298,7 @@ install:
install -m644 gtk-qt-engine-rc-files/gtkrc-2.0-kde4 "$(SETTINGS_DIR)/.gtkrc-2.0-kde4"
install -m644 gtk-qt-engine-rc-files/gtk_qt_engine_rc "$(SETTINGS_DIR)/.gtk_qt_engine_rc"
install -m644 gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh "$(SETTINGS_DIR)/gtk-qt-engine.rc.sh"
- install -m644 hal/hal-policy-ntfs-config-write-policy.fdi "$(SETTINGS_DIR)/hal-policy-ntfs-config-write-policy.fdi"
+# install -m644 hal/hal-policy-ntfs-config-write-policy.fdi "$(SETTINGS_DIR)/hal-policy-ntfs-config-write-policy.fdi"
mkdir -p "$(DESTDIR)/etc/skel"
install -m644 gtk-qt-engine-rc-files/gtkrc-2.0-kde4 "$(DESTDIR)/etc/skel/.gtkrc-2.0-kde4"
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control
index e3c3cb81c..0055d4983 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.8.4
Package: redmond-default-settings-ii-trinity
Architecture: all
-Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, hal, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity
+Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, kdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, ttf-bitstream-vera, ttf-dejavu-core, ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity
Recommends: firefox, thunderbird, synaptic, tdeio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, ttf-arabeyes, ttf-arphic-ukai, ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic,ttf-kochi-mincho, ttf-lao, ttf-malayalam-fonts, ttf-thai-tlwg, ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, x-ttcidfont-conf
Suggests: apport-gtk, hplip-gui
Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postinst b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postinst
index fc0689446..0c9f3e433 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postinst
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postinst
@@ -26,21 +26,13 @@ case "$1" in
ln -s /etc/redmond-default-settings-trinity/directory-media /media/.directory || \
echo "Could not create symlink /media/.directory, skipping."
fi
- fi
+ fi
if [ -d /home ]; then
if [ ! -e /home/.directory ]; then
ln -s /etc/redmond-default-settings-trinity/directory-home /home/.directory || \
echo "Could not create symlink /home/.directory, skipping."
fi
fi
-
- if [ -f /usr/share/redmond-default-settings-trinity/hal-policy-ntfs-config-write-policy.fdi ]; then
- if [ -d /usr/share/hal/fdi/policy/10osvendor ]; then
- ln -sf /usr/share/redmond-default-settings-trinity/hal-policy-ntfs-config-write-policy.fdi \
- /usr/share/hal/fdi/policy/10osvendor/20-ntfs-config-write-policy.fdi || \
- echo "Could not create symlink /usr/share/hal/fdi/policy/10osvendor/20-ntfs-config-write-policy.fdi, skipping."
- fi
- fi
;;
esac
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm
index 3727a65c1..2cbdac854 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm
@@ -23,10 +23,6 @@ case "$1" in
rm /media/.hidden || \
echo "Could not remove symlink /media/.hidden, skipping."
fi
- if [ -h /usr/share/hal/fdi/policy/10osvendor/home/20-ntfs-config-write-policy.fdi ]; then
- rm /usr/share/hal/fdi/policy/10osvendor/home/20-ntfs-config-write-policy.fdi || \
- echo "Could not remove symlink /usr/share/hal/fdi/policy/10osvendor/home/20-ntfs-config-write-policy.fdi, skipping."
- fi
;;
upgrade)