From: Andreas Beckmann <anbe@debian.org>
Date: Sat, 2 Feb 2019 03:37:19 +0000 (+0100)
Subject: drop -dbg packages in favor of autogenerated -dbgsym packages
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~153
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ba0688744d73dd7591fbafdc5ec1b266b73cadcd;p=emacs.git

drop -dbg packages in favor of autogenerated -dbgsym packages
---

diff --git a/debian/changelog b/debian/changelog
index e833b9efb70..9b81a8565f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ emacs (1:26.1+1-3.2) UNRELEASED; urgency=medium
   * Add more transitional packages for ancient versioned packages
     emacs21{,-nox}, emacs22{,-gtk,-nox}.  (Closes: #916758)
 
+  * Drop -dbg packages in favor of autogenerated -dbgsym packages.
+
  -- Andreas Beckmann <anbe@debian.org>  Sat, 02 Feb 2019 03:46:40 +0100
 
 emacs (1:26.1+1-3.1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 27909053d74..be83b999ba5 100644
--- a/debian/control
+++ b/debian/control
@@ -63,15 +63,6 @@ Description: GNU Emacs editor (with Lucid GUI support)
  https://bugzilla.gnome.org/show_bug.cgi?id=85715 for more
  information.
 
-Package: emacs-lucid-dbg
-Section: debug
-Architecture: any
-Depends: emacs-lucid (= ${binary:Version}), ${misc:Depends}
-Description: Debugging symbols for emacs-lucid
- GNU Emacs is the extensible self-documenting text editor.  This
- package contains the debugging symbols for the emacs-lucid
- package.
-
 Package: emacs-nox
 Architecture: any
 Depends:
@@ -87,15 +78,6 @@ Description: GNU Emacs editor (without GUI support)
  package contains a version of Emacs compiled without support for X,
  and provides only a text terminal interface.
 
-Package: emacs-nox-dbg
-Section: debug
-Architecture: any
-Depends: emacs-nox (= ${binary:Version}), ${misc:Depends}
-Description: Debugging symbols for emacs-nox
- GNU Emacs is the extensible self-documenting text editor.  This
- package contains the debugging symbols for the emacs-nox
- package.
-
 Package: emacs-gtk
 Architecture: any
 Depends:
@@ -112,14 +94,6 @@ Description: GNU Emacs editor (with GTK+ GUI support)
  based on GTK+ (instead of the Lucid toolkit provided by the
  emacs-lucid package).
 
-Package: emacs-gtk-dbg
-Section: debug
-Architecture: any
-Depends: emacs-gtk (= ${binary:Version}), ${misc:Depends}
-Description: Debugging symbols for emacs-gtk
- GNU Emacs is the extensible self-documenting text editor.  This
- package contains the debugging symbols for the emacs-gtk package.
-
 Package: emacs-bin-common
 Architecture: any
 Depends: emacs-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -131,7 +105,7 @@ Description: GNU Emacs editor's shared, architecture dependent files
 
 Package: emacs-common
 Architecture: all
-Depends: emacsen-common (>= 3.0.0), install-info, ${shlibs:Depends}, ${misc:Depends}
+Depends: emacsen-common (>= 3.0.0), install-info, ${misc:Depends}
 Recommends: emacs-el
 Suggests: emacs-common-non-dfsg, ncurses-term
 Conflicts: emacs-el (<< ${source:Version}), cedet, eieio, speedbar, gnus-bonus-el
diff --git a/debian/rules b/debian/rules
index 4067d900162..b50b1615ac7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -525,13 +525,6 @@ override_dh_auto_install: $(autogen_install_files)
 	rm -rf $(install_dir_nox)
 	rm -rf $(install_dir_lucid)
 
-.PHONY: override_dh_strip
-override_dh_strip:
-	dh_strip -pemacs-gtk --dbg-package=emacs-gtk-dbg
-	dh_strip -pemacs-lucid --dbg-package=emacs-lucid-dbg
-	dh_strip -pemacs-nox --dbg-package=emacs-nox-dbg
-	dh_strip
-
 # This won't be necessary once strip-nondeterminism is fixed.
 .PHONY: override_dh_strip_nondeterminism
 override_dh_strip_nondeterminism: