do_backport

@@ -59,8 +59,8 @@ if [ -n "$exists" ] ; then
     # debug: check whether all is OK, if the above works several times remove next line
     # edit debian/changelog
     if grep -q -e '^<<<<<<<' -e '^=======' debian/control ; then
-      echo "There are merge issues in debian/changelog"
-      edit debian/changelog
+      echo "There are merge issues in debian/control"
+      edit debian/control
     fi
     git commit || true
   fi

seek_outdated_med-packages

@@ -17,7 +17,7 @@ SELECT source  AS "source                       ", version, upstream_version,
        array_to_string(array_sort(uploaders),',') AS "uploaders                      ",
         changed_by_name AS "Last uploader       ", date AS "Last uploaded" FROM (
   SELECT distinct u.source,
-         regexp_replace(regexp_replace(regexp_replace(u.version, '^[0-9]:', ''), '-[0-9]+$', ''), '\+dfsg[0-9]*', '') AS version,
+         regexp_replace(regexp_replace(regexp_replace(u.version, '^[0-9]:', ''), '-[.0-9]+$', ''), '\+dfsg[0-9]*', '') AS version,
          upstream_version, status, up.uploaders, uh.changed_by_name, uh.date
     FROM upstream u 
     JOIN (SELECT source, package, release, maintainer_email, regexp_replace(version, '\+b[0-9]+$', '') AS version FROM packages)  p ON p.source=u.source -- make sure binNMU version will be stripped