diff --git a/package/base/libpng/libpng.desc b/package/base/libpng/libpng.desc index e9b012c6a..be344db89 100644 --- a/package/base/libpng/libpng.desc +++ b/package/base/libpng/libpng.desc @@ -38,6 +38,9 @@ [C] extra/multimedia [F] CORE +# configure checks for X11 headers without any reason +[E] del xorg xfree86 + [L] OpenSource [S] Stable [V] 1.2.8 diff --git a/package/base/linux/linux.conf b/package/base/linux/linux.conf index 188dc84dc..2d927b432 100644 --- a/package/base/linux/linux.conf +++ b/package/base/linux/linux.conf @@ -537,6 +537,3 @@ esac # ignore pseudo-deps to other modules var_append flistrfilter "|" ".*lib/modules/.*/.*" -# ignore some deps to basic system packages (avoiding false cyclic deps) -var_append flistrfilter "|" "net-tools:.*" - diff --git a/package/base/linux/linux.desc b/package/base/linux/linux.desc index 95f9495ae..27c07b87a 100644 --- a/package/base/linux/linux.desc +++ b/package/base/linux/linux.desc @@ -38,6 +38,8 @@ [E] group kernel-header linux24-header linux26-header [E] group kernel-source linux24-source linux26-source +[E] del net-tools + [L] GPL [S] Stable [V] 0000 diff --git a/package/gnome2/desktop-file-utils/parse-config b/package/gnome2/desktop-file-utils/parse-config new file mode 100644 index 000000000..6042cd98c --- /dev/null +++ b/package/gnome2/desktop-file-utils/parse-config @@ -0,0 +1,28 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/gnome2/desktop-file-utils/parse-config +# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +# don't package the output of update-desktop-database +var_append flistdel "|" ".*/share/applications/mimeinfo.cache" + +# don't use update-desktop-database activity for dep detection +var_append flistrfilter "|" ".*update-desktop-database.*/share/.*" + diff --git a/package/gnome2/gnome2-dirtree/gnome2-dirtree.conf b/package/gnome2/gnome2-dirtree/gnome2-dirtree.conf index f67fe313c..a6fd25ed0 100644 --- a/package/gnome2/gnome2-dirtree/gnome2-dirtree.conf +++ b/package/gnome2/gnome2-dirtree/gnome2-dirtree.conf @@ -81,6 +81,10 @@ gnome2_dirtree() mkdir -p $root/$prefix/share/themes/Simple mkdir -p $root/$prefix/share/xml + mkdir -p $root/usr/share/omf + mkdir -p $root/usr/share/gnome/apps + mkdir -p $root/usr/share/gnome/help + for x in man info doc; do if [ ! -e $root/$prefix/$x ]; then ln -fs share/$x $root/$prefix/$x diff --git a/package/gnome2/scrollkeeper/parse-config b/package/gnome2/scrollkeeper/parse-config index 450fb7e18..62d255fec 100644 --- a/package/gnome2/scrollkeeper/parse-config +++ b/package/gnome2/scrollkeeper/parse-config @@ -20,7 +20,9 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- - # don't package the output of scrollkeeper-update var_append flistdel "|" "var/scrollkeeper/.*" +# don't use scrollkeeper activity for dep detection +var_append flistrfilter "|" ".*scrollkeeper-update.*/share/.*" + diff --git a/package/jimmy/mplayer/mplayer.conf b/package/jimmy/mplayer/mplayer.conf index f831d7241..cc68ae663 100644 --- a/package/jimmy/mplayer/mplayer.conf +++ b/package/jimmy/mplayer/mplayer.conf @@ -103,5 +103,3 @@ var_append confopt " " "--enable-tv-v4l2 --enable-tv-v4l" hook_add premake 3 mplayer_premake hook_add postmake 5 mplayer_postmake -var_append flistrfilter "|" "mplayer-fonts:.*" - diff --git a/scripts/Check-Deps-2 b/scripts/Check-Deps-2 index 1cd3ebe3f..237e90b0e 100755 --- a/scripts/Check-Deps-2 +++ b/scripts/Check-Deps-2 @@ -28,6 +28,8 @@ while ($_ = shift @ARGV) { } } +unlink $_ foreach qw/dependencies.dbg dependencies.dot dependencies.patch dependencies.png dependencies.ps/; + print "Reading package priorities ...\n"; if ( $config eq "" ) { open(F, "./scripts/Create-PkgList |") || die $!; @@ -231,7 +233,6 @@ sub setpri($$$$$$) { if ( $did_something ) { print "\nCreate dependencies.patch ...\n"; my $tmpfile = `mktemp`; chomp $tmpfile; - unlink "dependencies.patch"; foreach $package (@pkg) { if ($pri{$package} != $opr{$package}) { @@ -240,7 +241,7 @@ if ( $did_something ) { } } unlink $tmpfile; - print "Done. Please check moves manually bofore applying the patch.\n"; + print "Done. Please check moves manually before applying the patch.\n"; } else { print "No unresolved dependencies found.\n"; } diff --git a/scripts/dep_fixes.txt b/scripts/dep_fixes.txt index 6fc4bfc1a..16a65cc97 100644 --- a/scripts/dep_fixes.txt +++ b/scripts/dep_fixes.txt @@ -4,6 +4,22 @@ # dependencies and by scripts/Build-Pkg to dump additional debug info # for this dependencies. +# additional false deps added manually (2005-06-13) +gtkam del anjuta bug-buddy gnome-system-tools ghex totem glabels gnomeicu +scrollkeeper del gconf-editor gnome-netstatus quick-lounge-applet seahorse zapping +mergeant del gnome-system-tools +gnome-desktop del battfink +gnome-doc-utils del zapping +glabels del anjuta gnumeric +linux del net-tools +docbookx del gnome-doc-utils +seahorse del glabels gdesklets +mplayer del mplayer-fonts +libxml2 del libxslt +xorg del ctwm isdn4k-utils root-tail xautolock terminus-font transfig xfig +xfree86 del ctwm isdn4k-utils root-tail xautolock terminus-font transfig xfig +libpng del xorg xfree86 + # additional false deps added manually (2004-11-29) mythtv del mythdvd