[med-svn] [SCM] mricron branch, master, updated. upstream/0.20110413.1_dfsg.1-57-g7a09477

[Michael Hanke]

The following commit has been merged in the master branch:
commit 7a09477782c88444039cae9d37074f35fda89bab
Author: Michael Hanke <michael.hanke at gmail.com>
Date:   Mon May 14 21:11:19 2012 +0200

    Commit forgotten changes.

diff --git a/debian/changelog b/debian/changelog
index eec7bce..3682b3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+mricron (0.20110812.1~dfsg.1-1) unstable; urgency=low
+
+  * New upstream.
+  * Rename npm to mricron-npm to prevent filename conflict with the
+    npm package (Closes: #623509).
+  * Bumped Standards-version to 3.9.2, no changes necessary.
+  * Fix typo in lintian override.
+  * Remove duplicate upstream changelog from package.
+  * Add patch to use recent lazarus version's API for GTK.
+
+ -- Michael Hanke <mih at debian.org>  Sun, 16 Oct 2011 11:45:31 +0200
+
 mricron (0.20110413.1~dfsg.1-1) unstable; urgency=low
 
   * New upstream version. FSL BET related patches are no obsolete
diff --git a/debian/patches/lazarus_modern b/debian/patches/lazarus_modern
new file mode 100644
index 0000000..2351ad9
--- /dev/null
+++ b/debian/patches/lazarus_modern
@@ -0,0 +1,14 @@
+From: Michael Hanke <mih at debian.org>
+Subject: Use modern lazarus version by default.
+
+--- 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/lucid-dsc-patch-lazarus_deps b/debian/patches/lucid-dsc-patch-lazarus_deps
index c309cae..7b1bd24 100644
--- a/debian/patches/lucid-dsc-patch-lazarus_deps
+++ b/debian/patches/lucid-dsc-patch-lazarus_deps
@@ -8,8 +8,8 @@ Forwarded: not-needed
  Priority: extra
  Maintainer: NeuroDebian Team <team at neuro.debian.net>
  Uploaders: Michael Hanke <mih at debian.org>, Yaroslav Halchenko <debian at onerussian.com>
--Build-Depends: debhelper (>= 7.0.50~), lcl-utils, lcl-gtk2 | lcl-gtk, lcl-units, fp-units-gfx, fp-units-misc, libgtk2.0-dev, imagemagick
-+Build-Depends: debhelper (>= 7.0.50~), lazarus (>=0.9.28), fp-units-gfx, fp-units-misc, libgtk2.0-dev, imagemagick
+-Build-Depends: debhelper (>= 7.0.50~), lcl-utils, lcl-gtk2 | lcl-gtk, lcl-units, fp-utils, fp-units-gfx, fp-units-misc, libgtk2.0-dev, imagemagick
++Build-Depends: debhelper (>= 7.0.50~), lazarus (>=0.9.28), fp-utils, fp-units-gfx, fp-units-misc, libgtk2.0-dev, imagemagick
  Standards-Version: 3.9.2
  Section: science
  Homepage: http://www.cabiatl.com/mricro/mricron/index.html
diff --git a/debian/patches/series b/debian/patches/series
index 399d8bf..c4e95b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+lazarus_modern
 debian_paths
 debian_version

-- 
Debian packaging of MRIcron