diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-08-03 13:59:57 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-08-03 13:59:57 +0200 |
| commit | dc5cded1289800d7e07e375f0acb93f88f57a650 (patch) | |
| tree | 2ad9eec5ca4dcb870ec009bc7bb3f1c7d468d77a | |
| parent | be9f9f70d960e0789e024c8285dc681302c3c3f1 (diff) | |
| parent | 384e295657ee49226893e32380da3554a42864e7 (diff) | |
| download | tde-packaging-dc5cded1289800d7e07e375f0acb93f88f57a650.tar.gz tde-packaging-dc5cded1289800d7e07e375f0acb93f88f57a650.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
6 files changed, 6 insertions, 6 deletions
diff --git a/debian/lenny/applications/k3b/debian/control b/debian/lenny/applications/k3b/debian/control index 07b09f10f..20733a1f0 100644 --- a/debian/lenny/applications/k3b/debian/control +++ b/debian/lenny/applications/k3b/debian/control @@ -14,7 +14,7 @@ Depends: ${shlibs:Depends}, wodim | cdrskin, cdparanoia (>= 3a9.8), genisoimage, Replaces: k3b-trinity (<< 4:14.0.0) Breaks: k3b-trinity (<< 4:14.0.0) Recommends: dvd+rw-tools, libk3b3-extracodecs-trinity -Suggests: k3b-i18n, normalize-audio, toolame, sox, movixmaker-2, vcdimager (>= 0.7) +Suggests: k3b-i18n-trinity, normalize-audio, toolame, sox, movixmaker-2, vcdimager (>= 0.7) Description: A sophisticated KDE CD burning application [Trinity] K3b is a GUI frontend to the CD recording programs cdrdao and cdrecord. Its aim is to provide a very user friendly interface to all the tasks diff --git a/debian/lenny/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff b/debian/lenny/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff index 773fdbc90..dc44bfdb8 100644 --- a/debian/lenny/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff +++ b/debian/lenny/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff @@ -11,4 +11,4 @@ diff -Nur k3b-1.0.2/src/k3bsystemproblemdialog.cpp k3b-1.0.2.new/src/k3bsystempr + "(or kubuntu-restricted-extras on Debian)."), false ) ); } - + */ diff --git a/debian/squeeze/applications/k3b/debian/control b/debian/squeeze/applications/k3b/debian/control index 07b09f10f..20733a1f0 100644 --- a/debian/squeeze/applications/k3b/debian/control +++ b/debian/squeeze/applications/k3b/debian/control @@ -14,7 +14,7 @@ Depends: ${shlibs:Depends}, wodim | cdrskin, cdparanoia (>= 3a9.8), genisoimage, Replaces: k3b-trinity (<< 4:14.0.0) Breaks: k3b-trinity (<< 4:14.0.0) Recommends: dvd+rw-tools, libk3b3-extracodecs-trinity -Suggests: k3b-i18n, normalize-audio, toolame, sox, movixmaker-2, vcdimager (>= 0.7) +Suggests: k3b-i18n-trinity, normalize-audio, toolame, sox, movixmaker-2, vcdimager (>= 0.7) Description: A sophisticated KDE CD burning application [Trinity] K3b is a GUI frontend to the CD recording programs cdrdao and cdrecord. Its aim is to provide a very user friendly interface to all the tasks diff --git a/debian/squeeze/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff b/debian/squeeze/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff index 773fdbc90..dc44bfdb8 100644 --- a/debian/squeeze/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff +++ b/debian/squeeze/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff @@ -11,4 +11,4 @@ diff -Nur k3b-1.0.2/src/k3bsystemproblemdialog.cpp k3b-1.0.2.new/src/k3bsystempr + "(or kubuntu-restricted-extras on Debian)."), false ) ); } - + */ diff --git a/ubuntu/maverick/applications/k3b/debian/control b/ubuntu/maverick/applications/k3b/debian/control index 07b09f10f..20733a1f0 100644 --- a/ubuntu/maverick/applications/k3b/debian/control +++ b/ubuntu/maverick/applications/k3b/debian/control @@ -14,7 +14,7 @@ Depends: ${shlibs:Depends}, wodim | cdrskin, cdparanoia (>= 3a9.8), genisoimage, Replaces: k3b-trinity (<< 4:14.0.0) Breaks: k3b-trinity (<< 4:14.0.0) Recommends: dvd+rw-tools, libk3b3-extracodecs-trinity -Suggests: k3b-i18n, normalize-audio, toolame, sox, movixmaker-2, vcdimager (>= 0.7) +Suggests: k3b-i18n-trinity, normalize-audio, toolame, sox, movixmaker-2, vcdimager (>= 0.7) Description: A sophisticated KDE CD burning application [Trinity] K3b is a GUI frontend to the CD recording programs cdrdao and cdrecord. Its aim is to provide a very user friendly interface to all the tasks diff --git a/ubuntu/maverick/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff b/ubuntu/maverick/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff index 773fdbc90..dc44bfdb8 100644 --- a/ubuntu/maverick/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff +++ b/ubuntu/maverick/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff @@ -11,4 +11,4 @@ diff -Nur k3b-1.0.2/src/k3bsystemproblemdialog.cpp k3b-1.0.2.new/src/k3bsystempr + "(or kubuntu-restricted-extras on Debian)."), false ) ); } - + */ |