Merge ~liushuyu-011/ubuntu/+source/hasciicam:merge-lp2065107 into ubuntu/+source/hasciicam:debian/sid

[Zixing Liu]

This MP merges hasciicam changes from Debian unstable into Ubuntu Oracular.

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/16125984/+listing-archive-extra

[Simon Quigley (tsimonq2)]

"Explicitly build-depend on libftp-dev instead of old ftplib-dev"

should be sent up to Debian

also, I re-indented your changelog entry

review: Approve

[Zixing Liu (liushuyu-011)]

Both deltas were sent to Debian.

* Explicitly build-depend on libftp-dev instead of old ftplib-dev

Delta sent as https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=832524

* debian/patches/10_desktop-file.patch: Fix invalid desktop file, don't include extension for icons. (LP: #1198969)

Delta sent as https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=717690

Unmerged commits

2a539d7... by Zixing Liu on 2024-05-07

update-maintainer

0639e67... by Zixing Liu on 2024-05-07

reconstruct-changelog

4b0188c... by Zixing Liu on 2024-05-07

merge-changelogs

93d1548... by Jeremy Bícha on 2016-08-28

  * Explicitly build-depend on libftp-dev instead of old ftplib-dev

a75179a... by Zixing Liu on 2024-05-07

  * debian/patches/10_desktop-file.patch: Fix invalid desktop file,
    don't include extension for icons. (LP: #1198969)

diff --git a/debian/changelog b/debian/changelog
index 476efd8..07e0df4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+hasciicam (1.1.2-1.1ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable (LP: #2065107). Remaining changes:
+  * debian/patches/10_desktop-file.patch: Fix invalid desktop file,
+    don't include extension for icons. (LP: #1198969)
+  * Explicitly build-depend on libftp-dev instead of old ftplib-dev
+
+ -- Zixing Liu <[e-mail]>  Tue, 07 May 2024 15:23:23 -0600
+
 hasciicam (1.1.2-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -5,6 +14,25 @@ hasciicam (1.1.2-1.1) unstable; urgency=low
 
  -- Ying-Chun Liu (PaulLiu) <[e-mail]>  Mon, 12 Dec 2022 02:40:02 +0800
 
+hasciicam (1.1.2-1ubuntu3) yakkety; urgency=medium
+
+  * Explicitly build-depend on libftp-dev instead of old ftplib-dev
+
+ -- Jeremy Bicha <[e-mail]>  Sun, 28 Aug 2016 19:08:04 -0400
+
+hasciicam (1.1.2-1ubuntu2) yakkety; urgency=medium
+
+  * No-change rebuild against latest ftplib
+
+ -- Jeremy Bicha <[e-mail]>  Sun, 28 Aug 2016 17:40:51 -0400
+
+hasciicam (1.1.2-1ubuntu1) saucy; urgency=low
+
+  * debian/patches/10_desktop-file.patch: Fix invalid desktop file,
+    don't include extension for icons. (LP: #1198969)
+
+ -- Andreas Moog <[e-mail]>  Tue, 23 Jul 2013 23:33:04 +0200
+
 hasciicam (1.1.2-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 57d3893..89caa9c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,14 @@
 Source: hasciicam
 Section: graphics
 Priority: optional
-Maintainer: Luca Bigliardi <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Luca Bigliardi <[e-mail]>
 Uploaders: Denis Roio <[e-mail]>, Filippo Giunchedi <[e-mail]>
 DM-Upload-Allowed: yes
 Vcs-Git: git://code.dyne.org/hasciicam.git
 Vcs-Browser: http://code.dyne.org/?r=hasciicam
 Homepage: http://ascii.dyne.org/
-Build-Depends: cdbs, debhelper (>= 9), libaa1-dev, ftplib-dev
+Build-Depends: cdbs, debhelper (>= 9), libaa1-dev, libftp-dev
 Standards-Version: 3.9.1
 
 Package: hasciicam
diff --git a/debian/patches/10_desktop-file.patch b/debian/patches/10_desktop-file.patch
new file mode 100644
index 0000000..d3c3d9f
--- /dev/null
+++ b/debian/patches/10_desktop-file.patch
@@ -0,0 +1,15 @@
+Description: Don't include extension for icon.
+Author: Andreas Moog <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1198969
+
+--- hasciicam-1.1.2.orig/share/hasciicam.desktop
++++ hasciicam-1.1.2/share/hasciicam.desktop
+@@ -5,7 +5,7 @@ GenericName=HasciiCam
+ Comment=(h)ascii for the masses!
+ Exec=hasciicam %U
+ TryExec=hasciicam
+-Icon=hasciicam.png
++Icon=hasciicam
+ Terminal=false
+ Categories=AudioVideo;
+ X-AppInstall-Package=hasciicam
diff --git a/debian/patches/series b/debian/patches/series
index 7aec9b4..9fcabce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 debian-changes-1.1.2-1
+10_desktop-file.patch