[hurd] 01/01: Move stage1 hurd-dev content to hurd-headers-dev

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository hurd.

commit 7467e55ab8a6c99e8e633a6215987b8858d1e6a7
Author: Samuel Thibault <address@hidden>
Date:   Fri Feb 26 11:57:33 2016 +0000

    Move stage1 hurd-dev content to hurd-headers-dev
    
    and stage2 hurd-dev content to libihash-dev.
---
 debian/changelog                |  4 +++-
 debian/control                  | 28 ++++++++++++++++++++++++++--
 debian/hurd-dev.install.in      | 20 ++++++++++----------
 debian/hurd-headers-dev.install |  1 +
 debian/libihash-dev.install.in  |  2 ++
 5 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0d000eb..932bcf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ hurd (1:0.7.git20160223-2) UNRELEASED; urgency=medium
     - Avoid hurd's sysv-rc, netdde, and xkb-data dependencies in stage3,
     they are only really useful for the final stage.
     - Avoid hurd-dev depend on hurd in stage3, for the same reason.
+  * Move stage1 hurd-dev content to hurd-headers-dev, and stage2 hurd-dev
+    content to libihash-dev.
 
- -- Samuel Thibault <address@hidden>  Fri, 26 Feb 2016 00:21:01 +0100
+ -- Samuel Thibault <address@hidden>  Fri, 26 Feb 2016 11:46:35 +0000
 
 hurd (1:0.7.git20160223-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index b272d3a..7a48b51 100644
--- a/debian/control
+++ b/debian/control
@@ -49,10 +49,34 @@ Section: libdevel
 Architecture: hurd-any
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${perl:Depends},
  libc0.3-dev (>= 2.13-31~) <!stage1>, hurd (= ${binary:Version}) <!stage1 
!stage2 !stage3>
-Replaces: hurd (<< 20130226-2~)
-Breaks: hurd (<< 20130226-2~)
+Provides: hurd-headers-dev, libihash-dev
+Replaces: hurd (<< 20130226-2~), hurd-headers-dev, libihash-dev
+Breaks: hurd (<< 20130226-2~), hurd-headers-dev, libihash-dev
+Build-Profiles: <!stage1 !stage2>
+Description: GNU Hurd (development files)
+ This package includes the header files and the static libraries.
+
+Package: hurd-headers-dev
+Priority: standard
+Section: libdevel
+Architecture: hurd-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Build-Profiles: <!stage3>
+Description: GNU Hurd (development files)
+ This package includes the header files and the static libraries.
+ .
+ This package is only used for bootstrap, it contains headers needed for libc
+
+Package: libihash-dev
+Priority: standard
+Section: libdevel
+Architecture: hurd-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Build-Profiles: <!stage1 !stage3>
 Description: GNU Hurd (development files)
  This package includes the header files and the static libraries.
+ .
+ This package is only used for bootstrap, it contains libihash needed for libc.
 
 Package: hurd-doc
 Priority: optional
diff --git a/debian/hurd-dev.install.in b/debian/hurd-dev.install.in
index 0463bd6..a8bb13e 100755
--- a/debian/hurd-dev.install.in
+++ b/debian/hurd-dev.install.in
@@ -1,12 +1,12 @@
 #! /usr/bin/dh-exec
-<!stage1 !stage2 !stage3> ../../libdde-linux26/Makeconf* 
usr/share/libdde_linux26
-<!stage1 !stage2 !stage3> ../../libdde-linux26/lib/src/libdde_*.a 
usr/lib/@DEB_HOST_MULTIARCH@
-<!stage1 !stage2 !stage3> ../../libdde-linux26/mk usr/share/libdde_linux26
-<!stage1 !stage2 !stage3> usr/share/libdde_linux26/build 
usr/share/libdde_linux26
-<!stage1 !stage2> ../local/cdrom.h usr/include/sys
-<!stage1 !stage2> ../local/soundcard.h usr/include/sys
-<!stage1 !stage2> bin/fstests
-<!stage1 !stage2> bin/timertest
+<!stage3> ../../libdde-linux26/Makeconf* usr/share/libdde_linux26
+<!stage3> ../../libdde-linux26/lib/src/libdde_*.a usr/lib/@DEB_HOST_MULTIARCH@
+<!stage3> ../../libdde-linux26/mk usr/share/libdde_linux26
+<!stage3> usr/share/libdde_linux26/build usr/share/libdde_linux26
+../local/cdrom.h usr/include/sys
+../local/soundcard.h usr/include/sys
+bin/fstests
+bin/timertest
 include/* usr/include
-<!stage1> lib/@DEB_HOST_MULTIARCH@/*.a
-<!stage1 !stage2> lib/@DEB_HOST_MULTIARCH@/*.so
+lib/@DEB_HOST_MULTIARCH@/*.a
+lib/@DEB_HOST_MULTIARCH@/*.so
diff --git a/debian/hurd-headers-dev.install b/debian/hurd-headers-dev.install
new file mode 100644
index 0000000..ebfce4b
--- /dev/null
+++ b/debian/hurd-headers-dev.install
@@ -0,0 +1 @@
+include/* usr/include
diff --git a/debian/libihash-dev.install.in b/debian/libihash-dev.install.in
new file mode 100755
index 0000000..676c9c5
--- /dev/null
+++ b/debian/libihash-dev.install.in
@@ -0,0 +1,2 @@
+#! /usr/bin/dh-exec
+lib/@DEB_HOST_MULTIARCH@/*.a

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git