diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rwxr-xr-x | debian/rules | 52 |
3 files changed, 38 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog index b79dc514..7bbbc38a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ hurd (20130105-2) UNRELEASED; urgency=low * Fix Vcs-* keys to point to anonscm.debian.org. * Remove asterisks from NEWS file. * Update lintian overrides. + * Switch rules from cdbs to the sequential `dh': + - Bump the debhelper build dependency to >= 7.0.50~. + - Drop the cdbs build dependency. -- Samuel Thibault <sthibault@debian.org> Sun, 27 Jan 2013 20:38:39 +0100 diff --git a/debian/control b/debian/control index 89eab9ff..256988bf 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,8 @@ Priority: required Maintainer: GNU Hurd Maintainers <debian-hurd@lists.debian.org> Standards-Version: 3.9.3 Build-Depends: mig (>= 1.3-2), gnumach-dev (>= 2:1.3.99.dfsg.cvs20070526), - libc0.3-dev (>= 2.13-38~), texinfo, texi2html, libncursesw5-dev, cdbs, - debhelper (>= 7), gcc-4.7, dpkg (>= 1.15.4) | install-info, autoconf, + libc0.3-dev (>= 2.13-38~), texinfo, texi2html, libncursesw5-dev, + debhelper (>= 7.0.50~), gcc-4.7, dpkg (>= 1.15.4) | install-info, autoconf, libparted-dev, libpciaccess-dev, libx11-dev, x11proto-core-dev, pkg-config, xkb-data, flex, bison Uploaders: Jeff Bailey <jbailey@raspberryginger.com>, diff --git a/debian/rules b/debian/rules index fddf2903..7a4e78ee 100755 --- a/debian/rules +++ b/debian/rules @@ -17,31 +17,35 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA # 02111-1307 USA. -DEB_BUILDDIR = $(DEB_SRCDIR)/build +DEB_DESTDIR = $(CURDIR)/debian/tmp + +CONFIGURE_ARGS = --disable-profile --enable-static-progs='ext2fs,ufs,iso9660fs' +SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd /usr/bin/w-hurd CC=gcc-4.7 -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk +%: + dh $@ -Bbuild --with autotools_dev -DEB_CONFIGURE_USER_FLAGS := --disable-profile --enable-static-progs='ext2fs,ufs,iso9660fs' -DEB_MAKE_INSTALL_TARGET = install prefix=$(DEB_DESTDIR) sysconfdir=$(DEB_DESTDIR)/etc localstatedir=$(DEB_DESTDIR)/var XKB_BASE=$(DEB_DESTDIR)/usr/share/X11/xkb -DEB_DBG_PACKAGES := -DEB_DBG_PACKAGE_hurd := hurd-dbg -DEB_DH_MAKESHLIBS_ARGS_hurd := --add-udeb="hurd-udeb" -DEB_DH_INSTALLINIT_ARGS_hurd := --name=hurd-console +override_dh_auto_configure: + dh_auto_configure -Bbuild -- $(CONFIGURE_ARGS) $(shell dpkg-buildflags --export=configure) -build/hurd:: - cd $(DEB_BUILDDIR)/doc && texi2html -split chapter ../../doc/hurd.texi +override_dh_auto_build: + dh_auto_build -Bbuild + cd build/doc && texi2html -split chapter ../../doc/hurd.texi $(MAKE) -C libdde_linux26 BUILDDIR=$(CURDIR)/build -clean:: +override_dh_auto_clean: + dh_auto_clean $(MAKE) -C libdde_linux26 cleanall rm -f $$(find libdde_linux26 -name \*.d) rm -fr libdde_linux26/build rm -fr libdde_linux26/lib/src/gen_crc32table libdde_linux26/lib/src/crc32table.h libdde_linux26/lib/src/timeconst.h -install/hurd:: +override_dh_auto_install: + dh_auto_install -Bbuild --destdir= -- prefix=$(DEB_DESTDIR) sysconfdir=$(DEB_DESTDIR)/etc localstatedir=$(DEB_DESTDIR)/var XKB_BASE=$(DEB_DESTDIR)/usr/share/X11/xkb + $(MAKE) -C libdde_linux26 INSTALLDIR=$(CURDIR)/debian/tmp/usr/share/libdde_linux26/build/include install + # runsystem is managed by update-alternatives mv debian/tmp/lib/hurd/runsystem debian/tmp/lib/hurd/runsystem.gnu @@ -59,12 +63,22 @@ install/hurd:: mv debian/tmp/sbin/halt debian/tmp/sbin/halt-hurd mv debian/tmp/sbin/reboot debian/tmp/sbin/reboot-hurd - $(MAKE) -C libdde_linux26 INSTALLDIR=$(CURDIR)/debian/tmp/usr/share/libdde_linux26/build/include install + # remove PIC static libraries + rm -f debian/tmp/lib/*_pic.a -SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd /usr/bin/w-hurd +override_dh_installinit: + dh_installinit -phurd --name=hurd-console + dh_installinit --remaining-packages + +override_dh_strip: + dh_strip -phurd --dbg-package=hurd-dbg + dh_strip --remaining-packages + +override_dh_fixperms: + dh_fixperms + chmod u+s $(patsubst %,$(CURDIR)/debian/hurd%,$(SUID_PROGRAMS)) -binary-predeb/hurd:: - chmod u+s $(patsubst %, $(CURDIR)/debian/$(cdbs_curpkg)%, $(SUID_PROGRAMS)) -binary-predeb/hurd-dev:: - rm -f $(CURDIR)/debian/hurd-dev/lib/*_pic.a +override_dh_makeshlibs: + dh_makeshlibs -phurd --add-udeb=hurd-udeb + dh_makeshlibs --remaining-packages |