~ubuntu-branches/ubuntu/quantal/kde-baseapps/quantal-proposed

« back to all changes in this revision

Viewing changes to debian/patches/debian-T-addition.diff

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2011-11-23 14:27:58 UTC
  • Revision ID: package-import@ubuntu.com-20111123142758-099shbmiuh86y05e
Tags: 4:4.7.3-0ubuntu2
* Merge with Debian Unstable, remaining changes:
  - Keep bumped replace/conflicts versions where necessary
  - Suggest instead of recommend kfind, ruby in dolphin also suggests
    konsole, kompare
  - Reduce the x-www-browser priority for konqueror to 30 as rekonq is the
    default Kubuntu browser.
  - Rename folderview_rename.diff to kubuntu_25_folderview_rename.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
--- a/konsole/src/main.cpp
 
2
+++ b/konsole/src/main.cpp
 
3
@@ -104,6 +104,7 @@
 
4
     options.add("noclose",ki18n("Do not close the initial session automatically when it ends."));
 
5
     // TODO - Document this option more clearly
 
6
     options.add("p <property=value>",ki18n("Change the value of a profile property."));
 
7
+    options.add("T <value>", ki18n("Debian policy compatibility, not used"));
 
8
     options.add("!e <cmd>",ki18n("Command to execute"));
 
9
     options.add("+[args]",ki18n("Arguments passed to command"));
 
10
 }