summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-08-19 18:59:31 +0200
committerFrancois Andriot <francois.andriot@free.fr>2012-08-19 18:59:31 +0200
commitadb1b48ca1b90ed07b7456c47e78909362007985 (patch)
tree60e5e4a1f791676a71ac9773993c0629c7a2d5ca /ubuntu/maverick
parent24f013d747376aa82d3e1428b269359137b8d2af (diff)
parent3249f1c32b384737ac585a00f72affb4195d5ac2 (diff)
downloadtde-packaging-adb1b48ca1b90ed07b7456c47e78909362007985.tar.gz
tde-packaging-adb1b48ca1b90ed07b7456c47e78909362007985.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick')
-rw-r--r--ubuntu/maverick/applications/kaffeine/debian/control2
-rw-r--r--ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch2
2 files changed, 1 insertions, 3 deletions
diff --git a/ubuntu/maverick/applications/kaffeine/debian/control b/ubuntu/maverick/applications/kaffeine/debian/control
index 91d4be5a3..25063f3ba 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/control
+++ b/ubuntu/maverick/applications/kaffeine/debian/control
@@ -17,7 +17,6 @@ Architecture: any
Depends: ${shlibs:Depends}, hdparm
Replaces: kaffeine-trinity (<< 4:14.0.0)
Breaks: kaffeine-trinity (<< 4:14.0.0)
-Recommends: tdesudo-trinity, kpackage-trinity
Description: versatile media player for TDE
Kaffeine is a media player for KDE. While it supports multiple player
engines, its default engine is Xine, giving Kaffeine a wide variety of
@@ -36,7 +35,6 @@ Replaces: kaffeine-trinity-dbg (<< 4:14.0.0)
Breaks: kaffeine-trinity-dbg (<< 4:14.0.0)
Priority: extra
Depends: kaffeine-trinity (= ${binary:Version}), tdelibs-trinity-dbg
-Recommends: tdesudo-trinity, kpackage-trinity
Description: debugging symbols for kaffeine [Trinity]
This package contains the debugging symbols associated with kaffeine.
They will automatically be used by gdb for debugging kaffeine-related
diff --git a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch b/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
index c7485931c..8119d9cc4 100644
--- a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
+++ b/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
@@ -2,7 +2,7 @@ diff -Nur kerry-0.2.1/kerry/src/Makefile.am kerry-0.2.1.new/kerry/src/Makefile.a
--- kerry-0.2.1/kerry/src/Makefile.am 2006-12-05 18:28:31.000000000 +0100
+++ kerry-0.2.1.new/kerry/src/Makefile.am 2006-12-05 18:28:53.000000000 +0100
@@ -31,7 +31,7 @@
- kerry_la_LIBADD = -lkio -lkonq $(LIB_TDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_KABC)
+ kerry_la_LIBADD = -lkio -lkonq $(LIB_TDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_KABC) -lDCOP $(LIB_QT) $(LIB_TDECORE)
autostartdir = $(datadir)/autostart
-autostart_DATA = kerry.autostart.desktop beagled.desktop