[Piuparts-commits] [piuparts] 06/06: scripts-broken-symlinks: unbreak more symlinks

[Holger Levsen]

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

holger pushed a commit to branch develop
in repository piuparts.

commit 52097fc78d10decb51f5133727e94cf8fed2e92f
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Oct 3 03:27:16 2017 +0200

    scripts-broken-symlinks: unbreak more symlinks
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 .../post_install_extras_unbreak_symlinks           | 24 ++++++++++++++--------
 debian/changelog                                   |  2 ++
 instances/piuparts.conf.anbe                       |  3 +--
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/custom-scripts/scripts-broken-symlinks/post_install_extras_unbreak_symlinks b/custom-scripts/scripts-broken-symlinks/post_install_extras_unbreak_symlinks
index b098129..dd6b41d 100755
--- a/custom-scripts/scripts-broken-symlinks/post_install_extras_unbreak_symlinks
+++ b/custom-scripts/scripts-broken-symlinks/post_install_extras_unbreak_symlinks
@@ -123,10 +123,6 @@ install_extra_package exim4-dev			exim4-base
 # /usr/share/doc/gimp-help-common/html -> ../../gimp/2.0/help
 install_extra_package gimp-help-common		gimp-help-en
 
-# /usr/share/gnome/help/gnumeric/C/images -> ../../../../xml/docbook/stylesheet/nwalsh/images
-# gnumeric-doc: Suggests: docbook-xsl
-install_extra_package gnumeric-doc		docbook-xsl
-
 # /usr/share/doc/keyboard-configuration/xorg.lst -> ../../X11/xkb/rules/xorg.lst
 install_extra_package keyboard-configuration	xkb-data
 
@@ -172,6 +168,10 @@ install_extra_package eclipse-eclox		doxygen-doc
 # neverball-common: Suggests: fonts-wqy-microhei
 install_extra_package neverball-common		fonts-wqy-microhei
 
+# /usr/share/gnome/help/gnumeric/C/images -> ../../../../xml/docbook/stylesheet/nwalsh/images
+# gnumeric-doc: Suggests: docbook-xsl
+install_extra_package gnumeric-doc		docbook-xsl
+
 # /usr/share/gtkmorph/pixmaps -> ../xmorph/pixmaps
 # /usr/share/man/man1/morph.1.gz -> xmorph.1.gz
 install_extra_package libmorph			gtkmorph xmorph
@@ -179,6 +179,14 @@ install_extra_package libmorph			gtkmorph xmorph
 # /usr/share/icons/default.kde4 -> oxygen
 install_extra_package kde-runtime-data		oxygen-icon-theme
 
+# /usr/share/live/build/bootloaders/???linux/*.c32 -> /usr/lib/syslinux/modules/bios/*.c32
+# /usr/share/live/build/bootloaders/pxelinux/pxelinux.0 -> /usr/lib/PXELINUX/pxelinux.0
+# /usr/share/live/build/bootloaders/isolinux/isolinux.bin -> /usr/lib/ISOLINUX/isolinux.bin
+# live-build: the required packages will be installed in the live image (#857151)
+# open-infrastructure-system-build: alternate implementation of live-build
+install_extra_package live-build			syslinux-common pxelinux isolinux
+install_extra_package open-infrastructure-system-build	syslinux-common pxelinux isolinux
+
 # /usr/share/lyx/thes -> ../mythes
 install_extra_package lyx-common		mythes-en-us
 
@@ -215,10 +223,6 @@ install_extra_package quilt			nullmailer
 # tuxpaint-data: Suggests: fonts-arabeyes, fonts-arphic-gbsn00lp, fonts-arphic-uming, fonts-nanum, fonts-gujr, fonts-taml, fonts-telu, fonts-tlwg-garuda-otf
 install_extra_package tuxpaint-data		fonts-arabeyes fonts-arphic-gbsn00lp fonts-arphic-uming fonts-nanum fonts-gujr fonts-taml fonts-telu fonts-tlwg-garuda-otf
 
-# /usr/share/uim/loader.scm -> /var/lib/uim/loader.scm
-# /usr/share/uim/installed-modules.scm -> /var/lib/uim/installed-modules.scm
-install_extra_package libuim-data		uim-utils
-
 # /var/lib/gridengine/lib/lx-* -> /usr/lib/gridengine
 install_extra_package gridengine-common		gridengine-client db-util db5.3-sql-util
 
@@ -291,5 +295,9 @@ create_extra_file rust-gdb			/usr/share/man/man1/gdb.1.gz
 create_extra_file otrs2				/etc/otrs/Kernel/Config/GenericAgent.pm
 create_extra_dir otrs2				/run/otrs
 
+# /usr/share/uim/loader.scm -> /var/lib/uim/loader.scm
+# /usr/share/uim/installed-modules.scm -> /var/lib/uim/installed-modules.scm
+create_extra_file libuim-data			/var/lib/uim/loader.scm /var/lib/uim/installed-modules.scm
+
 # /var/cache/vdr/dvd -> /dev/dvd
 create_extra_file vdr-plugin-dvd		/dev/dvd
diff --git a/debian/changelog b/debian/changelog
index 5d7763c..ed87ac4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ piuparts (0.81) UNRELEASED; urgency=medium
     - Treat install-info as fake-essential for all tests ending in squeeze.
   * scripts/{pre,post}_test_exceptions: Add exception to prevent testing
     corekeeper from changing the core file settings in the running kernel.
+  * scripts-broken-symlinks/post_install_extras_unbreak_symlinks: Unbreak more
+    symlinks.  (Closes: #857151)
   * master-bin/detect_piuparts_issues: Detect another way of 'apt-cache show'
     failing.  (Closes: #877417)
   * master-bin/distill_alternatives_log: Parse piuparts.conf to find the
diff --git a/instances/piuparts.conf.anbe b/instances/piuparts.conf.anbe
index 3151392..24f55ce 100644
--- a/instances/piuparts.conf.anbe
+++ b/instances/piuparts.conf.anbe
@@ -78,9 +78,8 @@ flags-broken-symlinks =
 	-i :/usr/share/gocode/src/github.com/prometheus/procfs/fixtures/26231/exe
 # ignore broken symlinks
 	-i :/etc/systemd/system/display-manager.service
-# civicrm-common, #857601, /usr/share/civicrm/packages/OpenFlashChart/open-flash-chart.swf -> ../../../../local/open-flash-chart.swf
+#   civicrm-common, #857601, /usr/share/civicrm/packages/OpenFlashChart/open-flash-chart.swf -> ../../../../local/open-flash-chart.swf
 	-i :/usr/share/civicrm/packages/OpenFlashChart/open-flash-chart.swf
-	-i :/usr/share/qt4/plugins
 # ignore broken symlinks (patterns)
 	-I :/etc/.*/supervise
 	-I /usr/include/python2\.7_d/.*\.h

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