Merge ~ravi-sharma/ubuntu/+source/bogl:merge-2055159 into ubuntu/+source/bogl:debian/sid

[Ravi Kant Sharma]

[Ravi Kant Sharma (ravi-sharma)]

PPA: https://launchpad.net/~ravi-sharma/+archive/ubuntu/merge-2055159

Tests:
* Triggers:
  - Source bogl/0.1.18-22ubuntu2ppa2: Published
    + @amd64: https://autopkgtest.ubuntu.com/request.cgi?release=noble&package=bogl&arch=amd64&trigger=bogl%2F0.1.18-22ubuntu2ppa2&ppa=ravi-sharma%2Fmerge-2055159♻️
    + @arm64: https://autopkgtest.ubuntu.com/request.cgi?release=noble&package=bogl&arch=arm64&trigger=bogl%2F0.1.18-22ubuntu2ppa2&ppa=ravi-sharma%2Fmerge-2055159♻️
    + @armhf: https://autopkgtest.ubuntu.com/request.cgi?release=noble&package=bogl&arch=armhf&trigger=bogl%2F0.1.18-22ubuntu2ppa2&ppa=ravi-sharma%2Fmerge-2055159♻️
    + @i386: https://autopkgtest.ubuntu.com/request.cgi?release=noble&package=bogl&arch=i386&trigger=bogl%2F0.1.18-22ubuntu2ppa2&ppa=ravi-sharma%2Fmerge-2055159♻️
    + @ppc64el: https://autopkgtest.ubuntu.com/request.cgi?release=noble&package=bogl&arch=ppc64el&trigger=bogl%2F0.1.18-22ubuntu2ppa2&ppa=ravi-sharma%2Fmerge-2055159♻️
    + @s390x: https://autopkgtest.ubuntu.com/request.cgi?release=noble&package=bogl&arch=s390x&trigger=bogl%2F0.1.18-22ubuntu2ppa2&ppa=ravi-sharma%2Fmerge-2055159♻️
* Results:
  - bogl/0.1.18-22ubuntu2ppa2
    + ✅ bogl on noble for amd64 @ 28.02.24 13:24:05
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-noble-ravi-sharma-merge-2055159/noble/amd64/b/bogl/20240228_132405_d69aa@/log.gz
    + ✅ bogl on noble for arm64 @ 28.02.24 13:33:39
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-noble-ravi-sharma-merge-2055159/noble/arm64/b/bogl/20240228_133339_5aa2f@/log.gz
    + ✅ bogl on noble for armhf @ 28.02.24 13:27:51
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-noble-ravi-sharma-merge-2055159/noble/armhf/b/bogl/20240228_132751_97925@/log.gz
    + ✅ bogl on noble for i386 @ 28.02.24 13:21:37
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-noble-ravi-sharma-merge-2055159/noble/i386/b/bogl/20240228_132137_c2c72@/log.gz
    + ✅ bogl on noble for ppc64el @ 28.02.24 13:22:58
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-noble-ravi-sharma-merge-2055159/noble/ppc64el/b/bogl/20240228_132258_a4609@/log.gz
    + ✅ bogl on noble for s390x @ 28.02.24 13:20:31
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-noble-ravi-sharma-merge-2055159/noble/s390x/b/bogl/20240228_132031_60363@/log.gz
* Running: (none)
* Waiting: (none)

[Nick Rosbrook (enr0n)]

LGTM, thanks!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index db3ffaf..bfff0ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+bogl (0.1.18-22ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Update the hardcoded color map to the color palette selected by the
+      Canonical design team.
+
+ -- Ravi Kant Sharma <[e-mail]>  Wed, 28 Feb 2024 12:55:18 +0100
+
 bogl (0.1.18-22) unstable; urgency=medium
 
   * patches/makefile: Fix dependency computation on non-Linux.
@@ -12,6 +20,15 @@ bogl (0.1.18-21) unstable; urgency=medium
 
  -- Samuel Thibault <[e-mail]>  Sun, 21 Jan 2024 11:16:34 +0100
 
+bogl (0.1.18-20ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Update the hardcoded color map to the color palette selected by the
+      Canonical design team.
+    - Use .orig.tar.bz2 from pristine-tar (git ubuntu export-orig).
+
+ -- Danilo Egea Gondolfo <[e-mail]>  Mon, 28 Nov 2022 09:53:11 +0000
+
 bogl (0.1.18-20) unstable; urgency=medium
 
   * control: Make bogl-bterm Multi-Arch: foreign.
@@ -63,12 +80,48 @@ bogl (0.1.18-18) unstable; urgency=medium
 
  -- Samuel Thibault <[e-mail]>  Sun, 24 Jul 2022 23:54:27 +0200
 
+bogl (0.1.18-17ubuntu4) jammy; urgency=medium
+
+  * No-change rebuild for ppc64el baseline bump.
+
+ -- Łukasz 'sil2100' Zemczak <[e-mail]>  Wed, 23 Mar 2022 10:44:14 +0100
+
+bogl (0.1.18-17ubuntu3) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <[e-mail]>  Thu, 07 Oct 2021 12:09:39 +0200
+
+bogl (0.1.18-17ubuntu2) hirsute; urgency=medium
+
+  * No-change rebuild to drop the udeb package.
+
+ -- Matthias Klose <[e-mail]>  Mon, 22 Feb 2021 10:30:10 +0100
+
+bogl (0.1.18-17ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Update the hardcoded color map to the color palette selected by the
+      Canonical design team.
+    - Update .orig.tar.gz by recompressing Debian's with bzip2.
+
+ -- Steve Langasek <[e-mail]>  Wed, 06 Jan 2021 18:06:11 -0800
+
 bogl (0.1.18-17) unstable; urgency=medium
 
   * patches/flags: Fix passing build flags.
 
  -- Samuel Thibault <[e-mail]>  Fri, 01 Jan 2021 17:00:12 +0100
 
+bogl (0.1.18-16ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Update the hardcoded color map to the color palette selected by the
+      Canonical design team.
+    - Update .orig.tar.gz by recompressing Debian's with bzip2.
+
+ -- Steve Langasek <[e-mail]>  Mon, 02 Nov 2020 08:46:44 -0800
+
 bogl (0.1.18-16) unstable; urgency=low
 
   [ Debian Janitor ]
@@ -79,6 +132,19 @@ bogl (0.1.18-16) unstable; urgency=low
 
  -- Samuel Thibault <[e-mail]>  Sun, 01 Nov 2020 02:11:57 +0100
 
+bogl (0.1.18-15ubuntu1) groovy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Update the hardcoded color map to the color palette selected by the
+      Canonical design team.
+    - Update .orig.tar.gz by recompressing Debian's with bzip2.
+  * Dropped changes, included in Debian:
+    - debian/patches/makefile: Use DEB_HOST vars consistently, rather than
+      incorrectly using DEB_BUILD and uname to guess what we're building.
+    - debian/patches/makefile: Don't build vga16 on arm, due to glibc 2.30.
+
+ -- Steve Langasek <[e-mail]>  Wed, 20 May 2020 13:42:04 -0700
+
 bogl (0.1.18-15) unstable; urgency=medium
 
   * rules: Rely on pre-initialized dpkg-architecture variables.
@@ -107,6 +173,23 @@ bogl (0.1.18-14) unstable; urgency=medium
 
  -- Samuel Thibault <[e-mail]>  Sat, 21 Sep 2019 00:38:50 +0200
 
+bogl (0.1.18-13ubuntu2) eoan; urgency=medium
+
+  * debian/patches/makefile: Use DEB_HOST vars consistently, rather than
+    incorrectly using DEB_BUILD and uname to guess what we're building.
+  * debian/patches/makefile: Don't build vga16 on arm, due to glibc 2.30.
+
+ -- Adam Conrad <[e-mail]>  Fri, 20 Sep 2019 04:10:28 -0600
+
+bogl (0.1.18-13ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Update the hardcoded color map to the color palette selected by the
+      Canonical design team.
+    - Update .orig.tar.gz by recompressing Debian's with bzip2.
+
+ -- Steve Langasek <[e-mail]>  Mon, 22 Apr 2019 16:06:13 -0700
+
 bogl (0.1.18-13) unstable; urgency=medium
 
   * patches/invisible: Call iswspace instead of isspace, fixes crash on
@@ -114,6 +197,15 @@ bogl (0.1.18-13) unstable; urgency=medium
 
  -- Samuel Thibault <[e-mail]>  Thu, 08 Mar 2018 23:47:43 +0100
 
+bogl (0.1.18-12ubuntu1) artful; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Update the hardcoded color map to the color palette selected by the
+      Canonical design team.
+  * Update .orig.tar.gz by recompressing Debian's with bzip2.
+
+ -- Matthias Klose <[e-mail]>  Sat, 07 Oct 2017 15:19:52 +0200
+
 bogl (0.1.18-12) unstable; urgency=medium
 
   * patches: Switch to 3.0 patch system.
@@ -125,6 +217,15 @@ bogl (0.1.18-12) unstable; urgency=medium
 
  -- Samuel Thibault <[e-mail]>  Thu, 05 Oct 2017 22:56:47 +0200
 
+bogl (0.1.18-11ubuntu1) yakkety; urgency=medium
+
+  * Resynchronise with Debian; remaining changes:
+    - Update the hardcoded color map to the color palette selected by the
+      Canonical design team.
+    - Non-matching .orig.tar.gz.
+
+ -- Matthias Klose <[e-mail]>  Tue, 02 Aug 2016 13:47:07 +0200
+
 bogl (0.1.18-11) unstable; urgency=medium
 
   * compat: Bump to 9.
@@ -151,6 +252,15 @@ bogl (0.1.18-10) unstable; urgency=low
 
  -- Samuel Thibault <[e-mail]>  Tue, 27 Oct 2015 21:24:35 +0100
 
+bogl (0.1.18-9ubuntu1) saucy; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Update the hardcoded color map to the color palette selected by the
+      Canonical design team.
+    - Non-matching .orig.tar.gz.
+
+ -- Colin Watson <[e-mail]>  Fri, 28 Jun 2013 10:48:59 +0100
+
 bogl (0.1.18-9) unstable; urgency=low
 
   * Replace libgd2-{noxpm,xpm}-dev build-depend with libgd2-dev.
@@ -158,6 +268,23 @@ bogl (0.1.18-9) unstable; urgency=low
 
  -- Samuel Thibault <[e-mail]>  Thu, 27 Jun 2013 17:50:09 +0200
 
+bogl (0.1.18-8ubuntu2) saucy; urgency=low
+
+  * Rebuild for libgd3.
+
+ -- Colin Watson <[e-mail]>  Sun, 19 May 2013 23:46:01 +0100
+
+bogl (0.1.18-8ubuntu1) quantal; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Update the hardcoded color map to the color palette selected by the
+      Canonical design team.
+  * The .orig.tar.gz differs from Debian because 0.1.18-4ubuntu1 incorrectly
+    included an .orig.tar.gz.  Unfortunately there's nothing we can do to
+    fix this mistake until the upstream version number changes.
+
+ -- Colin Watson <[e-mail]>  Mon, 11 Jun 2012 15:44:31 +0100
+
 bogl (0.1.18-8) unstable; urgency=low
 
   * Fix non-linux archs build (Closes: Bug#671041).
@@ -208,6 +335,16 @@ bogl (0.1.18-5) unstable; urgency=low
 
  -- Samuel Thibault <[e-mail]>  Sun, 20 Mar 2011 19:03:58 +0100
 
+bogl (0.1.18-4ubuntu1) natty; urgency=low
+
+  * bterm.c:
+    - update the hardcoded color map to the color palette selected by
+      the Canonical Design Team, LP: #730672;
+    - ideally, bterm.c would read these from the configuration file,
+      /etc/vtrgb
+
+ -- Dustin Kirkland <[e-mail]>  Thu, 17 Mar 2011 15:02:28 -0500
+
 bogl (0.1.18-4) unstable; urgency=low
 
   * QA upload.
@@ -542,3 +679,4 @@ Local variables:
 mode: debian-changelog
 add-log-mailing-address "[e-mail]"
 End:
+
diff --git a/debian/control b/debian/control
index 4840765..421940b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: bogl
 Section: devel
 Priority: optional
-Maintainer: Samuel Thibault <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Samuel Thibault <[e-mail]>
 Build-Depends: debhelper-compat (= 12), dh-exec, libgd-dev [linux-any], ncurses-term
 Rules-Requires-Root: no
 Standards-Version: 4.6.0
diff --git a/debian/patches/series b/debian/patches/series
index 90640ff..dd580fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,3 +33,4 @@ Fix-crash-caused-by-invalid-term-yorig.patch
 SGR0-ul
 SGR-multiarg
 boglinfo
+ubuntu-colors.diff
diff --git a/debian/patches/ubuntu-colors.diff b/debian/patches/ubuntu-colors.diff
new file mode 100644
index 0000000..662f58a
--- /dev/null
+++ b/debian/patches/ubuntu-colors.diff
@@ -0,0 +1,29 @@
+diff -pruN 0.1.18-11/bterm.c 0.1.18-11ubuntu1/bterm.c
+--- 0.1.18-11/bterm.c	2016-08-02 18:36:09.000000000 +0000
++++ 0.1.18-11ubuntu1/bterm.c	2016-08-02 18:36:09.000000000 +0000
+@@ -44,15 +44,16 @@
+ 
+ static const unsigned char palette[16][3] = 
+   {
+-    {0x00, 0x00, 0x00},	/* 0: Black. */
+-    {0xaa, 0x00, 0x00},	/* 1: Red. */
+-    {0x00, 0xaa, 0x00},	/* 2: Green. */
+-    {0xaa, 0xaa, 0x00},	/* 3: Brown. */
+-    {0x00, 0x00, 0xaa},	/* 4: Blue. */
+-    {0xaa, 0x00, 0xaa},	/* 5: Magenta. */
+-    {0x00, 0xaa, 0xaa},	/* 6: Cyan. */
+-    {0xaa, 0xaa, 0xaa},	/* 7: Light gray. */
+-    {0x55, 0x55, 0x55},	/* 0: Light Gray. */
++    /* Colors selected by Canonical's Design Team */
++    {0x01, 0x01, 0x01},	/* 0: Black. */
++    {0xde, 0x38, 0x2b},	/* 1: Red. */
++    {0x39, 0xb5, 0x4a},	/* 2: Green. */
++    {0xff, 0xc7, 0x06},	/* 3: Brown. */
++    {0x00, 0x6f, 0xb8},	/* 4: Blue. */
++    {0x76, 0x26, 0x71},	/* 5: Magenta. */
++    {0x2c, 0xb5, 0xe9},	/* 6: Cyan. */
++    {0xe1, 0xe1, 0xe1},	/* 7: Light gray. */
++    {0x80, 0x80, 0x80},	/* 0: Light Gray. */
+     {0xff, 0x00, 0x00},	/* 1: Light Red. */
+     {0x00, 0xff, 0x00},	/* 2: Light Green. */
+     {0xff, 0xff, 0x00},	/* 3: Yellow. */