From ba04d02c77913a3bb8cc91e04ad31f79da87c366 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Wed, 4 May 2016 23:49:10 +0200 Subject: sync with upstream packaging --- debian/changelog | 7 +++++-- debian/control | 2 +- debian/rules | 12 ++++++------ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index f4d99b3b..1294239d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ -hurd (1:0.7.git20160502-2) UNRELEASED; urgency=medium +hurd (1:0.7.git20160502-2) unstable; urgency=medium * Bump gnumach-dev build-dep to fix stdint use in headers. + * rules: Add hurd-prof package to ship gprof versions of the main + translators. + * control: Depend on recent-enough gcc-5 to have gprof working. - -- Samuel Thibault Tue, 03 May 2016 09:58:10 +0200 + -- Samuel Thibault Wed, 04 May 2016 18:03:36 +0000 hurd (1:0.7.git20160502-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 5307dcf9..c2dfa08c 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: required Maintainer: GNU Hurd Maintainers Standards-Version: 3.9.7 -Build-Depends: mig (>= 1.4-3~) , gnumach-dev (>= 1.6+git20160502-1~) , +Build-Depends: mig (>= 1.4-3~) , gnumach-dev (>= 1.6+git20160502-1~) , gcc-5 (>= 5.3.1-15~), libc0.3-dev (>= 2.17-94~) , texinfo, libncursesw5-dev , debhelper (>= 9.20150628), dpkg-dev (>= 1.17.14), dh-exec (>= 0.17), autoconf, dh-autoreconf, libparted-dev , libpciaccess-dev , libx11-dev , x11proto-core-dev , pkg-config , diff --git a/debian/rules b/debian/rules index 1bd31917..ea06bc88 100755 --- a/debian/rules +++ b/debian/rules @@ -67,7 +67,7 @@ endif override_dh_auto_configure: dh_auto_configure -Bbuild-deb -- $(CONFIGURE_ARGS) $(CONFIGURE_ARGS_deb) $(shell dpkg-buildflags --export=configure) -ifneq (,$(filter prof,$(DEB_BUILD_PROFILES))) +ifeq (,$(filter noprof,$(DEB_BUILD_PROFILES))) dh_auto_configure -Bbuild-prof -- $(CONFIGURE_ARGS) $(CONFIGURE_ARGS_deb) $(shell DEB_CFLAGS_APPEND=-pg dpkg-buildflags --export=configure) endif ifeq (,$(filter stage1 stage2 stage3 noudeb,$(DEB_BUILD_PROFILES))) @@ -85,7 +85,7 @@ else dh_auto_build -Bbuild-udeb endif dh_auto_build -Bbuild-deb -ifneq (,$(filter prof,$(DEB_BUILD_PROFILES))) +ifeq (,$(filter noprof,$(DEB_BUILD_PROFILES))) dh_auto_build -Bbuild-prof for i in $(TRANSLATORS_PROF) ; do \ $(MAKE) -C build-prof/$$i $$i.static ; \ @@ -99,7 +99,7 @@ endif override_dh_auto_clean: dh_auto_clean -Bbuild-deb -ifneq (,$(filter prof,$(DEB_BUILD_PROFILES))) +ifeq (,$(filter noprof,$(DEB_BUILD_PROFILES))) dh_auto_clean -Bbuild-prof endif ifeq (,$(filter stage1 stage2 stage3 noudeb,$(DEB_BUILD_PROFILES))) @@ -119,7 +119,7 @@ ifneq (,$(filter stage1 stage2,$(DEB_BUILD_PROFILES))) endif else dh_auto_install -Bbuild-deb -- prefix=$(DEB_DESTDIR) libdir=$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH) libexecdir=$(DEB_DESTDIR)/lib/hurd sysconfdir=$(DEB_DESTDIR)/etc localstatedir=$(DEB_DESTDIR)/var XKB_BASE=$(DEB_DESTDIR)/usr/share/X11/xkb -ifneq (,$(filter prof,$(DEB_BUILD_PROFILES))) +ifeq (,$(filter noprof,$(DEB_BUILD_PROFILES))) install -d $(DEB_DESTDIR_PROF)/hurd for i in $(TRANSLATORS_PROF) ; do \ install -m 755 build-prof/$$i/$$i.static $(DEB_DESTDIR_PROF)/hurd/$$i.prof ; \ @@ -165,7 +165,7 @@ override_dh_install: $(INSTALL_generated) ifeq (,$(filter stage1 stage2 stage3 noudeb,$(DEB_BUILD_PROFILES))) dh_install $(addprefix -p,$(filter %-udeb,$(shell dh_listpackages))) --sourcedir=debian/tmp-udeb endif -ifneq (,$(filter prof,$(DEB_BUILD_PROFILES))) +ifeq (,$(filter noprof,$(DEB_BUILD_PROFILES))) dh_install -phurd-prof --sourcedir=debian/tmp-prof endif dh_install --remaining-packages --list-missing --sourcedir=debian/tmp @@ -185,7 +185,7 @@ override_dh_strip: ifeq (,$(filter stage1 stage2,$(DEB_BUILD_PROFILES))) dh_strip -phurd-libs0.3 -phurd --ddeb-migration='hurd-dbg (<< 1:0.7.git20160114-2~)' endif - dh_strip --remaining-packages + dh_strip -Nhurd-prof --remaining-packages override_dh_fixperms: dh_fixperms -- cgit v1.2.3