Record tabbar-el (2.2-2) in archive suite sid

3 files changed, 41 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 5489210..7a063ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tabbar-el (2.2-2) unstable; urgency=medium
+
+  * debian/copyright: Include the relevant parts of both upstream
+    discussions as comments (Closes: #904782).
+  * debian/control:
+    - Set maintainer to Debian Emacsen team.
+    - Drop emacs25 from Enhances, because emacs is now unversioned.
+  * Declare Standards-Version: 4.3.0 (no changes required).
+
+ -- Nicholas D Steeves <nsteeves@gmail.com>  Fri, 28 Dec 2018 17:41:05 -0700
+
 tabbar-el (2.2-1) unstable; urgency=medium
 
   * Initial release (Closes: #437114).
diff --git a/debian/control b/debian/control
index 1a6d05c..f4bcfc9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,11 @@
 Source: tabbar-el
 Section: editors
 Priority: optional
-Maintainer: Nicholas D Steeves <nsteeves@gmail.com>
+Maintainer: Debian Emacsen team <debian-emacsen@lists.debian.org>
+Uploaders: Nicholas D Steeves <nsteeves@gmail.com>
 Build-Depends: debhelper (>= 11~),
  dh-elpa
-Standards-Version: 4.1.5
+Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/emacsen-team/tabbar-el
 Vcs-Git: https://salsa.debian.org/emacsen-team/tabbar-el.git
 Homepage: https://github.com/dholm/tabbar
@@ -13,8 +14,7 @@ Package: elpa-tabbar
 Architecture: all
 Depends: ${elpa:Depends}, ${misc:Depends}
 Recommends: emacs (>= 46.0)
-Enhances: emacs,
- emacs25
+Enhances: emacs
 Description: Emacs minor mode that displays a tab bar at the top
  This library provides the Tabbar global minor mode which displays a
  tab bar in the header line of Emacs.  Click on a tab to select it.
diff --git a/debian/copyright b/debian/copyright
index 74dde32..72f4c04 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -37,9 +37,23 @@ Files: close-tab.tiff left_disabled.tiff left.tiff right_disabled.tiff
 Copyright: 2006, 2007, 2008, 2013 David Reitter
            2012, 2015 The Aquamacs Project
 License: GPL-3+
-Comment: Copyright was established with discussion with upstreams at:
+Comment: Copyright was established by examining the git history of both
+ projects, and with discussion with both upstreams, found at:
  https://github.com/dholm/tabbar/issues/31
  https://github.com/davidswelt/aquamacs-emacs/issues/138
+ I wrote:
+     1. Given that it's a fork of Aquamacs TabBarMode, does "the Aquamacs
+        Project" hold the copyright for everything that isn't attributed to
+        someone else, excluding the READMEs, which are presumably yours?
+        From what I can tell "everything else" would be all of the images.
+     2. Why are up.png and down.png not converted to tiff? I found the
+        instructions for conversion in README, but couldn't find an
+        explanation.
+ dholm replied:
+     1. Yes, that's correct.
+     2. The instructions are from Aquamacs and I don't know why some of them
+        were converted to tiff. Perhaps we should revert back to the original
+        pngs.
  Aquamacs plans to add copyright info for Tabbar, then, dholms's project
  can sync the file, at which time we can sync with his and these comments
  can be dropped.
@@ -50,9 +64,19 @@ License: GPL-3+
 Comment: Copyright was established with discussion with upstreams at:
  https://github.com/dholm/tabbar/issues/31
  https://github.com/davidswelt/aquamacs-emacs/issues/138
+ and also by examining the git history of both projects.  These two files
+ were originally committed by "champo", and this is documented in dholm's
+ copy, but not in davidswelt's.  At issue 138 on 26 Jul 2018, I wrote
+ 'After reading aquamacs/Icons/build/COPYING it sounds like [down.png and
+ up.png might also be copyright Adrian Chromenko], assuming that "champo"
+ is Adrian Chromenko'.  Later that day github user 'nathaniel' replied
+     Hi Nicholas,
+     I (Nathaniel Cunningham) am champo (my original sourceforge username).
+     I created the tabbar icons (not Adrian Chromenko).
  Aquamacs plans to add copyright info for Tabbar, then, dholms's project
  can sync the file, at which time we can sync with his and these comments
- can be dropped.
+ can be dropped.  At this time it sounds like Nathaniel Cunningham has
+ assigned copyright to The Aquamacs Project.
 
 Files: debian/*
 Copyright: 2018 Nicholas D Steeves <nsteeves@gmail.com>