diff -Nru a2jmidid-6+20100828.git60f75d9/a2jmidid.c a2jmidid-7/a2jmidid.c
--- a2jmidid-6+20100828.git60f75d9/a2jmidid.c	2010-08-28 01:31:03.000000000 +0000
+++ a2jmidid-7/a2jmidid.c	2011-01-16 12:18:37.000000000 +0000
@@ -497,7 +497,7 @@
 
   a2j_info("JACK MIDI <-> ALSA sequencer MIDI bridge, version " A2J_VERSION " (" GIT_VERSION ") built on %s", timestamp_str);
   a2j_info("Copyright 2006,2007 Dmitry S. Baikov");
-  a2j_info("Copyright 2007,2008,2009 Nedko Arnaudov");
+  a2j_info("Copyright 2007,2008,2009,2011 Nedko Arnaudov");
 
   if (dbus)
   {
diff -Nru a2jmidid-6+20100828.git60f75d9/debian/changelog a2jmidid-7/debian/changelog
--- a2jmidid-6+20100828.git60f75d9/debian/changelog	2011-01-12 16:51:13.000000000 +0000
+++ a2jmidid-7/debian/changelog	2011-03-02 09:43:20.000000000 +0000
@@ -1,3 +1,9 @@
+a2jmidid (7-1) unstable; urgency=low
+
+  * New upstream stable release.
+
+ -- Alessio Treglia <alessio@debian.org>  Wed, 02 Mar 2011 10:43:11 +0100
+
 a2jmidid (6+20100828.git60f75d9-1) unstable; urgency=low
 
   * Imported Upstream version 6+20100828.git60f75d9.
diff -Nru a2jmidid-6+20100828.git60f75d9/.gitignore a2jmidid-7/.gitignore
--- a2jmidid-6+20100828.git60f75d9/.gitignore	2010-08-28 01:31:03.000000000 +0000
+++ a2jmidid-7/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-/TAGS
-/.waf*
-/.lock-wscript
-/build
diff -Nru a2jmidid-6+20100828.git60f75d9/gitversion.h a2jmidid-7/gitversion.h
--- a2jmidid-6+20100828.git60f75d9/gitversion.h	1970-01-01 00:00:00.000000000 +0000
+++ a2jmidid-7/gitversion.h	2011-01-16 12:19:56.000000000 +0000
@@ -0,0 +1 @@
+#define GIT_VERSION "b169fb6b8e9e11ce1488d1964649aabedbb89ddf"
diff -Nru a2jmidid-6+20100828.git60f75d9/gitversion_regenerate.sh a2jmidid-7/gitversion_regenerate.sh
--- a2jmidid-6+20100828.git60f75d9/gitversion_regenerate.sh	2010-08-28 01:31:03.000000000 +0000
+++ a2jmidid-7/gitversion_regenerate.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-#set -x
-
-if test $# -ne 1 -a $# -ne 2
-then
-  echo "Usage: "`basename "$0"`" <file> [define_name]"
-  exit 1
-fi
-
-OUTPUT_FILE="`pwd`/${1}"
-TEMP_FILE="${OUTPUT_FILE}.tmp"
-
-#echo version...
-#pwd
-#echo $OUTPUT_FILE
-#echo $TEMP_FILE
-
-OLDPWD=`pwd`
-cd ..
-
-if test $# -eq 2
-then
-  DEFINE=${2}
-else
-  DEFINE=GIT_VERSION
-fi
-
-REV=$(git rev-parse HEAD)
-
-test -z "$(git diff-index --name-only HEAD)" || REV="$REV-dirty"
-
-echo "#define ${DEFINE} \"${REV}\"" > ${TEMP_FILE}
-if test ! -f ${OUTPUT_FILE}
-then
-  echo "Generated ${OUTPUT_FILE} (${REV})"
-  cp ${TEMP_FILE} ${OUTPUT_FILE}
-  if test $? -ne 0; then exit 1; fi
-else
-  if ! cmp -s ${OUTPUT_FILE} ${TEMP_FILE}
-  then echo "Regenerated ${OUTPUT_FILE} (${REV})"
-    cp ${TEMP_FILE} ${OUTPUT_FILE}
-    if test $? -ne 0; then exit 1; fi
-  fi
-fi
-
-cd "${OLDPWD}"
-
-rm ${TEMP_FILE}
-
-exit $?
diff -Nru a2jmidid-6+20100828.git60f75d9/Makefile a2jmidid-7/Makefile
--- a2jmidid-6+20100828.git60f75d9/Makefile	2010-08-28 01:31:03.000000000 +0000
+++ a2jmidid-7/Makefile	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-default:
-	echo "use ./waf instead"
-
-SOURCES = a2jmidid.c.* jack.c.* port.c.* port_thread.c.* port_hash.c.* 
-#SOURCES += dbus.c.* dbus_iface_control.c.* dbus_iface_introspectable.c.*
-#SOURCES += paths.c.*
-#SOURCES += log.c.*
-
-OMITS = --omit INIT_LIST_HEAD,list_empty,list_del,list_add_tail
-
-# rebuild a2jmidid_call_graph.png
-cg:
-	cd build && egypt $(OMITS) $(SOURCES) | dot -Tpng /dev/stdin > call_graph.png
-
-cgf:
-	cd build && egypt --include-external $(SOURCES) | dot -Tpng /dev/stdin > call_graph.png
diff -Nru a2jmidid-6+20100828.git60f75d9/NEWS a2jmidid-7/NEWS
--- a2jmidid-6+20100828.git60f75d9/NEWS	2010-08-28 01:31:03.000000000 +0000
+++ a2jmidid-7/NEWS	2011-01-16 12:12:44.000000000 +0000
@@ -1,4 +1,13 @@
-= Version 6 "Indzhe Voyvoda" on 2009-12-29
+= Version 7 "Paisius of Hilendar" on 2011-01-16 =
+ * MIDI processing improvements
+ * Use the JACK limit for max port name size (sr #2526)
+ * Adopt to shared library policy changes in some distros (sr #2547)
+ * dbus support can now be disabled at configure stage
+ * fix build on not so common platforms (LP: #556351)
+ * man pages (from Debian)
+ * reopen log file when it is deleted or replaced
+
+= Version 6 "Indzhe Voyvoda" on 2009-12-29 =
  * MIDI processing improvements
  * Handle large number of ports
  * a2j script (non-dbus-like behaviour for dbus environment)
@@ -6,7 +15,7 @@
  * Fix a use of invalid memory
  * Fix port miss that can occur if port appears during bridge startup
 
-= Version 5 "Athos" on 2009-06-13
+= Version 5 "Athos" on 2009-06-13 =
  * Fix thight loop on D-Bus disconnect
  * D-Bus signals for bridge start and stop
  * Fixed alsamidi "disappearing output" bug. (backport from jack1)
diff -Nru a2jmidid-6+20100828.git60f75d9/wscript a2jmidid-7/wscript
--- a2jmidid-6+20100828.git60f75d9/wscript	2010-08-28 01:31:03.000000000 +0000
+++ a2jmidid-7/wscript	2011-01-16 12:14:36.000000000 +0000
@@ -9,7 +9,7 @@
 import re
 
 APPNAME='a2jmidid'
-VERSION='6'
+VERSION='7'
 
 # these variables are mandatory ('/' are converted automatically)
 srcdir = '.'