summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsibel <lesibel at free dot fr>2010-06-13 01:46:54 +0200
committersibel <lesibel at free dot fr>2010-06-13 01:46:54 +0200
commitb6f45468a5fc84be165e1881b36f18144a44e4b3 (patch)
tree91013db4c4af6dc09264143148ef37192f0a4d23
parentf1cb625215f333f79a88fa60f5b4e1feced7ea6b (diff)
parent83be8725b64f21c73ea6bcdfb49191a82bb53a6e (diff)
downloadnutyx-extra-b6f45468a5fc84be165e1881b36f18144a44e4b3.tar.gz
nutyx-extra-b6f45468a5fc84be165e1881b36f18144a44e4b3.tar.bz2
nutyx-extra-b6f45468a5fc84be165e1881b36f18144a44e4b3.tar.xz
nutyx-extra-b6f45468a5fc84be165e1881b36f18144a44e4b3.zip
Merge remote branch 'nutyx-attapu/master'
-rw-r--r--base/aaabasicfs/Pkgfile4
-rw-r--r--extra/pango/.footprint10
-rwxr-xr-xextra/pango/Pkgfile2
3 files changed, 5 insertions, 11 deletions
diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile
index c205f1ce6..ef3c9d102 100644
--- a/base/aaabasicfs/Pkgfile
+++ b/base/aaabasicfs/Pkgfile
@@ -66,7 +66,8 @@ haldaemon:x:19:19:HAL Daemon User:/dev/null:/bin/false
named:x:20:20:BIND Owner:/home/named:/bin/false
gdm:x:21:21:GDM Daemon User:/dev/null:/bin/bash
fcron:x:22:22:Fcron User:/dev/null:/bin/false
-apache:x:25:25:Apache Server:/dev/null:/bin/false
+kdm:x:23:23:KDM Daemon User:/dev/null:/bin/bash
+fpache:x:25:25:Apache Server:/dev/null:/bin/false
smmsp:x:26:26:Sendmail Daemon:/dev/null:/bin/false
polkituser:x:27:27:Policy Kit Daemon User:/dev/null:/bin/false
mysql:x:40:40:MySQL Server:/dev/null/:bin/false
@@ -103,6 +104,7 @@ haldaemon:x:19:
named:x:20:
gdm:x:21:
fcron:x:22:
+kdm:x:23:kdm
apache:x:25:
smmsp:x:26:
polkituser:x:27:
diff --git a/extra/pango/.footprint b/extra/pango/.footprint
index 2b7cb0717..dd92e54c9 100644
--- a/extra/pango/.footprint
+++ b/extra/pango/.footprint
@@ -44,11 +44,6 @@ drwxr-xr-x root/root usr/include/pango-1.0/pango/
-rw-r--r-- root/root usr/include/pango-1.0/pango/pangoxft-render.h
-rw-r--r-- root/root usr/include/pango-1.0/pango/pangoxft.h
drwxr-xr-x root/root usr/lib/
-drwxr-xr-x root/root usr/lib/girepository-1.0/
--rw-r--r-- root/root usr/lib/girepository-1.0/Pango-1.0.typelib
--rw-r--r-- root/root usr/lib/girepository-1.0/PangoCairo-1.0.typelib
--rw-r--r-- root/root usr/lib/girepository-1.0/PangoFT2-1.0.typelib
--rw-r--r-- root/root usr/lib/girepository-1.0/PangoXft-1.0.typelib
-rwxr-xr-x root/root usr/lib/libpango-1.0.la
lrwxrwxrwx root/root usr/lib/libpango-1.0.so -> libpango-1.0.so.0.2800.0
lrwxrwxrwx root/root usr/lib/libpango-1.0.so.0 -> libpango-1.0.so.0.2800.0
@@ -105,11 +100,6 @@ drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/pangox.pc
-rw-r--r-- root/root usr/lib/pkgconfig/pangoxft.pc
drwxr-xr-x root/root usr/share/
-drwxr-xr-x root/root usr/share/gir-1.0/
--rw-r--r-- root/root usr/share/gir-1.0/Pango-1.0.gir
--rw-r--r-- root/root usr/share/gir-1.0/PangoCairo-1.0.gir
--rw-r--r-- root/root usr/share/gir-1.0/PangoFT2-1.0.gir
--rw-r--r-- root/root usr/share/gir-1.0/PangoXft-1.0.gir
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/pango-querymodules.1.gz
diff --git a/extra/pango/Pkgfile b/extra/pango/Pkgfile
index 70280be3b..89504251e 100755
--- a/extra/pango/Pkgfile
+++ b/extra/pango/Pkgfile
@@ -21,5 +21,7 @@ build() {
make DESTDIR=$PKG install
rm -rf $PKG/usr/share/gtk-doc
install -m644 ../pango.modules $PKG/etc/pango/
+ rm -rf $PKG/usr/lib/girepository-1.0
+ rm -rf $PKG/usr/share/gir-1.0/
}