--- geany-0.19.1.orig/debian/NEWS +++ geany-0.19.1/debian/NEWS @@ -0,0 +1,16 @@ +geany (0.11-1) unstable; urgency=low + + Tab is now used for construct completion (for, if, etc.), but + it is configurable with the new 'Complete construct' keybinding. + + Template files are now stored in ~/.geany/templates/ and the 'template.' + filename prefix is no longer used. You will need to move any custom + template files you have. + + Inserting a file header is now optional for filetype templates. Use the + string '{fileheader}' to mark where the file header should be placed. + + Drag'n'Drop of text inside the editor widget will now move the text + instead of copying it. + + -- Damián Viano Thu, 24 May 2007 15:12:58 -0300 --- geany-0.19.1.orig/debian/rules +++ geany-0.19.1/debian/rules @@ -0,0 +1,91 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +include /usr/share/dpatch/dpatch.make + +CFLAGS = -Wall -g +#LDFLAGS = -Wl,-z,defs -Wl,-as-needed + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +config.status: configure + dh_testdir + # Add here commands to configure the package. + CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-vte --enable-pipe --enable-the-force + sed -i -r 's,^sys_lib_dlsearch_path_spec="(.*)$$,sys_lib_dlsearch_path_spec="/usr/lib /lib \1,' $(CURDIR)/libtool + + +build: build-stamp + +build-stamp: config.status patch + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/geany. + $(MAKE) install DESTDIR=$(CURDIR)/debian/geany + #chrpath -d $(CURDIR)/debian/geany/usr/bin/geany \ + # $(CURDIR)/debian/geany/usr/lib/geany/*.so + -rm -f $(CURDIR)/debian/geany/usr/share/geany/GPL-2 + -rm -f $(CURDIR)/debian/geany/usr/share/doc/geany/COPYING \ + $(CURDIR)/debian/geany/usr/share/doc/geany/ScintillaLicense.txt \ + $(CURDIR)/debian/geany/usr/share/doc/geany/AUTHORS \ + $(CURDIR)/debian/geany/usr/share/doc/geany/ChangeLog + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_install + dh_installmenu + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install patch unpatch --- geany-0.19.1.orig/debian/watch +++ geany-0.19.1/debian/watch @@ -0,0 +1,4 @@ +version=3 + +#http://sf.net/geany/geany-(.*)\.tar\.gz +http://download.geany.org/geany-(.*)\.tar\.gz --- geany-0.19.1.orig/debian/compat +++ geany-0.19.1/debian/compat @@ -0,0 +1 @@ +5 --- geany-0.19.1.orig/debian/install +++ geany-0.19.1/debian/install @@ -0,0 +1 @@ +debian/geany.xpm /usr/share/pixmaps/ --- geany-0.19.1.orig/debian/menu +++ geany-0.19.1/debian/menu @@ -0,0 +1,4 @@ +?package(geany):needs="X11" section="Applications/Programming" \ + hints="IDE,Small,Gtk" \ + icon="/usr/share/pixmaps/geany.xpm" \ + title="Geany" command="/usr/bin/geany" --- geany-0.19.1.orig/debian/dirs +++ geany-0.19.1/debian/dirs @@ -0,0 +1 @@ +usr/bin --- geany-0.19.1.orig/debian/README.source +++ geany-0.19.1/debian/README.source @@ -0,0 +1,3 @@ +This package uses dpatch to manage all modifications to the upstream source. +Please refer to /usr/share/doc/dpatch/README.source.gz for further information +abou thow to work with dpatch. --- geany-0.19.1.orig/debian/changelog +++ geany-0.19.1/debian/changelog @@ -0,0 +1,148 @@ +geany (0.19.1-1) unstable; urgency=low + + * New upstream release (Closes: #590284) + - Thanks to Colomban Wendling for pursuing #590284 + * add a sed hack to fix dlsearchpath for broken libtool used upstream + + -- Damián Viano Mon, 30 Aug 2010 18:09:16 -0300 + +geany (0.19-1) unstable; urgency=low + + * New upstream release (Closes: #585849, #580911, #542785) + * add 20_use_sensible_browser to change the default browser (Closes: #573454) + + -- Damián Viano Thu, 24 Jun 2010 21:35:05 -0300 + +geany (0.18-1) unstable; urgency=low + + * New upstream release + + -- Damian Viano Mon, 17 Aug 2009 17:16:21 -0300 + +geany (0.17-1) unstable; urgency=low + + * New upstream release + * 20_add_debdiff_as_diff_type.dpatch renamed as + 20_add_debian_specific_filetypes.dpatch, + - add .dpatch as a diff filetype + - add control as a conf filetype + * 20_change_gpl_location.dpatch freshen + * add 20_debian_control_tags.dpatch better handling of debian/control files. + Thanks to Enrico Tröger. (Closes: #520776) + * debian/copyright Add Frank Lanitz, update years + + -- Damián Viano Fri, 29 May 2009 21:22:54 -0300 + +geany (0.15-1) experimental; urgency=low + + * New upstream release + - Allow loading projects from command line (Closes: #498854) + - Fix a problem disabling the save icon inappropriately (Closes: #482875) + - Detect makefiles from shebang and force using tabs + for their indentation (Closes: #481198) + * Remove Apps from doc-base section + * Change homepage and related links to the new www.geany.org official domain + + -- Damián Viano Sun, 26 Oct 2008 19:44:46 -0200 + +geany (0.14-1) unstable; urgency=low + + * New upstream release (Closes: #478126) + + -- Damián Viano Fri, 02 May 2008 11:37:45 -0300 + +geany (0.13-1) unstable; urgency=low + + * New upstream release + - Add filebrowser plugin (Closes: #440978) + + -- Damián Viano Sat, 16 Feb 2008 19:27:19 -0200 + +geany (0.12-2) unstable; urgency=low + + * Add 20_add_debdiff_as_diff_type to recognize .debdiff files as diffs + (Closes: #453516) + + -- Damián Viano Wed, 05 Dec 2007 16:47:02 -0300 + +geany (0.12-1) unstable; urgency=low + + * New upstream release + - Updates scintilla component (Closes: #438876, #426766) + - Add mimetype declaration in the .desktop file (Closes: #416620) + * Add intltool to Build-Depends + + -- Damián Viano Mon, 29 Oct 2007 18:24:05 -0300 + +geany (0.11-2) unstable; urgency=low + + * Add versioned dependency against libgtk2.0-dev since geany code depends on + it for notebook dnd at the moment + + -- Damián Viano Mon, 11 Jun 2007 14:47:31 -0300 + +geany (0.11-1) unstable; urgency=low + + * New upstream release + + -- Damián Viano Thu, 24 May 2007 07:15:52 -0300 + +geany (0.10.2-3) unstable; urgency=low + + * Change suggests to newer libvte, thanks to Andreas Tscharner (Closes: #421568) + + -- Damián Viano Mon, 30 Apr 2007 20:17:06 -0300 + +geany (0.10.2-2) unstable; urgency=low + + * Upload to get geany 0.10.2 into sid + * Change maintainer mail address + + -- Damián Viano Sat, 28 Apr 2007 08:34:00 -0300 + +geany (0.10.2-1) experimental; urgency=low + + * New upstream release + + -- Damián Viano Sun, 25 Feb 2007 16:39:56 -0300 + +geany (0.10.1-1) unstable; urgency=low + + * New upstream release + + -- Damián Viano Sun, 25 Feb 2007 15:31:13 -0300 + +geany (0.10-1) unstable; urgency=low + + * New upstream release + + -- Damián Viano Sun, 24 Dec 2006 12:17:24 -0300 + +geany (0.9-1) unstable; urgency=low + + * New upstream release + + -- Damián Viano Fri, 29 Sep 2006 06:13:18 -0300 + +geany (0.8-1) unstable; urgency=low + + * New upstream release + - Fixed clipboard commands used in the find entry and Scribble (Closes: #377060) + - Don't autocomplete constructs inside a string (Closes: #377090) + + -- Damián Viano Wed, 9 Aug 2006 19:35:11 -0300 + +geany (0.7.1-1) unstable; urgency=low + + * New upstream release + - Added Scintilla license + * debian/copyright: included Scintilla license and copyright + + -- Damián Viano Sun, 25 Jun 2006 12:10:13 -0300 + +geany (0.7-1) unstable; urgency=low + + * Initial release (Closes: #360760) + + -- Damián Viano Tue, 6 Jun 2006 12:54:23 -0300 + --- geany-0.19.1.orig/debian/control +++ geany-0.19.1/debian/control @@ -0,0 +1,32 @@ +Source: geany +Section: devel +Priority: optional +Maintainer: Damián Viano +Homepage: http://www.geany.org +Vcs-Svn: http://geany.svn.sourceforge.net/svnroot/geany/trunk/ +Vcs-Browser: http://geany.svn.sourceforge.net/viewvc/geany/ +Build-Depends: debhelper (>= 5.0.0), dpatch, libgtk2.0-dev (>= 2.10), libglib2.0-dev, libatk1.0-dev, libpango1.0-dev, intltool, chrpath +Standards-Version: 3.9.1 + +Package: geany +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: geany-plugins-common (<< 0.19) +Suggests: libvte9, doc-base +Description: A fast and lightweight IDE + Geany is a small and lightweight integrated development environment. + It was developed to provide a small and fast IDE, which has only a + few dependencies from other packages. It is using only the GTK2 toolkit + and therefore you need only the GTK2 runtime libraries to run Geany. + . + The basic features of Geany are: + - syntax highlighting + - code completion + - auto completion of constructs like if, for and while, XML and HTML + - call tips + - folding + - many supported filetypes like C, Java, PHP, HTML, Python, Perl, Pascal + - symbol lists + - embedded terminal emulation + . + --- geany-0.19.1.orig/debian/geany.xpm +++ geany-0.19.1/debian/geany.xpm @@ -0,0 +1,295 @@ +/* XPM */ +static char *geany[] = { +/* columns rows colors chars-per-pixel */ +"32 32 257 2", +" c black", +". c #0E0000", +"X c #0B0800", +"o c #151000", +"O c #211900", +"+ c #342A00", +"@ c #423200", +"# c #6B2900", +"$ c #7E2E00", +"% c #7E3F00", +"& c #5B4800", +"* c #6B5700", +"= c #734200", +"- c #7B6300", +"; c #7C8174", +": c #B92D16", +"> c #BC3513", +", c #BE3326", +"< c #985800", +"1 c #8A7107", +"2 c #907700", +"3 c #977B00", +"4 c #BF5205", +"5 c #A87900", +"6 c #C82E1F", +"7 c #C53E33", +"8 c #C64214", +"9 c #CB5B17", +"0 c #C8423E", +"q c #C85D36", +"w c #C76119", +"e c #CA7A06", +"r c #D17E10", +"t c #D17C28", +"y c #CC5541", +"u c #D95554", +"i c #DA494B", +"p c #CC644E", +"a c #D17543", +"s c #D36C63", +"d c #DD7675", +"f c #ED6F71", +"g c #98800B", +"h c #AD8400", +"j c #A98B02", +"k c #A18304", +"l c #AA9114", +"z c #B18300", +"x c #B38800", +"c c #BA8F02", +"v c #BC9500", +"b c #BE9900", +"n c #BB9C0D", +"m c #B59A19", +"M c #B99C18", +"N c #B29713", +"B c #BEA100", +"V c #BBA32F", +"C c #ADA369", +"Z c #B7AE7D", +"A c #C29C00", +"S c #C39500", +"D c #DC951C", +"F c #DA8E37", +"G c #D58428", +"H c #C5A101", +"J c #C6A409", +"K c #C8A603", +"L c #C8A60A", +"P c #CDAD03", +"I c #CBAA0C", +"U c #CBAA13", +"Y c #CDAD1A", +"T c #C7A611", +"R c #CEB40C", +"E c #CFB11D", +"W c #D3AC00", +"Q c #DEAF00", +"! c #DBA306", +"~ c #D0AF16", +"^ c #DCA015", +"/ c #D4B50B", +"( c #DABB01", +") c #D9BC0B", +"_ c #D5B504", +"` c #D5B614", +"' c #D2B41B", +"] c #D8BB11", +"[ c #D7BA19", +"{ c #CCAE23", +"} c #C8AE2F", +"| c #C3A828", +" . c #CEB227", +".. c #D8A127", +"X. c #D2B421", +"o. c #D1B52C", +"O. c #D6BA23", +"+. c #D5BA2D", +"@. c #D8BC22", +"#. c #D8BD2B", +"$. c #D2B633", +"%. c #D5BA33", +"&. c #D6BB3B", +"*. c #D9BE32", +"=. c #D9BE3A", +"-. c #E2BB00", +";. c #E4AF2B", +":. c #E5B422", +">. c #D6804C", +",. c #D88F54", +"<. c #D8934F", +"1. c #DC9553", +"2. c #D58361", +"3. c #D5BC43", +"4. c #D7BE48", +"5. c #D0BA50", +"6. c #E2BF54", +"7. c #E2A658", +"8. c #E8BC6C", +"9. c #E4B471", +"0. c #DDC205", +"q. c #DCC00A", +"w. c #DCC01E", +"e. c #DFC414", +"r. c #DFC72D", +"t. c #D9C021", +"y. c #DBC135", +"u. c #DCC33C", +"i. c #DFCC36", +"p. c #E3C501", +"a. c #E4CA00", +"s. c #E9CD02", +"d. c #E6CC0E", +"f. c #E4CA16", +"g. c #EBC81C", +"h. c #EDD505", +"j. c #EDD50E", +"k. c #EED611", +"l. c #EBD41A", +"z. c #EFD814", +"x. c #F0D913", +"c. c #F2DC1D", +"v. c #E3CD2C", +"b. c #E5CC25", +"n. c #E0C834", +"m. c #E4CD3C", +"M. c #E0C734", +"N. c #EBD624", +"B. c #EAD629", +"V. c #ECD63C", +"C. c #EDD931", +"Z. c #EFD93D", +"A. c #F1DB24", +"S. c #F2D72A", +"D. c #F2DC37", +"F. c #FFF100", +"G. c #F5E034", +"H. c #F8E43A", +"J. c #DBC345", +"K. c #DCC44B", +"L. c #DBC350", +"P. c #DEC865", +"I. c #E1CA43", +"U. c #E1CA4C", +"Y. c #E2CD51", +"T. c #E7C859", +"R. c #E6D146", +"E. c #E6D04A", +"W. c #E8D44E", +"Q. c #EEDA4C", +"!. c #E9D544", +"~. c #E6D25B", +"^. c #EDDB53", +"/. c #EDDB5E", +"(. c #E8D352", +"). c #F2D844", +"_. c #F0DD54", +"`. c #E2CE64", +"'. c #EBC566", +"]. c #E4D064", +"[. c #E6D46A", +"{. c #E9D662", +"}. c #EEDE67", +"|. c #ECDB6D", +" X c #EBDA74", +".X c #EBDC7D", +"XX c #E6D370", +"oX c #F0DF63", +"OX c #F1D979", +"+X c #FBE84D", +"@X c #F7E445", +"#X c #F4E254", +"$X c #FBE959", +"%X c #F9E857", +"&X c #EFE07C", +"*X c #F4E465", +"=X c #F3E36B", +"-X c #F6E86E", +";X c #FBEB6D", +":X c #FCEB62", +">X c #F3E474", +",X c #F4E57F", +"XkX.Xp u a gX2X.6 D c.x.p.q u 9 R.U YXYXYXYXb ) / ", +"YXYXYXU XX X*XX2XgXgX'.y i 9 c.x.h.p.f.W.T v U ' #.r.w.P A ", +"YXYXYXYXx K K.fX-X-X :.c.x.h.s.Q.=.&.J.J.J.i.' K v YX", +"YXYXYXYXYXv L =.>XgX3X3X2X1XV.;.S.c.x.k.).m.Y 4.J.3.{ H A YXYXYX", +"YXYXYXYXYXYX$.4.U.{.,XhXhX;X+XH.G.G.@XQ.y.r.K.=.c < . YXYXYXYXYX", +"YXYXYXYXYXL ].fX*XZ.y.u.{.>X>X>X*X^.u.' 0.f.m.~.$.2 YXYXYXYXYXYX", +"YXYXYXYXYXY fX:X+X+XZ.I K I U U I K H P a.p.( i.J.j YXYXYXYX", +"YXYXYXYX U XgX$X+X+XZ.@.U L K J L R 0.a.p.e.R.+.3 YXYXYXYX", +"YXYXYXYX 2 { `.,X2X;X:X#XQ.!.R.i.v.v.N.B.V.E.+.j + YXYXYXYX", +"YXYXYXYX & k } 4.Y.|.>X>X>X=X}./.^.R.u.o.l - o YXYXYXYX", +"YXYXYXYXYX X @ & 1 l m m M M M m l g * @ O YXYXYXYXYXYX", +"YXYXYXYXYXYXYXYX YXYXYXYXYXYXYXYX" +}; --- geany-0.19.1.orig/debian/manpages +++ geany-0.19.1/debian/manpages @@ -0,0 +1 @@ +doc/geany.1 --- geany-0.19.1.orig/debian/copyright +++ geany-0.19.1/debian/copyright @@ -0,0 +1,53 @@ +This package was debianized by Damián Viano on +Tue, 6 Jun 2006 11:39:58 -0300. + +It was downloaded from http://download.geany.org/ + +For geany: + +Copyright Holder: 2005-2009 Enrico Tröger + 2009 Nick Treleaven + 2009 Frank Lanitz + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + + +For Scintilla library: + +Copyright Holder: 1998-2009 Neil Hodgson + +License: + + All Rights Reserved + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation. + + NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY + SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE + OR PERFORMANCE OF THIS SOFTWARE. --- geany-0.19.1.orig/debian/geany.doc-base +++ geany-0.19.1/debian/geany.doc-base @@ -0,0 +1,13 @@ +Document: geany +Title: geany manual +Author: Enrico Tröger, Nick Treleaven, Frank Lanitz +Abstract: This document describes the usage of the Geany IDE, it also + describes how to get, compile and install geany. +Section: Editors + +Format: text +Files: /usr/share/doc/geany/manual.txt.gz + +Format: HTML +Index: /usr/share/doc/geany/html/index.html +Files: /usr/share/doc/geany/html/* --- geany-0.19.1.orig/debian/docs +++ geany-0.19.1/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +TODO --- geany-0.19.1.orig/debian/patches/20_use_sensible_browser.dpatch +++ geany-0.19.1/debian/patches/20_use_sensible_browser.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## use_sensible_browser.dpatch by Damián Viano +## +## DP: change default browser to sensible-browser to be more debian integrated + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' geany-0.19~/src/keyfile.c geany-0.19/src/keyfile.c +--- geany-0.19~/src/keyfile.c 2010-05-22 16:40:12.000000000 -0300 ++++ geany-0.19/src/keyfile.c 2010-06-24 21:31:34.000000000 -0300 +@@ -74,7 +74,7 @@ + #else + #define GEANY_DEFAULT_TOOLS_TERMINAL "xterm" + #endif +-#define GEANY_DEFAULT_TOOLS_BROWSER "firefox" ++#define GEANY_DEFAULT_TOOLS_BROWSER "sensible-browser" + #define GEANY_DEFAULT_TOOLS_PRINTCMD "lpr" + #define GEANY_DEFAULT_TOOLS_GREP "grep" + #define GEANY_DEFAULT_MRU_LENGTH 10 --- geany-0.19.1.orig/debian/patches/00list +++ geany-0.19.1/debian/patches/00list @@ -0,0 +1,4 @@ +20_change_gpl_location +20_add_debian_specific_filetypes +20_debian_control_tags +20_use_sensible_browser --- geany-0.19.1.orig/debian/patches/20_change_gpl_location.dpatch +++ geany-0.19.1/debian/patches/20_change_gpl_location.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_change_gpl_location.dpatch by Damián Viano +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Small patch to use common-licenses + +@DPATCH@ +diff -urNad geany-0.17~/src/about.c geany-0.17/src/about.c +--- geany-0.17~/src/about.c 2009-04-05 11:14:29.000000000 -0300 ++++ geany-0.17/src/about.c 2009-05-27 21:26:50.000000000 -0300 +@@ -380,7 +380,7 @@ + label = gtk_label_new(_("License")); + gtk_widget_show(label); + +- g_snprintf(buffer, sizeof(buffer), "%s" G_DIR_SEPARATOR_S "GPL-2", app->datadir); ++ g_snprintf(buffer, sizeof(buffer), "/usr/share/common-licenses/GPL-2"); + + g_file_get_contents(buffer, &license_text, NULL, NULL); + if (license_text == NULL) --- geany-0.19.1.orig/debian/patches/20_add_debian_specific_filetypes.dpatch +++ geany-0.19.1/debian/patches/20_add_debian_specific_filetypes.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_add_debdiff_as_diff_type.dpatch by Damián Viano +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: change default config file to include debian specific files: +## DP: .debdiff and .dpatch files as diffs +## DP: control as config file + +@DPATCH@ +diff -urNad geany-0.17~/data/filetype_extensions.conf geany-0.17/data/filetype_extensions.conf +--- geany-0.17~/data/filetype_extensions.conf 2009-03-13 07:58:27.000000000 -0200 ++++ geany-0.17/data/filetype_extensions.conf 2009-05-29 21:21:09.000000000 -0300 +@@ -39,8 +39,8 @@ + HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm; + XML=*.xml;*.sgml;*.xsl;*.xslt;*.xsd;*.xhtml; + CMake=CMakeLists.txt;*.cmake;*.ctest; +-Conf=*.conf;*.ini;config;*rc;*.cfg;*.desktop; +-Diff=*.diff;*.patch;*.rej; ++Conf=*.conf;*.ini;config;*rc;*.cfg;*.desktop;control; ++Diff=*.diff;*.patch;*.rej;*.debdiff;*.dpatch; + NSIS=*.nsi;*.nsh; + Po=*.po;*.pot; + LaTeX=*.tex;*.sty;*.idx;*.ltx; --- geany-0.19.1.orig/debian/patches/20_debian_control_tags.dpatch +++ geany-0.19.1/debian/patches/20_debian_control_tags.dpatch @@ -0,0 +1,40 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_debian_control_tags.dpatch by Damián Viano +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add support for having 'Source:' and 'Package:' as tags in a +## DP: RFC2822 file as debian/control + +@DPATCH@ +diff -urNad geany-0.17~/tagmanager/conf.c geany-0.17/tagmanager/conf.c +--- geany-0.17~/tagmanager/conf.c 2009-03-30 14:49:40.000000000 -0300 ++++ geany-0.17/tagmanager/conf.c 2009-05-29 19:41:17.000000000 -0300 +@@ -14,6 +14,7 @@ + #include "general.h" /* must always come first */ + + #include ++#include + + #include "parse.h" + #include "read.h" +@@ -74,6 +75,20 @@ + continue; + } + ++ /* look for a stanza */ ++ if (*cp != '\0' && (strncmp((const char*) cp, "Source:", 7) == 0 || ++ strncmp((const char*) cp, "Package:", 8) == 0)) ++ { ++ cp = (const unsigned char*) strchr((const char*) cp, ':') + 1; ++ while (isspace ((int) *cp)) ++ ++cp; ++ vStringCopyS (name, (const char*) cp); ++ vStringTerminate (name); ++ makeSimpleTag (name, ConfKinds, K_SECTION); ++ vStringClear (name); ++ continue; ++ } ++ + while (*cp != '\0') + { + /* We look for any sequence of identifier characters following a white space */