From 3c1155fc2eacee3d34154905af7f40372caa4e15 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sun, 24 Feb 2013 23:38:25 +0100 Subject: Bump debhelper compatibility to 7 - Bump compat to 7. - Bump the debhelper build dependency to >= 7. - Fix the dh_strip parameters. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index a64762cc..ebcd3869 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,7 @@ include /usr/share/cdbs/1/class/autotools.mk 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_DH_STRIP_ARGS := --dbg-package=hurd +DEB_DH_STRIP_ARGS_hurd := --dbg-package=hurd-dbg DEB_DH_MAKESHLIBS_ARGS_hurd := --add-udeb="hurd-udeb" build/hurd:: -- cgit v1.2.3 From 593b130d0a6a76265500bdc0ed63bce723ed98c7 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sun, 24 Feb 2013 23:57:52 +0100 Subject: hurd-console.default: rename to hurd.hurd-console.default; let it be installed by dh_installinit --- debian/changelog | 2 ++ debian/hurd-console.default | 31 ------------------------------- debian/hurd.hurd-console.default | 31 +++++++++++++++++++++++++++++++ debian/rules | 3 +-- 4 files changed, 34 insertions(+), 33 deletions(-) delete mode 100644 debian/hurd-console.default create mode 100644 debian/hurd.hurd-console.default (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index d32c7992..ad782253 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ hurd (20130105-2) UNRELEASED; urgency=low - Bump compat to 7. - Bump the debhelper build dependency to >= 7. - Fix the dh_strip parameters. + * Rename hurd-console.default to hurd.hurd-console.default, and let it be + installed by dh_installinit. -- Samuel Thibault Sun, 27 Jan 2013 20:38:39 +0100 diff --git a/debian/hurd-console.default b/debian/hurd-console.default deleted file mode 100644 index db67f3fa..00000000 --- a/debian/hurd-console.default +++ /dev/null @@ -1,31 +0,0 @@ -# Options to start the Hurd console. - -# Set this to 'false' to avoid running the Hurd console on bootup. -ENABLE='true' - -# The display driver, mandatory. Either `vga' or `ncursesw'. In the case of -# VGA, -f /some/where/file.bdf can be appended to load a specific font. -DISPLAY='-d vga' - -# The keyboard driver, mandatory. Either `pc_kbd' or `xkb' from the -# console-driver-xkb package. -KBD='-d pc_kbd' - -# this is bogus for a lot of cases, but the best we can do for now. -if [ -f /etc/default/keyboard ] -then - . /etc/default/keyboard -fi -[ -z "$XKBLAYOUT" ] || KBD="$KBD --keymap $XKBLAYOUT" - -# The keyboard repeater. Required for running X11. -KBD_REPEAT='--repeat=kbd' - -# The mouse driver. Optional. -MOUSE='-d pc_mouse --protocol=ps/2' - -# The mouse repeater. Required for running X11. -MOUSE_REPEAT='--repeat=mouse' - -# The pc speaker. Optional. -#SPEAKER='-d generic_speaker' diff --git a/debian/hurd.hurd-console.default b/debian/hurd.hurd-console.default new file mode 100644 index 00000000..db67f3fa --- /dev/null +++ b/debian/hurd.hurd-console.default @@ -0,0 +1,31 @@ +# Options to start the Hurd console. + +# Set this to 'false' to avoid running the Hurd console on bootup. +ENABLE='true' + +# The display driver, mandatory. Either `vga' or `ncursesw'. In the case of +# VGA, -f /some/where/file.bdf can be appended to load a specific font. +DISPLAY='-d vga' + +# The keyboard driver, mandatory. Either `pc_kbd' or `xkb' from the +# console-driver-xkb package. +KBD='-d pc_kbd' + +# this is bogus for a lot of cases, but the best we can do for now. +if [ -f /etc/default/keyboard ] +then + . /etc/default/keyboard +fi +[ -z "$XKBLAYOUT" ] || KBD="$KBD --keymap $XKBLAYOUT" + +# The keyboard repeater. Required for running X11. +KBD_REPEAT='--repeat=kbd' + +# The mouse driver. Optional. +MOUSE='-d pc_mouse --protocol=ps/2' + +# The mouse repeater. Required for running X11. +MOUSE_REPEAT='--repeat=mouse' + +# The pc speaker. Optional. +#SPEAKER='-d generic_speaker' diff --git a/debian/rules b/debian/rules index ebcd3869..643e378a 100755 --- a/debian/rules +++ b/debian/rules @@ -28,6 +28,7 @@ DEB_CONFIGURE_USER_FLAGS := --disable-profile --enable-static-progs='ext2fs,ufs, 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_DH_STRIP_ARGS_hurd := --dbg-package=hurd-dbg DEB_DH_MAKESHLIBS_ARGS_hurd := --add-udeb="hurd-udeb" +DEB_DH_INSTALLINIT_ARGS_hurd := --name=hurd-console build/hurd:: cd $(DEB_BUILDDIR)/doc && texi2html -split chapter ../../doc/hurd.texi @@ -57,8 +58,6 @@ install/hurd:: mv debian/tmp/sbin/halt debian/tmp/sbin/halt-hurd mv debian/tmp/sbin/reboot debian/tmp/sbin/reboot-hurd - install -m664 debian/hurd-console.default debian/hurd/etc/default/hurd-console - install -m664 $(DEB_SRCDIR)/console/motd.UTF8 debian/hurd/etc/ install -m664 $(DEB_SRCDIR)/release/servers.boot debian/hurd/boot/ -- cgit v1.2.3 From 6531b0013344d8a36ba208e1aaaebeb109f25ac9 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Mon, 25 Feb 2013 00:08:26 +0100 Subject: hurd/hurd-dev: install more stuff via dh_install ... instead of copying them manually. --- debian/changelog | 2 ++ debian/hurd-dev.install | 2 ++ debian/hurd.install | 2 ++ debian/rules | 7 ------- 4 files changed, 6 insertions(+), 7 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index ad782253..f80b8009 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ hurd (20130105-2) UNRELEASED; urgency=low - Fix the dh_strip parameters. * Rename hurd-console.default to hurd.hurd-console.default, and let it be installed by dh_installinit. + * hurd/hurd-dev: install more stuff via dh_install, instead of copying them + manually. -- Samuel Thibault Sun, 27 Jan 2013 20:38:39 +0100 diff --git a/debian/hurd-dev.install b/debian/hurd-dev.install index 2bfce014..181fc63f 100644 --- a/debian/hurd-dev.install +++ b/debian/hurd-dev.install @@ -5,3 +5,5 @@ libdde_linux26/lib/src/libdde_*.a usr/lib libdde_linux26/mk usr/share/libdde_linux26 libdde_linux26/Makeconf* usr/share/libdde_linux26 debian/tmp/usr/share/libdde_linux26/build usr/share/libdde_linux26 +debian/local/cdrom.h usr/include/sys +debian/local/soundcard.h usr/include/sys diff --git a/debian/hurd.install b/debian/hurd.install index 6dff36c9..4d0b2599 100644 --- a/debian/hurd.install +++ b/debian/hurd.install @@ -68,3 +68,5 @@ debian/tmp/etc/ttys debian/tmp/dev/MAKEDEV debian/tmp/share/msgids/*.msgids usr/share/msgids debian/tmp/usr/share/X11/xkb +console/motd.UTF8 etc +release/servers.boot boot diff --git a/debian/rules b/debian/rules index 643e378a..558aacbf 100755 --- a/debian/rules +++ b/debian/rules @@ -58,19 +58,12 @@ install/hurd:: mv debian/tmp/sbin/halt debian/tmp/sbin/halt-hurd mv debian/tmp/sbin/reboot debian/tmp/sbin/reboot-hurd - install -m664 $(DEB_SRCDIR)/console/motd.UTF8 debian/hurd/etc/ - install -m664 $(DEB_SRCDIR)/release/servers.boot debian/hurd/boot/ - $(MAKE) -C libdde_linux26 INSTALLDIR=$(CURDIR)/debian/tmp/usr/share/libdde_linux26/build/include install mkdir -p debian/tmp/usr/share/X11/locale echo Compose C > debian/tmp/usr/share/X11/locale/compose.dir touch debian/tmp/usr/share/X11/locale/Compose -install/hurd-dev:: - install -m644 debian/local/soundcard.h debian/tmp/include/sys - install -m644 debian/local/cdrom.h debian/tmp/include/sys - SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd /usr/bin/w-hurd binary-predeb/hurd:: -- cgit v1.2.3 From caa479ade429d5dfd28dc4847b5d00e147236b9a Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Mon, 25 Feb 2013 00:33:35 +0100 Subject: X11 compose data: turn into static files, install in hurd-udeb --- debian/changelog | 2 ++ debian/hurd-udeb.install | 1 + debian/local/X11/locale/Compose | 0 debian/local/X11/locale/compose.dir | 1 + debian/rules | 4 ---- 5 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 debian/local/X11/locale/Compose create mode 100644 debian/local/X11/locale/compose.dir (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index f80b8009..7d86e54e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ hurd (20130105-2) UNRELEASED; urgency=low installed by dh_installinit. * hurd/hurd-dev: install more stuff via dh_install, instead of copying them manually. + * Turn the X11 compose data into static files in the debian directory + (instead of being generated at build time), and install them in hurd-udeb. -- Samuel Thibault Sun, 27 Jan 2013 20:38:39 +0100 diff --git a/debian/hurd-udeb.install b/debian/hurd-udeb.install index 69e6a751..486763b8 100644 --- a/debian/hurd-udeb.install +++ b/debian/hurd-udeb.install @@ -2,6 +2,7 @@ debian/local/runsystem etc/hurd debian/local/setup-translators usr/lib/hurd debian/local/partman lib debian/local/finish-install.d usr/lib +debian/local/X11/locale usr/share/X11 debian/tmp/lib/*.so.* debian/tmp/lib/hurd/console/pc_kbd.so.* usr/lib/hurd/console debian/tmp/lib/hurd/console/pc_mouse.so.* usr/lib/hurd/console diff --git a/debian/local/X11/locale/Compose b/debian/local/X11/locale/Compose new file mode 100644 index 00000000..e69de29b diff --git a/debian/local/X11/locale/compose.dir b/debian/local/X11/locale/compose.dir new file mode 100644 index 00000000..875529f9 --- /dev/null +++ b/debian/local/X11/locale/compose.dir @@ -0,0 +1 @@ +Compose C diff --git a/debian/rules b/debian/rules index 558aacbf..66d4f6a5 100755 --- a/debian/rules +++ b/debian/rules @@ -60,10 +60,6 @@ install/hurd:: $(MAKE) -C libdde_linux26 INSTALLDIR=$(CURDIR)/debian/tmp/usr/share/libdde_linux26/build/include install - mkdir -p debian/tmp/usr/share/X11/locale - echo Compose C > debian/tmp/usr/share/X11/locale/compose.dir - touch debian/tmp/usr/share/X11/locale/Compose - SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd /usr/bin/w-hurd binary-predeb/hurd:: -- cgit v1.2.3 From 08857c45906a5cc923c8f56d66d4d86a022ebe7e Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Mon, 25 Feb 2013 12:41:30 +0100 Subject: fix debug symbols extraction --- debian/rules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 66d4f6a5..fddf2903 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,8 @@ include /usr/share/cdbs/1/class/autotools.mk 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_DH_STRIP_ARGS_hurd := --dbg-package=hurd-dbg +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 -- cgit v1.2.3 From 9ec31d5c01c74c4f0c66da7f96223828a9e5a4af Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Mon, 25 Feb 2013 18:46:58 +0100 Subject: Switch rules from cdbs to the sequential `dh' - Bump the debhelper build dependency to >= 7.0.50~. - Drop the cdbs build dependency. --- debian/changelog | 3 +++ debian/control | 4 ++-- debian/rules | 52 +++++++++++++++++++++++++++++++++------------------- 3 files changed, 38 insertions(+), 21 deletions(-) (limited to 'debian/rules') 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 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 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 , 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 -- cgit v1.2.3