diff options
| author | albator <albator@arcadia.vtf> | 2011-11-05 11:51:44 +0100 |
|---|---|---|
| committer | albator <albator@arcadia.vtf> | 2011-11-05 11:51:44 +0100 |
| commit | 70bc259aa3f4dbd83bd239030690759449ee714b (patch) | |
| tree | b61af2d70c64ca12dbec49053c0b20dae8ba7926 /ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES | |
| parent | 1f3a44f73fa43d3c30f47ff8c4f5c414d83f4765 (diff) | |
| parent | 169853a068683db6540e3b77542d5139bb7867d1 (diff) | |
| download | tde-packaging-70bc259aa3f4dbd83bd239030690759449ee714b.tar.gz tde-packaging-70bc259aa3f4dbd83bd239030690759449ee714b.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES')
| -rw-r--r-- | ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES new file mode 100644 index 000000000..9a68eac1d --- /dev/null +++ b/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -0,0 +1,20 @@ +Not build using tar inside .orig, no DEB_KDE_CVS_MAKE := yes +Don't build-dep on libgnokii-dev, not in main +Install /usr/share/services/kontact/knode* in knode and add replaces +don't build-dep on gnokii or automake1.9 +make kontact depend on kmail, korganizer, kaddressbook +Remove 16_kde_modulename.diff, module name isn't changed in Ubuntu +remove debian/stamp-libtool-update: +kontact does not recommend kitchensync +various Replaces/Conflicts (search for ubuntu) +split out services/kontact/*desktop from kontact to indiviual apps +add kandy*xpm to debian/icons and install lines to kandy.install +remove clean:: rule +tdepim-dev does not depend on kitchensync +Control has networkstatus-dev package and networkstatus package includes + libnetworkstatus.so* files +build-dep on gpgsm +kmail depends on gpgsm, gnupg-agent, pinentry-qt | pinentry-x11 +add scalix support + +remove debian/patches/30_debianize_akregator_default.diff |