diff -pruN 1.30/debian/changelog 1.30ubuntu1/debian/changelog
--- 1.30/debian/changelog	2021-12-11 12:58:13.000000000 +0000
+++ 1.30ubuntu1/debian/changelog	2021-12-27 21:22:14.000000000 +0000
@@ -1,3 +1,10 @@
+debian-junior (1.30ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - refresh control file for jammy.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 27 Dec 2021 22:22:14 +0100
+
 debian-junior (1.30) unstable; urgency=low
 
   [ Stefan Kropp ]
@@ -45,6 +52,14 @@ debian-junior (1.30) unstable; urgency=l
 
  -- Stefan Kropp <stefan.kropp@posteo.de>  Sat, 11 Dec 2021 13:58:13 +0100
 
+debian-junior (1.29ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - remove tupi package, gone in cosmic
+    - refresh control file for eoan.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 13 Jun 2019 21:42:05 +0000
+
 debian-junior (1.29) unstable; urgency=medium
 
   * Team upload.
@@ -62,6 +77,14 @@ debian-junior (1.29) unstable; urgency=m
 
  -- Andreas Tille <tille@debian.org>  Thu, 13 Jun 2019 18:06:45 +0200
 
+debian-junior (1.28ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - remove tupi package, gone in cosmic
+    - refresh control file for cosmic.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 12 Jan 2019 22:04:44 +0100
+
 debian-junior (1.28) unstable; urgency=medium
 
   [ Per Andersson ]
@@ -78,6 +101,14 @@ debian-junior (1.28) unstable; urgency=m
 
  -- Jonathan Carter <jcc@debian.org>  Sat, 12 Jan 2019 14:43:46 +0200
 
+debian-junior (1.27ubuntu1) cosmic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - remove tupi package, gone in cosmic
+    - refresh control file for cosmic.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 07 Sep 2018 11:45:41 +0200
+
 debian-junior (1.27) unstable; urgency=medium
 
   * Set Maintainer to debian-jr@lists.debian.org
@@ -94,6 +125,28 @@ debian-junior (1.27) unstable; urgency=m
 
  -- Andreas Tille <tille@debian.org>  Thu, 06 Sep 2018 13:00:33 +0200
 
+debian-junior (1.26ubuntu3) cosmic; urgency=medium
+
+  * Regenerate and refresh control file for cosmic.
+    - remove tupi package, gone in cosmic
+      (we should add it back if re-enters the archive in a future
+       release)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 20 Aug 2018 18:46:31 +0200
+
+debian-junior (1.26ubuntu2) bionic; urgency=medium
+
+  * Regenerate and refresh control file for bionic.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Wed, 15 Nov 2017 22:49:52 +0530
+
+debian-junior (1.26ubuntu1) artful; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Regenerate control file for artful.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Wed, 24 May 2017 14:34:34 +0530
+
 debian-junior (1.26) unstable; urgency=medium
 
   * Dropped Ben Armstrong from Uploaders
@@ -176,12 +229,24 @@ debian-junior (1.25) unstable; urgency=m
 
  -- Per Andersson <avtobiff@debian.org>  Sun, 06 Mar 2016 22:50:54 +0100
 
+debian-junior (1.24ubuntu1) wily; urgency=medium
+
+  * Regenerate control file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Mon, 25 May 2015 02:05:37 -0400
+
 debian-junior (1.24) unstable; urgency=medium
 
   * Rerender dependencies for Jessie
 
  -- Andreas Tille <tille@debian.org>  Sun, 29 Mar 2015 22:17:12 +0200
 
+debian-junior (1.23ubuntu1) vivid; urgency=medium
+
+  * Regenerate control file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sun, 14 Dec 2014 04:55:52 -0500
+
 debian-junior (1.23) unstable; urgency=medium
 
   [Andreas Tille]
diff -pruN 1.30/debian/control 1.30ubuntu1/debian/control
--- 1.30/debian/control	2021-12-11 12:58:13.000000000 +0000
+++ 1.30ubuntu1/debian/control	2021-12-27 21:22:14.000000000 +0000
@@ -40,21 +40,21 @@ Depends: ${misc:Depends},
 Recommends: cheese,
             gamine,
             gimp,
+            gpaint,
             inkscape,
             karbon,
             krita,
             mtpaint,
             mypaint,
             pencil2d,
+            pinta,
             pysiogame,
             rgbpaint,
             simple-scan,
             tupi,
-            tuxpaint
-Suggests: gcompris,
-          gpaint,
-          pinta,
-          xpaint
+            tuxpaint,
+            xpaint
+Suggests: gcompris
 Description: Debian Jr. Art
  Tools for children to produce artwork.  The simplest of these is
  tuxpaint, which is designed for small children.  It features sounds
@@ -342,9 +342,9 @@ Recommends: arduino,
             puredata,
             scratch,
             sonic-pi,
+            squeak-plugins-scratch,
             squeak-vm
-Suggests: gvrng,
-          squeak-plugins-scratch
+Suggests: gvrng
 Description: Debian Jr. programming
  The emphasis for this sampling of programming packages for children
  is first on simple interpreted languages.  Also important for using
