[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] Debian GNU Hurd packaging branch, master, updated. debian/20130226
From: |
Pino Toscano |
Subject: |
[SCM] Debian GNU Hurd packaging branch, master, updated. debian/20130226-1-11-g7abe1d1 |
Date: |
Thu, 28 Feb 2013 16:48:14 +0000 |
The following commit has been merged in the master branch:
commit 7abe1d182899173f4a5c7fca384b74934ff6fac3
Author: Pino Toscano <address@hidden>
Date: Thu Feb 28 17:46:50 2013 +0100
Split the hurd libraries in own hurd-libs0.3{,-udeb} packages
diff --git a/debian/changelog b/debian/changelog
index 8fceee7..51f0c86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ hurd (20130226-2) UNRELEASED; urgency=low
* Call dh_install with --list-missing.
* Install the hurd libraries in multiarch library directories, but not in
the udeb.
+ * Split the hurd libraries in own hurd-libs0.3{,-udeb} packages.
-- Samuel Thibault <address@hidden> Tue, 26 Feb 2013 23:51:12 +0100
diff --git a/debian/control b/debian/control
index 7904f8c..0dbe2f3 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,18 @@ Homepage: http://www.gnu.org/software/hurd/hurd.html
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-hurd/hurd.git
Vcs-Git: git://anonscm.debian.org/pkg-hurd/hurd.git
+Package: hurd-libs0.3
+Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Architecture: hurd-any
+Multi-Arch: same
+Description: GNU Hurd (libraries)
+ This package contains the libraries used by GNU Hurd.
+
Package: hurd
Essential: yes
-Depends: ${misc:Depends}, sysv-rc, netdde (>= 0.0.20120518~),
${shlibs:Depends}, xkb-data
+Depends: ${misc:Depends}, hurd-libs0.3 (= ${binary:Version}), sysv-rc, netdde
(>= 0.0.20120518~), ${shlibs:Depends}, xkb-data
Breaks: gnumach (<< 2:1.3.99.dfsg.cvs20070526-1), libc0.3 (<< 2.11.2-12),
netdde (<< 0.0.20121127-2)
Suggests: hurd-doc
Recommends: bf-utf-source
@@ -56,12 +65,21 @@ Suggests: www-browser
Description: GNU Hurd manual
This package includes the manual in info and HTML format.
+Package: hurd-libs0.3-udeb
+Section: debian-installer
+Package-Type: udeb
+Priority: optional
+Architecture: hurd-any
+Depends: ${misc:Depends}
+Description: GNU Hurd (libraries) - udeb
+ This package contains the libraries used by GNU Hurd udeb.
+
Package: hurd-udeb
Package-Type: udeb
Priority: optional
Section: debian-installer
Architecture: hurd-any
-Depends: ${misc:Depends}, xkb-data-udeb
+Depends: ${misc:Depends}, hurd-libs0.3-udeb (= ${binary:Version}),
xkb-data-udeb
Provides: hurd, ext2-modules, fat-modules, ipv6-modules, isofs-modules,
loop-modules, mouse-modules, nfs-modules, socket-modules, ufs-modules
Description: GNU Hurd - udeb
This is the GNU Hurd udeb package. It contains essential system software and
diff --git a/debian/hurd-libs0.3-udeb.install.in
b/debian/hurd-libs0.3-udeb.install.in
new file mode 100644
index 0000000..8b69f0c
--- /dev/null
+++ b/debian/hurd-libs0.3-udeb.install.in
@@ -0,0 +1 @@
+debian/tmp/lib/@DEB_HOST_MULTIARCH@/*.so.* lib
diff --git a/debian/hurd-libs0.3.install.in b/debian/hurd-libs0.3.install.in
new file mode 100644
index 0000000..5c37f7c
--- /dev/null
+++ b/debian/hurd-libs0.3.install.in
@@ -0,0 +1 @@
+debian/tmp/lib/@DEB_HOST_MULTIARCH@/*.so.*
diff --git a/debian/hurd-udeb.install.in b/debian/hurd-udeb.install.in
index 196b22a..4618f10 100644
--- a/debian/hurd-udeb.install.in
+++ b/debian/hurd-udeb.install.in
@@ -3,7 +3,6 @@ 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/@DEB_HOST_MULTIARCH@/*.so.* lib
debian/tmp/lib/@DEB_HOST_MULTIARCH@/hurd/console/pc_kbd.so.*
usr/lib/hurd/console
debian/tmp/lib/@DEB_HOST_MULTIARCH@/hurd/console/pc_mouse.so.*
usr/lib/hurd/console
debian/tmp/lib/@DEB_HOST_MULTIARCH@/hurd/console/vga.so.* usr/lib/hurd/console
diff --git a/debian/hurd.install.in b/debian/hurd.install.in
index 70d48c3..41e39f5 100644
--- a/debian/hurd.install.in
+++ b/debian/hurd.install.in
@@ -2,7 +2,6 @@ debian/local/setup-translators usr/lib/hurd
debian/local/random-hurd.sh hurd
debian/local/urandom-hurd.sh hurd
debian/local/securetty etc
-debian/tmp/lib/@DEB_HOST_MULTIARCH@/*.so.*
debian/tmp/lib/@DEB_HOST_MULTIARCH@/hurd/console/*.so.* usr/lib/hurd/console
debian/tmp/hurd/*
debian/tmp/lib/hurd/rc etc/hurd
diff --git a/debian/rules b/debian/rules
index ab9b802..e28ac25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,7 +80,7 @@ override_dh_installinit:
dh_installinit --remaining-packages
override_dh_strip:
- dh_strip -phurd --dbg-package=hurd-dbg
+ dh_strip -phurd-libs0.3 -phurd --dbg-package=hurd-dbg
dh_strip --remaining-packages
override_dh_fixperms:
@@ -88,6 +88,7 @@ override_dh_fixperms:
chmod u+s $(patsubst %,$(CURDIR)/debian/hurd%,$(SUID_PROGRAMS))
override_dh_makeshlibs:
+ dh_makeshlibs -phurd-libs0.3 --add-udeb=hurd-libs0.3-udeb
dh_makeshlibs -phurd --add-udeb=hurd-udeb
dh_makeshlibs --remaining-packages
--
Debian GNU Hurd packaging
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] Debian GNU Hurd packaging branch, master, updated. debian/20130226-1-11-g7abe1d1,
Pino Toscano <=