Browse Source

Clifford Wolf:


			
			
				rocklinux
			
			
		
Clifford Wolf 20 years ago
parent
commit
776fec627b
9 changed files with 59 additions and 8 deletions
  1. +3
    -0
      package/base/libpng/libpng.desc
  2. +0
    -3
      package/base/linux/linux.conf
  3. +2
    -0
      package/base/linux/linux.desc
  4. +28
    -0
      package/gnome2/desktop-file-utils/parse-config
  5. +4
    -0
      package/gnome2/gnome2-dirtree/gnome2-dirtree.conf
  6. +3
    -1
      package/gnome2/scrollkeeper/parse-config
  7. +0
    -2
      package/jimmy/mplayer/mplayer.conf
  8. +3
    -2
      scripts/Check-Deps-2
  9. +16
    -0
      scripts/dep_fixes.txt

+ 3
- 0
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

+ 0
- 3
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:.*"

+ 2
- 0
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

+ 28
- 0
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/.*"

+ 4
- 0
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

+ 3
- 1
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/.*"

+ 0
- 2
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:.*"

+ 3
- 2
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";
}

+ 16
- 0
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

Loading…
Cancel
Save