[vim] 07/07: Migrate to automatic -dbgsym packages

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit cf485aa66700237f44721e5f6241c94728a4311e
Author: James McCoy <jamessan at debian.org>
Date:   Mon Mar 28 23:06:18 2016 -0400

    Migrate to automatic -dbgsym packages
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog |  1 +
 debian/control   | 13 -------------
 debian/rules     | 18 ++++--------------
 3 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a77a5e9..9db0463 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ vim (2:7.4.1683-1) UNRELEASED; urgency=medium
   * Improve reproducibility of Vim builds.  (Closes: #787327)
     + Use $SOURCE_DATE_EPOCH to set the compilation time displayed in :version
     + Set a static value for configure's --with-compiledby argument
+  * Migrate to automatic -dbgsym packages
 
  -- James McCoy <jamessan at debian.org>  Mon, 28 Mar 2016 21:14:49 -0400
 
diff --git a/debian/control b/debian/control
index 7bc5812..5d0a2cf 100644
--- a/debian/control
+++ b/debian/control
@@ -114,19 +114,6 @@ Description: Vi IMproved - enhanced vi editor
  version of Vim.  See the other vim-* packages if you need more
  (or less).
 
-Package: vim-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: vim (= ${binary:Version}) | vim-gtk (= ${binary:Version}) |
- vim-gnome (= ${binary:Version}) | vim-nox (= ${binary:Version}) |
- vim-common (= ${binary:Version}) | vim-athena (= ${binary:Version}) |
- vim-tiny (= ${binary:Version}), ${misc:Depends}
-Description: Vi IMproved - enhanced vi editor (debugging symbols)
- Vim is an almost compatible version of the UNIX editor Vi.
- .
- This package contains gdb debugging symbols for the vim packages.
-
 Package: vim-gtk
 Priority: extra
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 76fba3c..68bd6b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -434,8 +434,8 @@ install-stamp-vim-basic: build-stamp-vim-basic $(DOT_IN_DEPS)
 	dh_link
 	
 	 # all excepts vim
-	dh_installchangelogs -Nvim -pvim-dbg debian/changelog.upstream
-	dh_installdocs -pvim-dbg
+	dh_installchangelogs -Nvim debian/changelog.upstream
+	dh_installdocs
 	dh_installmime
 	
 	env -u DH_OPTIONS dh_bugfiles -A -pvim
@@ -524,23 +524,13 @@ binary-indep: install-stamp-vim-basic install-stamp-indep
 	dh_md5sums
 	dh_builddeb -- -Zxz
 
-binary-arch: export DH_OPTIONS=-pvim-dbg
 binary-arch: $(foreach v,$(VARIANTS),binary-arch-$(v))
-	dh_testdir
-	dh_testroot
-	dh_compress
-	dh_fixperms
-	dh_lintian
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb -- -Zxz
 
 binary-arch-vim-basic: export DH_OPTIONS=-pvim-common -pvim
 binary-arch-vim-basic: install-stamp-vim-basic
 	dh_testdir
 	dh_testroot
-	dh_strip --dbg-package=vim-dbg
+	dh_strip --dbgsym-migration='vim-dbg (<< 2:7.4.1683-1~)'
 	dh_compress
 	dh_fixperms
 	dh_lintian
@@ -554,7 +544,7 @@ binary-arch-%: export DH_OPTIONS=-p$* $(foreach v,$(VARIANTS_SKIP),-N$(v))
 binary-arch-%: install-stamp-%
 	dh_testdir
 	dh_testroot
-	dh_strip --dbg-package=vim-dbg
+	dh_strip --dbgsym-migration='vim-dbg (<< 2:7.4.1683-1~)'
 	dh_compress
 	dh_fixperms
 	dh_lintian

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git