KDE_3_1_BRANCH: kdelibs/debian

2003-10-05 Thread Chris Cheney 
CVS commit by ccheney: 

debian packaging updates for kdelibs 3.1.4-2


  M +16 -0 changelog   1.221.2.10
  M +50 -10control   1.231.2.13
  M +82 -43rules   1.221.2.8

KDE_3_1_BRANCH: kdelibs/debian/patches

2003-10-05 Thread Chris Cheney 
CVS commit by ccheney: 

debian specific patches are for now being maintained outside of cvs


  Rkdelibs.dirs.diff   1.2.2.1
  Rxlibs-pic.diff   1.1.2.1

kdegraphics/debian

2003-10-05 Thread David Pashley 
CVS commit by dpash: 

Make debian/rules like kdebase/debian/rules so we don't call dh_install
twice


  M +43 -52rules   1.76

Re: kdedirs ugly hack patch to kstandarddirs.cpp

2003-10-05 Thread Chris Cheney 
I have found the proper way to set prefixes in kderc. However, it is
not really useful from what I can tell.

[Directories]
prefixes=/usr/local,/usr

The reason this is not useful is because of the ordering of the
prefixes.

$HOME/.kde:$KDEDIRS:$exec_prefix:prefixes

It should be:

$HOME/.kde:$KDEDIRS:prefixes:$exec_prefix

Since added prefixes would not be looked in unless the files did not
exist in $exec_prefix at all (aiui)...  However, I am not sure how to
go about fixing that.

Chris


signature.asc
Description: Digital signature

qt-copy/debian

2003-10-05 Thread Martin Loschwitz 
CVS commit by loschwitz: 


Update to latest debian packages (3:3.2.1-6)


  Acompat   1.1
  Apatches/10_qpsprinter-3.2.2.dpatch   1.1
  Apatches/11_qmake_pkgconfig.dpatch   1.1
  Apatches/12_xinerama_pic.dpatch   1.1
  M +11 -0 changelog   1.60
  M +3 -3  control   1.63
  M +4 -3  rules   1.118
  M +2 -0  patches/00list   1.24
  M +1 -1  patches/00list.i386   1.4

Re: kdedirs ugly hack patch to kstandarddirs.cpp

2003-10-05 Thread Chris Cheney 
I thought I had a way to easily patch it as a temporary measure but I
can't seem to get it to output in the correct order. Does anyone know
how to make this work? No matter what order I call addPrefix() in it
does not seem to actually change the output order of kde-confg --path

KDEDIRS="/www/kde:/mnt/kde"

kde-config --path apps
/home/ccheney/.kde/share/applnk/:/www/kde/share/applnk/:/mnt/kde/share/applnk/:/usr/share/applnk/:/usr/local/share/applnk/

So it seems to know to always put homedir first then KDEDIRS in the
order listed but after that it doesn't seem to be ordered?

I really need this workaround to work for sarge, I already saw someone
today asking how to make /usr/local work for locally compiled kde apps.

Thanks,

Chris


@@ -983,12 +983,6 @@
 }
 kdedirList.append(KDEDIR);

-#ifdef __KDE_EXECPREFIX
-QString execPrefix(__KDE_EXECPREFIX);
-if (execPrefix!="NONE")
-   kdedirList.append(execPrefix);
-#endif
-
 QString localKdeDir;
 if (getuid())
 {
@@ -1035,6 +1029,14 @@
addPrefix(dir);
 }

+// UGLY HACK - MOVED THIS SO IT WOULD BE IN ORDER - Chris Cheney
+addPrefix("/usr/local");
+#ifdef __KDE_EXECPREFIX
+QString execPrefix(__KDE_EXECPREFIX);
+if (execPrefix!="NONE")
+   addPrefix(execPrefix);
+#endif
+
 uint index = 0;
 while (types[index] != 0) {
addResourceType(types[index], kde_default(types[index]));



signature.asc
Description: Digital signature