diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/hurd-dev.install | 4 | ||||
| -rw-r--r-- | debian/hurd.install | 10 | ||||
| -rwxr-xr-x | debian/rules | 26 |
4 files changed, 32 insertions, 17 deletions
diff --git a/debian/changelog b/debian/changelog index f2595633..ae352640 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,16 @@ -hurd (20120219-2) UNRELEASED; urgency=low +hurd (20120222-2) UNRELEASED; urgency=low * control: Bump Standards-Version to 3.9.3 (no changes). -- Samuel Thibault <sthibault@debian.org> Sat, 25 Feb 2012 17:40:16 +0100 +hurd (20120222-1) unstable; urgency=low + + * New upstream snapshot + * Add libddekit and libdde_linux26 headers. + + -- Samuel Thibault <sthibault@debian.org> Wed, 22 Feb 2012 01:57:29 +0000 + hurd (20120219-1) unstable; urgency=low [ Samuel Thibault ] diff --git a/debian/hurd-dev.install b/debian/hurd-dev.install index 7bd68e9f..2bfce014 100644 --- a/debian/hurd-dev.install +++ b/debian/hurd-dev.install @@ -1,3 +1,7 @@ debian/tmp/lib/*.a lib debian/tmp/include/* usr/include debian/tmp/lib/*.so lib +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 diff --git a/debian/hurd.install b/debian/hurd.install index 2ffe0813..ad87beb5 100644 --- a/debian/hurd.install +++ b/debian/hurd.install @@ -67,8 +67,8 @@ debian/tmp/etc/login/README debian/tmp/etc/ttys debian/tmp/dev/MAKEDEV debian/tmp/share/msgids/hurd.msgids usr/share/msgids -dde_e100/dde_e100 /hurd/dde -dde_e1000/dde_e1000 /hurd/dde -dde_rtl8139/dde_rtl8139 /hurd/dde -dde_pcnet32/dde_pcnet32 /hurd/dde -dde_ne2k_pci/dde_ne2k_pci /hurd/dde +dde_e100/dde_e100 /hurd +dde_e1000/dde_e1000 /hurd +dde_rtl8139/dde_rtl8139 /hurd +dde_pcnet32/dde_pcnet32 /hurd +dde_ne2k_pci/dde_ne2k_pci /hurd diff --git a/debian/rules b/debian/rules index ee99469d..4ffe0fe3 100755 --- a/debian/rules +++ b/debian/rules @@ -29,23 +29,25 @@ DEB_MAKE_INSTALL_TARGET = install prefix=$(DEB_DESTDIR) sysconfdir=$(DEB_DESTDIR DEB_DH_STRIP_ARGS := --dbg-package=hurd DEB_DH_MAKESHLIBS_ARGS_hurd := --add-udeb="hurd-udeb" +DDE_DRIVERS = e100 e1000 pcnet32 rtl8139 ne2k_pci + build/hurd:: cd $(DEB_BUILDDIR)/doc && texi2html -split chapter ../../doc/hurd.texi - $(MAKE) -C libdde_linux26 BUILDDIR=$(PWD)/build - $(MAKE) -C dde_e100 BUILDDIR=$(PWD)/build - $(MAKE) -C dde_e1000 BUILDDIR=$(PWD)/build - $(MAKE) -C dde_pcnet32 BUILDDIR=$(PWD)/build - $(MAKE) -C dde_rtl8139 BUILDDIR=$(PWD)/build - $(MAKE) -C dde_ne2k_pci BUILDDIR=$(PWD)/build + $(MAKE) -C libdde_linux26 BUILDDIR=$(CURDIR)/build + for i in $(DDE_DRIVERS) ; \ + do \ + $(MAKE) -C dde_$$i BUILDDIR=$(CURDIR)/build || exit 1 ; \ + done clean:: $(MAKE) -C libdde_linux26 cleanall rm -f $$(find libdde_linux26 -name \*.d) - $(MAKE) -C dde_e100 cleanall - $(MAKE) -C dde_e1000 cleanall - $(MAKE) -C dde_pcnet32 cleanall - $(MAKE) -C dde_rtl8139 cleanall - $(MAKE) -C dde_ne2k_pci cleanall + 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 + for i in $(DDE_DRIVERS) ; \ + do \ + $(MAKE) -C dde_$$i cleanall ; \ + done install/hurd:: # runsystem is managed by update-alternatives @@ -70,6 +72,8 @@ install/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 + install/hurd-dev:: install -m644 debian/local/soundcard.h debian/tmp/include/sys install -m644 debian/local/cdrom.h debian/tmp/include/sys |