[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#599058: permission to upload plymouth/0.8.3-14 to unstable.



Package: release.debian.org

i've improved plymouth packaging so that when you want to use the ascii
splash it doesn't pull in any other depends (apart from
libc/initramfs-tools). before, it pulled in all of libdrm and additional
xorg stuff.

attached is a diff that shows the changes for above things; there were
other changes upto -14 that fix other bugs (see commit logs) which would
need be backported to an upload to sid otherwise.

if you agree, i'd upload -15 (identical to -14) to unstable and ask for
unblocking afterwards.

-- 
Address:        Daniel Baumann, Burgunderstrasse 3, CH-4562 Biberist
Email:          daniel.baumann@panthera-systems.net
Internet:       http://people.panthera-systems.net/~daniel-baumann/
diff --git a/debian/control b/debian/control
index 8630fb9..f053b23 100644
--- a/debian/control
+++ b/debian/control
@@ -14,31 +14,50 @@ Vcs-Git: git://git.debian-maintainers.org/git/daniel/plymouth.git
 Package: plymouth
 Architecture: amd64 i386
 Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools
-Recommends: plymouth-themes-all, fontconfig-config, ttf-dejavu-core
-Suggests: gdm
 Description: Graphical Boot Animation and Logger
 Plymouth provides an attractive boot animation in place of the text messages
 that normally get shown. Text messages are instead redirected to a logfile for
 viewing after boot.
+
+Package: plymouth-drm
+Architecture: amd64 i386
+Depends:
+ ${misc:Depends}, ${shlibs:Depends}, plymouth (= ${binary:Version}),
+ plymouth-theme | plymouth-themes-fade-in (= ${binary:Version}),
+ fontconfig-config, ttf-dejavu-core
+Conflicts: plymouth (<< 0.8.3-10)
+Replaces: plymouth
+Recommends: plymouth-themes-all
+Description: Graphical Boot Animation and Logger (DRM)
+ Plymouth provides an attractive boot animation in place of the text messages
+ that normally get shown. Text messages are instead redirected to a logfile for
+ viewing after boot.
+ .
+ This package contains the DRM backend for systems supporting Kernel Mode
+ Setting (KMS).
 
 Package: plymouth-x11
 Architecture: amd64 i386
-Depends: ${misc:Depends}, ${shlibs:Depends}, plymouth (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, plymouth-drm (= ${binary:Version})
+Conflicts: plymouth (<< 0.8.3-10)
+Replaces: plymouth
 Suggests: gdm
 Description: Graphical Boot Animation and Logger
 Plymouth provides an attractive boot animation in place of the text messages
 that normally get shown. Text messages are instead redirected to a logfile for
 viewing after boot.
  .
  This package contains the x11 renderer and the log viewer.
 
 Package: plymouth-dev
 Architecture: amd64 i386
-Depends: ${misc:Depends}, plymouth (= ${binary:Version})
+Depends:
+ ${misc:Depends}, plymouth (= ${binary:Version}),
+ plymouth-drm (= ${binary:Version}), plymouth-x11 (= ${binary:Version})
 Description: Graphical Boot Animation and Logger (development)
 Plymouth provides an attractive boot animation in place of the text messages
 that normally get shown. Text messages are instead redirected to a logfile for
 viewing after boot.
  .
  This package contains the development files.
 
diff --git a/debian/plymouth-drm.install b/debian/plymouth-drm.install
new file mode 100644
index 0000000..16922b5
--- /dev/null
+++ b/debian/plymouth-drm.install
@@ -0,0 +1,9 @@
+/usr/lib/libply-splash-graphics.so.*
+/usr/lib/plymouth/fade-throbber.so
+/usr/lib/plymouth/label.so
+/usr/lib/plymouth/script.so
+/usr/lib/plymouth/space-flares.so
+/usr/lib/plymouth/throbgress.so
+/usr/lib/plymouth/two-step.so
+/usr/lib/plymouth/renderers/drm.so
+/usr/lib/plymouth/renderers/frame-buffer.so
diff --git a/debian/plymouth-x11.install b/debian/plymouth-x11.install
index bea4971..4280274 100644
--- a/debian/plymouth-x11.install
+++ b/debian/plymouth-x11.install
@@ -1,2 +1,3 @@
 /usr/bin/plymouth-log-viewer
 /usr/lib/plymouth/renderers/x11.so
+/usr/share/gdm
diff --git a/debian/plymouth.install b/debian/plymouth.install
index 0ff1e1e..a78cd6e 100644
--- a/debian/plymouth.install
+++ b/debian/plymouth.install
@@ -2,13 +2,11 @@
 /etc/plymouth
 /lib/*.so.*
 /sbin
-/usr/lib/*.so.*
-/usr/lib/plymouth/*.so
+/usr/lib/libply-boot-client.so.*
+/usr/lib/plymouth/details.so
+/usr/lib/plymouth/text.so
 /usr/lib/plymouth/plymouth/*-initrd
-/usr/lib/plymouth/renderers/drm.so
-/usr/lib/plymouth/renderers/frame-buffer.so
 /usr/sbin
-/usr/share/gdm
 /usr/share/man/man8/plymouth.8
 /usr/share/plymouth/plymouthd.defaults
 /usr/share/plymouth/themes/text
diff --git a/debian/rules b/debian/rules
index e0d68b6..a376e3d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,6 +40,7 @@ override_dh_install:
 
 override_dh_makeshlibs:
 	dh_makeshlibs -p plymouth
+	dh_makeshlibs -p plymouth-drm
 
 override_dh_installinit:
 	dh_installinit --no-start -- start 21 2 3 4 5 . stop 02 0 6 .

Reply to: