Slávek Banko
fbc56dc936
DEB tdesdk: Move tdeartwork-theme-icon-trinity from Conflicts to Breaks
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 6a6adc42e1
)
8 years ago
Slávek Banko
6900db68ba
DEB tdeaddons: Move tdeartwork-theme-icon-trinity from Conflicts to Breaks
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 392da19b27
)
8 years ago
Slávek Banko
4750e56554
DEB tdemultimedia: switch to cmake
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 2e4da17243
)
8 years ago
Slávek Banko
3e16a489c5
DEB tdebase: Remove full path for update-alternatives
...
This resolves bug 2756
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d4958ff4b0
)
8 years ago
Slávek Banko
b8274a9c0d
DEB tdesdk: Allow the installation of kbabel locolor icons
...
This relates to bug 1282
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d3c95593ce
)
8 years ago
Slávek Banko
f1534ff8f8
DEB tdeaddons: Allow the installation of ktimemon locolor icons
...
This relates to bug 1282
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 79f303990e
)
8 years ago
Slávek Banko
1f54f40d28
DEB tdeartwork: Remove kbabel and kicker-applets from Conflicts
...
This relates to bug 1282
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 7b599145e9
)
8 years ago
Michele Calgaro
6a4d740eea
DEB tdepim: fixed FTBFS caused by suggested but missing kpilot plugin.
...
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 5c78a78f2b
)
8 years ago
Slávek Banko
67f42b5fc6
DEB tde-guidance: Add variant dependency systemd-sysv
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit bfd1d00e83
)
8 years ago
Slávek Banko
a7751a4f74
DEB ktorrent: Add variant dependency php-cli
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 8f7a0371c7
)
8 years ago
Slávek Banko
9d0c5ba526
DEB tdesdk: Add variant dependency php-cli for tdecachegrind-converters
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e41f766ba2
)
8 years ago
Slávek Banko
ddfad94bab
DEB kvpnc: Add variant dependency kmod
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 9a4a57bbe4
)
8 years ago
Slávek Banko
81f8e0af15
DEB tdeaddons: Rename libmime-perl dependency in knewsticker-scripts to libmime-tools-perl
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 17af32979f
)
8 years ago
Slávek Banko
750c1ede7d
DEB tdeaddons: Add variant dependency libjpeg-turbo-progs for konq-plugins
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 864f073b7c
)
8 years ago
Slávek Banko
a2ca768733
DEB: Add variant dependency default-libmysqlclient-dev
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 35591cc43a
)
8 years ago
Slávek Banko
b5e1cbc81a
DEB tellico: Enable tests
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit bdac14e09b
)
8 years ago
Michele Calgaro
b6fc5aa5d9
DEB kpilot: Fix FTBFS on Stretch
...
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 13d30c65ad
)
8 years ago
Slávek Banko
20e1b5fbb4
DEB tdelibs: Update rule for tests
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 69a33ddab4
)
8 years ago
Slávek Banko
9636738f7d
DEB tdelibs: Add x11-xserver-utils to build-deps
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit dc46a1cdca
)
8 years ago
Slávek Banko
d772b5160d
DEB tdelibs: Enable tests
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 638a1274e2
)
8 years ago
Michele Calgaro
6b3af956b1
DEB tdesdk: Fix FTBFS on Stretch
...
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit b41b7bfead
)
8 years ago
Slávek Banko
96718e2329
DEB: Enable build kpowersave and tdepowersave with GCC hidden visibility
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 3af924cdcf
)
8 years ago
Slávek Banko
dd113b54ae
DEB: Replaced ${Source-Version} with ${source:Version}
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit fc7541998a
)
8 years ago
Slávek Banko
a09f115573
DEB bibletime: Test for __SANE_USERSPACE_TYPES__ is no longer needed in rules
...
This reverts commit 502a4e3964
.
(cherry picked from commit d37d6b22b4
)
8 years ago
Michele Calgaro
c42da7b04b
tdelibs: fixed missing dependency in debian/ubuntu.
...
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 9dc1382e29
)
8 years ago
Slávek Banko
4a9a3963f2
Add artsc pkg-config file on Debian and Ubuntu
...
Refresh 12_cleanup_artsc-config.diff
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit f07a76da10
)
8 years ago
Slávek Banko
1e29387fa0
Add systemd unit for tdm-trinity on Debian
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit dd7fe04417
)
8 years ago
Slávek Banko
a445d8e120
Fix python-trinity-doc packaging on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 345baa6611
)
8 years ago
Slávek Banko
b5a5fc02a4
Enable WITH_ALL_OPTIONS option for tdegames on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 7d1c44beb9
)
8 years ago
Slávek Banko
e07d023079
Add python-tqt-dbg to build-deps for python-trinity on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 532776b04d
)
8 years ago
Slávek Banko
ba412349c7
Install real __init__.py instead of empty in python_tqt on Debian and Ubuntu
...
This relates to bug 2693
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4507e3e24c
)
8 years ago
Slávek Banko
b9829d4c9f
Switch tellico to cmake on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4d6010755e
)
8 years ago
Slávek Banko
0a09a726fa
Allow to use --enable-final for tellico on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit dd56d0db7e
)
8 years ago
Michele Calgaro
b2cc8a325c
Fixed khotkeys.desktop handling on Debian/Ubuntu. This resolve bug 2685.
...
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 40d63ebf00
)
8 years ago
Slávek Banko
b9cfbf5ba6
Enable java in tdebindings for arm64 on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit fddf6f3304
)
8 years ago
Slávek Banko
aff36b4d08
Fix FTBFS on installation of kvirc protocol files on Debian and Ubuntu
...
Protocol files are installed by debian/rules script
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d9eceff201
)
8 years ago
Slávek Banko
3c5a4bec5a
Removed packaging libkipi static library on Debian and Ubuntu
...
because libkipi static library is not built.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e2bc50297e
)
8 years ago
Slávek Banko
a74b041951
Use common build rules for knetload on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 169a62ee17
)
8 years ago
Slávek Banko
9314792c26
Add build-arch and build-indep targets to debian/rules
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit bd06c0aa4b
)
8 years ago
Slávek Banko
fc594fcc8a
Change debhelper compatibility level to 7 on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 1e8cfb2822
)
8 years ago
Timothy Pearson
172d322b92
Add build-arch and build-indep targets to debian/rules
...
(cherry picked from commit 510e052f22
)
8 years ago
Slávek Banko
98e74ef4e5
Move gnuift from depends to recommends in tdegraphics on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit cc4f868f30
)
8 years ago
Slávek Banko
5fec6291fc
Move poster from depends to recommends in tdebase on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit f4669e32c9
)
8 years ago
Slávek Banko
043fbbf43a
Use common build rules for kvpnc on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d3766210d9
)
9 years ago
Slávek Banko
ab0a274399
Remove version number from dependency on virtual package tde-i18n-trinity on Debian and Ubuntu
...
Remove kde-i18n-trinity from rename-meta - it was a virtual package
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit a21470e1e1
)
9 years ago
Slávek Banko
dce770b9b8
Use common build rules for tellico on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit bd96a61dc0
)
9 years ago
Slávek Banko
1c17a44c79
Use common build rules for piklab on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit c2faad6584
)
9 years ago
Slávek Banko
c93386f47c
Use common build rules for kmyfirewall on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 3f9b04c61f
)
9 years ago
Slávek Banko
e1598d7dc5
Fix prior commit
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d9172ab74d
)
9 years ago
Slávek Banko
112f3bf226
Use common build rules for kbfx on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 8ab98a2655
)
9 years ago
Slávek Banko
7ce70d2a4c
Switch from kochi fonts to takao on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4f64afe3b4
)
9 years ago
Slávek Banko
bdc5397086
Use a generic name for libpng-dev dependency on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 97159bb162
)
9 years ago
Slávek Banko
bd642ee283
Use a generic name for libpng-dev dependency on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 65ae0b5b2c
)
9 years ago
Slávek Banko
e781bb1239
Prefer update-notifier-common before reboot-notifier in adept recommends on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 2485f53b3c
)
9 years ago
Slávek Banko
368c01c2e0
Switch tdegames to cmake on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 6c9a00a162
)
9 years ago
Slávek Banko
4469a2da88
Switch k3b-i18n to cmake on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit c81710673f
)
9 years ago
Slávek Banko
74ed79716a
Remove unused build option BUILD_ALL in k3b on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit ef27f0a103
)
9 years ago
Slávek Banko
88f8eed283
Switch k3b to cmake on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d702b5fdfe
)
9 years ago
Slávek Banko
3e2017de70
Add GStreamer 1.0 support for tdemultimedia on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 21b4f0340e
)
9 years ago
Slávek Banko
0f3aea738c
Add GStreamer 1.0 support for kmplayer on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e7f4f31f4a
)
9 years ago
Slávek Banko
6d0844027c
Add GStreamer 1.0 support for kaffeine on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 2d392f757d
)
9 years ago
Slávek Banko
ae5ec816b7
Fix FTBFS on Debian and Ubuntu due to move libtool ltmain.sh
...
from /usr/share/libtool/config into /usr/share/libtool/build-aux
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit dde519148e
)
9 years ago
Slávek Banko
09668618ee
Fix kontact plugins dependencies on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit b3368c164d
)
9 years ago
Slávek Banko
ba33c1b211
Allow parallel make for i18n packages on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 639c18e5e1
)
9 years ago
Slávek Banko
47a2965ada
Fix FTBFS on Debian and Ubuntu due to move libtool ltmain.sh
...
from /usr/share/libtool/config into /usr/share/libtool/build-aux
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit bba0f67b18
)
9 years ago
Slávek Banko
ac42a7af4f
Fix FTBFS on Debian and Ubuntu due to move libtool ltmain.sh
...
from /usr/share/libtool/config into /usr/share/libtool/build-aux
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 09b52dab01
)
9 years ago
Michele Calgaro
ef300f2631
Fixed FTBFS in Debian/Ubuntu due to missing liblockdev1-dev package. Device locking is now done through 'flock()'
...
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit a02d02a947
)
9 years ago
Slávek Banko
c547f6a8e1
Revert "Allow to build without liblockdev1-dev on Debian and Ubuntu"
...
We need proper patch to replace lockdev
This reverts commit 215671e3a3
.
9 years ago
Slávek Banko
26f9dba307
Fix the wrong argument for start-stop-daemon in tdm-trinity.postinst on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit a236ea727f
)
9 years ago
Slávek Banko
6eccc1f2f7
Fix verification is_running in lisa init script on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit f790aba47d
)
9 years ago
Slávek Banko
41241c98d3
Switch remaining packages to dh_python2 on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 1e2672ad64
)
9 years ago
Slávek Banko
9c05367ac4
Add systemd as consolekit alternative for tdelibs on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 65a078c0bc
)
9 years ago
Slávek Banko
215671e3a3
Allow to build without liblockdev1-dev on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 9eebc6e50e
)
9 years ago
Slávek Banko
a1de2f6f55
Use DESTDIR for required MakeMaker change in Perl 5.22 on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e3867b5c84
)
9 years ago
Slávek Banko
70fc887e1d
Remove liblockdev1-dev build-deps for kpilot on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4dc0e374a5
)
9 years ago
Slávek Banko
12a5056bac
Switch filelight to cmake on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 2fd1fd42c1
)
9 years ago
Slávek Banko
de643afce1
Install lisarc into /etc instead of /opt/trinity/etc on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 2aeabd1b78
)
9 years ago
Slávek Banko
4fc077f2d8
Remove sudo dependency for tdelibs on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 91aac59413
)
9 years ago
Slávek Banko
c5916c9b9f
Install kppp-options into /etc instead of /opt/trinity/etc on Debian and Ubuntu
...
Default kppp-options moved from tde-packaging into tdenetwork
This resolves Bug 2529
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 48ab8a653e
)
9 years ago
Slávek Banko
176b5c5805
Add dependency sudo-trinity for tdesudo on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 23b8b87795
)
9 years ago
Slávek Banko
f597eae7ba
Fix ksquirrel mime magic file path on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 00f1ffa81e
)
9 years ago
Slávek Banko
61c513a86c
Install compiled MIME magic file for kolf on Debian and Ubuntu
...
This partially resolves Bug 2217
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 82e9e46e32
)
9 years ago
Slávek Banko
76c2d95b56
Install compiled MIME magic file for kig on Debian and Ubuntu
...
This partially resolves Bug 2217
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit b22d829c99
)
9 years ago
Slávek Banko
a8a006e99e
Install compiled MIME magic file for kexi on Debian and Ubuntu
...
This partially resolves Bug 2217
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 623dcd2641
)
9 years ago
Slávek Banko
2729ec1ac5
Install compiled MIME magic file for basket on Debian and Ubuntu
...
This partially resolves Bug 2217
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit c7eb65ef37
)
9 years ago
Slávek Banko
e9807da747
Fix kpilot packaging on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 0236bce9e4
)
9 years ago
Slávek Banko
0011ebd5fb
Fix syntax error in tqtinterface control file on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit a0a7c9b509
)
9 years ago
Slávek Banko
2b4b35b30b
Add TDM configuration for needrestart on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 83ce89c88e
)
9 years ago
Slávek Banko
9544bbcc3d
Fix tdeaccessibility applications desktop files location on Debian and Ubuntu
...
to be compliant with xdg specification
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 07d4f76fb2
)
9 years ago
Slávek Banko
c545f332bf
Add variant dependency apt-config-auto-update for adept on Debian and Ubuntu
...
Add reboot-notifier as recommended dependency
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit b699d9fe3d
)
9 years ago
Slávek Banko
86884aa996
Add new license files to tdelibs-data on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 8a5798447c
)
9 years ago
Slávek Banko
038eb45e0f
Fix typo in timezone in changelog on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 71c5ddf7b3
)
9 years ago
Slávek Banko
ff7aa20c55
Fix last date in changelog on Debian and Ubuntu
...
to pass through strict checking by dpkg 1.18.2
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 70352d671f
)
9 years ago
Slávek Banko
b4b0ac7240
Resolve conflict and circular dependency in tdesvn on Debian and Ubuntu
...
This resolves Bug 2252
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e287d00bba
)
9 years ago
Timothy Pearson
54fe524d82
Fix koffice-dev on Debian and Ubuntu
...
(cherry picked from commit 9bd3b69d6b
)
9 years ago
Timothy Pearson
01493474e4
Enable kpilot-trinity dbg package on Debian and Ubuntu
...
(cherry picked from commit 0d27fd15f3
)
9 years ago
Slávek Banko
7a94182bb8
Fix gtk3-tqt-engine dependency in gtk-qt-engine on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 05bf6dfab3
)
9 years ago
Slávek Banko
04e318f4bb
Simplify cleaning extra screensavers in tdeartwork on Debian and Ubuntu
...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 2d203cd98a
)
9 years ago
Timothy Pearson
33d3cf2dce
Fix package conflicts from prior commit
...
(cherry picked from commit a4f9c37a2a
)
9 years ago
Timothy Pearson
dc4c8f6948
Fix tdescreensaver installation directory on Debian and Ubuntu
...
(cherry picked from commit 985f6b9c8c
)
9 years ago