Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

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

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 ) );
    }
- 
+ */

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

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 ) );
    }
- 
+ */

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

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 ) );
    }
- 
+ */