← Back to branch summary

~ubuntu-branches/ubuntu/utopic/cdbs/utopic

« back to all changes in this revision

Viewing changes to 1/rules/debhelper.mk.in

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2014-06-26 12:00:42 UTC
  • mfrom: (1.3.29 sid)
  • Revision ID: package-import@ubuntu.com-20140626120042-aqwvy6olr3kvoelc
Tags: 0.4.125ubuntu1
* Merge from Debian unstable. Remaining changes:
  - 1/rules/utils.mk.in: add some text before listing missing file to make
    it easier to see from the build log. (Debian #565771)
  - 1/class/gnome.mk.in: Call dh_translations.
  - test/testsuite_functions: Set NO_PKG_MANGLE so that tests do not fail
    with pkgstriptranslations installed. (Ubuntu-specific)
  - 1/rules/debhelper.mk.in: Call dh_scour.
  - debian/control.in: Add scour build and binary dependency (build dep for
    test suite).

Show diffs side-by-side

added added

removed removed

Lines of Context:
1/rules/debhelper.mk.in
147
147
DEB_DH_STRIP_ARGS ?= $(cdbs_dbg_package_option)
148
148
endif
149
149
 
150
 
# These variables are deprecated.
151
 
_cdbs_deprecated_vars += $(patsubst %,DEB_DH_INSTALL%_ARGS,_MENU _CRON INIT DEBCONF EMACSEN CATALOGS PAM LOGROTATE CHANGELOGS UDEV MIME DEB)
152
 
_cdbs_deprecated_vars += $(patsubst %,DEB_DH_%_ARGS,LINTIAN INSTALL STRIP COMPRESS FIXPERMS MD5SUMS BUILDDEB)
153
 
_cdbs_deprecated_vars += DEB_UPDATE_RCD_PARAMS DEB_STRIP_EXCLUDE DEB_COMPRESS_EXCLUDE DEB_FIXPERMS_EXCLUDE
154
 
# New in 0.4.85.
 
150
_cdbs_deprecated_vars += $(patsubst %,DEB_DH_INSTALL%_ARGS$(comma)0.4.85,\
 
151
        _MENU _CRON INIT DEBCONF EMACSEN CATALOGS PAM LOGROTATE \
 
152
        CHANGELOGS UDEV MIME DEB)
 
153
_cdbs_deprecated_vars += $(patsubst %,DEB_DH_%_ARGS$(comma)0.4.85,\
 
154
        LINTIAN INSTALL STRIP COMPRESS FIXPERMS MD5SUMS BUILDDEB)
 
155
_cdbs_deprecated_vars += $(patsubst %,DEB_%$(comma)0.4.85,\
 
156
        UPDATE_RCD_PARAMS STRIP_EXCLUDE COMPRESS_EXCLUDE FIXPERMS_EXCLUDE)
155
157
DEB_DH_INSTALL_MENU_ARGS_DEFAULT ?= $(DEB_DH_INSTALL_MENU_ARGS)
156
158
DEB_DH_INSTALL_CRON_ARGS_DEFAULT ?= $(DEB_DH_INSTALL_CRON_ARGS)
157
159
DEB_DH_SYSTEMD_ENABLE_ARGS_DEFAULT ?= $(DEB_DH_SYSTEMD_ENABLE_ARGS)
212
214
        dh_installinfo -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_INSTALL_INFO) 
213
215
        dh_installmenu -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALL_MENU_ARGS)
214
216
        dh_installcron -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALL_CRON_ARGS)
215
 
        $(if $(wildcard /usr/bin/dh_systemd_enable),dh_systemd_enable -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_SYSTEMD_ENABLE_ARGS))
216
217
        dh_installinit -p$(cdbs_curpkg) $(if $(call cdbs_expand_curvar,DEB_UPDATE_RCD_PARAMS),--update-rcd-params="$(call cdbs_strip_quotes,$(call cdbs_expand_curvar,DEB_UPDATE_RCD_PARAMS))") $(call cdbs_expand_curvar,DEB_DH_INSTALLINIT_ARGS)
217
 
        $(if $(wildcard /usr/bin/dh_systemd_start),dh_systemd_start -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_SYSTEMD_START_ARGS))
218
218
        dh_installdebconf -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALLDEBCONF_ARGS)
219
219
        dh_installemacsen -p$(cdbs_curpkg) $(if $(DEB_EMACS_PRIORITY),--priority=$(DEB_EMACS_PRIORITY)) $(if $(DEB_EMACS_FLAVOR),--flavor=$(DEB_EMACS_FLAVOR)) $(call cdbs_expand_curvar,DEB_DH_INSTALLEMACSEN_ARGS)
220
220
        dh_installcatalogs -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_INSTALLCATALOGS_ARGS)
226
226
        $(if $(wildcard /usr/bin/dh_lintian),dh_lintian -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_LINTIAN_ARGS))
227
227
        $(if $(wildcard /usr/bin/dh_bugfiles),dh_bugfiles -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_BUGFILES_ARGS))
228
228
        dh_install -p$(cdbs_curpkg) $(if $(DEB_DH_INSTALL_SOURCEDIR),--sourcedir=$(DEB_DH_INSTALL_SOURCEDIR)) $(call cdbs_expand_curvar,DEB_DH_INSTALL_ARGS)
 
229
        $(if $(wildcard /usr/bin/dh_systemd_enable),dh_systemd_enable -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_SYSTEMD_ENABLE_ARGS))
 
230
        $(if $(wildcard /usr/bin/dh_systemd_start),dh_systemd_start -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_SYSTEMD_START_ARGS))
229
231
# TODO: Use DEB_DH_LINK_ARGS as package-default var (not global addon)
230
232
        dh_link -p$(cdbs_curpkg) $(DEB_DH_LINK_ARGS) $(DEB_DH_LINK_$(cdbs_curpkg))
231
233
        $(if $(wildcard /usr/bin/dh_buildinfo),dh_buildinfo -p$(cdbs_curpkg) $(call cdbs_expand_curvar,DEB_DH_BUILDINFO_ARGS))