[med-svn] [SCM] mricron branch, master, updated. upstream/0.20100725.1.dfsg.1-41-g9699ce7

[Michael Hanke]

The following commit has been merged in the master branch:
commit 9699ce754491179a402a784327cdc625ced4c66e
Author: Michael Hanke <michael.hanke at gmail.com>
Date:   Mon Nov 8 07:56:33 2010 -0500

    New release (with new simple patch)

diff --git a/debian/changelog b/debian/changelog
index f03d126..c0dd8b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,11 @@ mricron (0.20101102.1~dfsg.1-1) unstable; urgency=low
   * New upstream code.
   * Changed get-orig-src to get-orig-source target in debian/rules for policy
     compliance.
+  * Added patch for compatibility with Lazarus version in Debian.
   * Added patch for Ubuntu lucid backports that can be automatically applied
     by backport-dsc.
 
- -- Michael Hanke <michael.hanke at gmail.com>  Mon, 08 Nov 2010 07:45:37 -0500
+ -- Michael Hanke <michael.hanke at gmail.com>  Mon, 08 Nov 2010 07:55:47 -0500
 
 mricron (0.20100820.1~dfsg.1-1) unstable; urgency=low
 
diff --git a/debian/patches/lazarus_compat b/debian/patches/lazarus_compat
new file mode 100644
index 0000000..0bdcaa4
--- /dev/null
+++ b/debian/patches/lazarus_compat
@@ -0,0 +1,15 @@
+Description: Make code compatible with Debian's lazarus version
+ This modification has been suggested by the upstream code.
+Forwarded: not-needed
+Author: Michael Hanke <michael.hanke at gmail.com>
+--- a/rgb/rgbgtkroutines.pas
++++ b/rgb/rgbgtkroutines.pas
+@@ -33,7 +33,7 @@
+ uses
+   SysUtils, Classes, LCLType,
+ {$IFDEF LCLgtk2}
+-   //gtkDef,     //<- uncomment for older versions of Lazarus
++   gtkDef,     //<- uncomment for older versions of Lazarus
+    glib2, gdk2,gtk2Def, gtk2Proc,
+ {$ELSE}  //LCLgtk1
+   glib, gdk, gtkDef, gtkProc,
diff --git a/debian/patches/series b/debian/patches/series
index 399d8bf..080d18c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 debian_paths
 debian_version
+lazarus_compat

-- 
Debian packaging of MRIcron