diff -u oregano-0.69.1/debian/changelog oregano-0.69.1/debian/changelog
--- oregano-0.69.1/debian/changelog
+++ oregano-0.69.1/debian/changelog
@@ -1,3 +1,12 @@
+oregano (0.69.1-2ubuntu1) maverick; urgency=low
+
+  * Merge from Debian Unstable (LP: #623357), remaining changes:
+    - debian/patches/line.drawing.dpatch:
+      + When moving a wire so that it joins with another delete the moved
+        wire, as well as extending the other.
+
+ -- Bilal Akhtar <bilalakhtar@ubuntu.com>  Tue, 24 Aug 2010 15:34:56 +0300
+
 oregano (0.69.1-2) unstable; urgency=low
 
   * Disable omit-frame-pointer optimization to avoid segfault in amd64.
@@ -5,6 +14,15 @@
 
  -- Maximiliano Curia <maxy@debian.org>  Sun, 15 Aug 2010 16:50:23 -0300
 
+oregano (0.69.1-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #404477
+    + Add debian/patches/line.drawing.dpatch:
+      - When moving a wire so that it joins with another delete the moved
+        wire, as well as extending the other. (LP: #60777)
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Sat, 25 Jul 2009 14:44:58 +0530
+
 oregano (0.69.1-1) unstable; urgency=low
 
   * New upstream release.
@@ -17,6 +35,14 @@
 
  -- Maximiliano Curia <maxy@debian.org>  Wed, 22 Jul 2009 19:27:35 -0300
 
+oregano (0.69.0-2ubuntu1) intrepid; urgency=low
+
+  * Add debian/patches/line.drawing.dpatch:
+    - When moving a wire so that it joins with another delete the moved
+      wire, as well as extending the other. (LP: #60777)
+
+ -- James Westby <james.westby@canonical.com>  Thu, 02 Oct 2008 20:07:16 +0100
+
 oregano (0.69.0-2) unstable; urgency=low
 
   * Fixed dpkg-shlibs warnings.
@@ -259,0 +286 @@
+
diff -u oregano-0.69.1/debian/control oregano-0.69.1/debian/control
--- oregano-0.69.1/debian/control
+++ oregano-0.69.1/debian/control
@@ -1,7 +1,8 @@
 Source: oregano
 Section: electronics
 Priority: optional
-Maintainer: Maximiliano Curia <maxy@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Maximiliano Curia <maxy@debian.org>
 Build-Depends: debhelper (>= 5), dpatch, scons, libgnome2-dev, libgnomeui-dev,
                libxml2-dev, libgtk2.0-dev, libgnomeprintui2.2-dev,
                libgtksourceview2.0-dev, libglade2-dev, intltool, scrollkeeper,
diff -u oregano-0.69.1/debian/patches/00list oregano-0.69.1/debian/patches/00list
--- oregano-0.69.1/debian/patches/00list
+++ oregano-0.69.1/debian/patches/00list
@@ -2,0 +3 @@
+line.drawing
only in patch2:
unchanged:
--- oregano-0.69.1.orig/debian/patches/line.drawing.dpatch
+++ oregano-0.69.1/debian/patches/line.drawing.dpatch
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run 
+## Author: Fole
+## Ubuntu bug: https://bugs.edge.launchpad.net/ubuntu/+source/oregano/+bug/60777
+## Upstream: http://gforge.lug.fi.uba.ar/tracker/index.php?func=detail&aid=1307&group_id=11&atid=129
+## Description: When moving a wire so that it joins with another delete the moved one, as well as extending the other.
+
+@DPATCH@
+diff -urNad oregano-0.69.1~/src/sheet/sheet-item.c oregano-0.69.1/src/sheet/sheet-item.c
+--- oregano-0.69.1~/src/sheet/sheet-item.c	2009-07-22 07:05:34.000000000 -0300
++++ oregano-0.69.1/src/sheet/sheet-item.c	2009-07-25 14:40:16.000000000 +0530
+@@ -507,7 +507,11 @@
+ 
+ 				item_data = SHEET_ITEM (list->data)->priv->data;
+ 				item_data_move (item_data, &delta);
+-				item_data_register (item_data);
++				if (item_data_register(item_data) == -1) {
++					/* Merged item needs to be deleted */
++					g_object_unref (G_OBJECT (item_data));
++					gtk_object_destroy(GTK_OBJECT(list->data));
++				}
+ 			}
+ 
+ 			break;