← Back to branch summary

~ubuntu-branches/ubuntu/utopic/geany/utopic

« back to all changes in this revision

Viewing changes to debian/patches/20_add_debian_specific_filetypes.patch

  • Committer: Package Import Robot
  • Author(s): Chow Loong Jin
  • Date: 2011-12-10 07:43:26 UTC
  • mfrom: (3.3.7 sid)
  • Revision ID: package-import@ubuntu.com-20111210074326-s8yqbew5i20h33tf
Tags: 0.21-1ubuntu1
* Merge from Debian Unstable, remaining changes:
  - debian/patches/20_use_evince_viewer.patch:
     + use evince as viewer for pdf and dvi files
  - debian/patches/20_use_x_terminal_emulator.patch:
     + use x-terminal-emulator as terminal
  - debian/control
     + Add breaks on geany-plugins-common << 0.20
* Also fixes bugs:
  - Filter for MATLAB/Octave files filters everythign (LP: 885505)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/20_add_debian_specific_filetypes.patch
 
1
Author: Damián Viano <des@debian.org>
 
2
Description: change default config file to include debian specific files:
 
3
.debdiff and .dpatch files as diffs
 
4
control as config file
 
5
--- geany.orig/data/filetype_extensions.conf
 
6
+++ geany/data/filetype_extensions.conf
 
7
@@ -12,11 +12,11 @@
 
8
 C#=*.cs;
 
9
 CMake=CMakeLists.txt;*.cmake;*.ctest;
 
10
 COBOL=*.cob;*.cpy;*.cbl;*.cobol;
 
11
-Conf=*.conf;*.ini;config;*rc;*.cfg;*.desktop;
 
12
+Conf=*.conf;*.ini;config;*rc;*.cfg;*.desktop;control;
 
13
 CSS=*.css;
 
14
 Cython=*.pyx;*.pxd;*.pxi;
 
15
 D=*.d;*.di;
 
16
-Diff=*.diff;*.patch;*.rej;
 
17
+Diff=*.diff;*.patch;*.rej;*.debdiff;*.dpatch;
 
18
 Docbook=*.docbook;
 
19
 Erlang=*.erl;
 
20
 F77=*.f;*.for;*.ftn;*.f77;