arts_1.2.0-0pre1v1_i386.changes REJECTED

2004-02-16 Thread Debian Installer

Rejected: arts_1.2.0-0pre1v1.dsc refers to arts_1.2.0.orig.tar.gz, but I can't 
find it in the queue or in the pool.


===

If you don't understand why your files were rejected, or if the
override file requires editing, reply to this email.



new admin/debianrules update

2004-02-16 Thread Chris Cheney
I have rewritten admin/debianrules hopefully for the last time. To be
able to use the change you will need for it to be directly in your
diff.gz instead of a debian/patches/foo.diff due to the order of
debian/debiandirs is generated.

The main change you will see is /usr/share/config is being used again. I
have added a patch to kdecore to look in /etc/kde3 first then fall back
to /usr/share/config if there is no config. I did this due to numerous
and recurring problems with config files not being installed by dpkg.
Also it insures that kde has access to the newest config files if the
user doesn't want to make any changes.

Chris


signature.asc
Description: Digital signature


Processing of arts_1.2.0-0pre1v1_i386.changes

2004-02-16 Thread Archive Administrator
arts_1.2.0-0pre1v1_i386.changes uploaded successfully to localhost
along with the files:
  arts_1.2.0-0pre1v1.dsc
  arts_1.2.0-0pre1v1.diff.gz
  libarts1_1.2.0-0pre1v1_i386.deb
  libarts1-dev_1.2.0-0pre1v1_i386.deb
  libartsc0_1.2.0-0pre1v1_i386.deb
  libartsc0-dev_1.2.0-0pre1v1_i386.deb
  arts_1.2.0-0pre1v1_all.deb

Greetings,

Your Debian queue daemon



Re: debiandir

2004-02-16 Thread Ben Burton

> I'm no expert in makefiles but doesn't the include cause the
> debian/debiandirs call to be made?

This is the way it has always worked for me.

(i.e., the include calls the file to be made and then included in the
same "make" run).

Ben.



Re: debiandir

2004-02-16 Thread David Pashley
On Feb 17, 2004 at 00:14, Chris Cheney praised the llamas by saying:
> On Mon, Feb 16, 2004 at 11:09:12PM +0100, Achim Bohnet wrote:
> > Hi,
> > I've seen Chris updating debianrules CVS and wondered how to
> > handle this in other kde pkgs.   I had a look that svn trunk:
> > debiandirs is ...
> > o is not in svn
> > o created and removed by rules
> > o -included'ed in rules file.

This is all true. 
> > 
> > What confused me is that for the first run  -include debian/debiandirs
> > can't succeed because it not there.  The debian/debiandir rule
> > that creates the file does not fail (to force another build run).
> > Now configure would be called with an empty config_kde.
> > 
> > So shouldn't the debiandir rules read:
> > 
> > debian/debiandirs: admin/debianrules
> > perl -w admin/debianrules echodirs > debian/debiandirs
> > false
> > 
> > to force another debuild run with an existing debian/debiandirs?
> 
> I'm no expert in makefiles but doesn't the include cause the
> debian/debiandirs call to be made? As far as I can recall those two
> snippets of the rules file are the same since I took over KDE in 2001.
> 

This is also true. :)
> Chris



-- 
David Pashley
[EMAIL PROTECTED]
Nihil curo de ista tua stulta superstitione.


pgp9cjRilNkiO.pgp
Description: PGP signature


pkg-kde: commit - rev 39 - people/jd/scripts

2004-02-16 Thread David Pashley
Author: jd-guest
Date: 2004-02-17 01:25:35 +0100 (Tue, 17 Feb 2004)
New Revision: 39

Modified:
   people/jd/scripts/check-replaces
Log:
 * Include checking on symlinks (actually do not check directories instead
   of only checking files)
 * Print out files that conflict by default
 * Some work of checking the regex for contents.gz is right. This file
   is a pita.


Modified: people/jd/scripts/check-replaces
===
--- people/jd/scripts/check-replaces2004-02-16 21:03:17 UTC (rev 38)
+++ people/jd/scripts/check-replaces2004-02-17 00:25:35 UTC (rev 39)
@@ -69,7 +69,7 @@
 sub wanted { # {{{
if (my ($package,$file) = $File::Find::name =~ m|debian/(.*?)/(.*)|) {
   return if $file =~ m/^DEBIAN/;
-  return unless -f "$dir/$File::Find::name"; 
+  return if -d "$dir/$File::Find::name"; 
   if (exists $filelist{$file}) { 
  print STDERR "$file is in $package and " .$filelist{$file} ."\n"; 
   } else {
@@ -93,14 +93,14 @@
while (my $line = ){
   ($file) = $line =~ m/^(.*?)\s/;
   if (exists $filelist{$file}) {
- ($file, $packages) = $line =~ m/^(.*?)\s+(.*)$/;
+ ($file, $packages) = $line =~ m/^(\S*)\s+(\S+)$/;
  my @packages;
  for my $package (split /,/, $packages) {
 $package =~ s#^.*/##;
 push @packages,  $package;
  }
  if (@packages = grep !/\Q$filelist{$file}\E/, @packages) {
-#print $filelist{$file} . " conflicts with ". join (', ', 
@packages) . " $file\n";
+print $filelist{$file} . " conflicts with ". join (', ', 
@packages) . " $file\n";
 for my $package (@packages) {
${ $conflicts{ $filelist{$file} } }->{$package} = $dist;
 }



Re: debiandir

2004-02-16 Thread Chris Cheney
On Mon, Feb 16, 2004 at 11:09:12PM +0100, Achim Bohnet wrote:
> Hi,
> I've seen Chris updating debianrules CVS and wondered how to
> handle this in other kde pkgs.   I had a look that svn trunk:
> debiandirs is ...
>   o is not in svn
>   o created and removed by rules
>   o -included'ed in rules file.
> 
> What confused me is that for the first run  -include debian/debiandirs
> can't succeed because it not there.  The debian/debiandir rule
> that creates the file does not fail (to force another build run).
> Now configure would be called with an empty config_kde.
> 
> So shouldn't the debiandir rules read:
> 
> debian/debiandirs: admin/debianrules
> perl -w admin/debianrules echodirs > debian/debiandirs
>   false
> 
> to force another debuild run with an existing debian/debiandirs?

I'm no expert in makefiles but doesn't the include cause the
debian/debiandirs call to be made? As far as I can recall those two
snippets of the rules file are the same since I took over KDE in 2001.

Chris


signature.asc
Description: Digital signature


Re: enable-final

2004-02-16 Thread Chris Cheney
On Mon, Feb 16, 2004 at 11:14:42PM +0100, Achim Bohnet wrote:
> Hi,
> new debianrules does not set --enable-final.  Any special reason
> why it's no longer the default?

It wasn't the default even before my change, so I just removed it
entirely since things using it would have to set it their own
debian/rules file anyway.

Chris


signature.asc
Description: Digital signature


kdeextragear-3/kdebluetooth/debian

2004-02-16 Thread Achim Bohnet
CVS commit by ach: 

Fix rules so debuild works in extragear environment


  M +18 -7 rules   1.5


--- kdeextragear-3/kdebluetooth/debian/rules  #1.4:1.5
@@ -12,10 +12,20 @@
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+ifeq "$(wildcard ./admin)" ""
+# Builds in kdeextragear-3
+CVS_BUILD=true
+deb_cfg_dir=..
+deb_src_dir=.
+else
+# ./admin exists -> build outside kdeextragear-3
+deb_cfg_dir=.
+deb_src_dir=kdebluetooth
+endif
+
 -include debian/debiandirs
 
-debian/debiandirs: admin/debianrules
-perl -w admin/debianrules echodirs > debian/debiandirs
+debian/debiandirs: $(deb_cfg_dir)/admin/debianrules
+perl -w $(deb_cfg_dir)/admin/debianrules echodirs > debian/debiandirs
 
-CVS_BUILD=true
 ifneq (, $(findstring true,$(CVS_BUILD)))
   configkde += --enable-debug=full
@@ -38,5 +48,5 @@
 #
 #   # run configure with build tree $(objdir)
-./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) 
$(configkde)
+cd $(deb_cfg_dir) && ./configure --host=$(DEB_HOST_GNU_TYPE) 
--build=$(DEB_BUILD_GNU_TYPE) $(configkde)
 
 touch configure-stamp
@@ -61,12 +71,13 @@
 dh_testroot
 rm -f build-stamp configure-stamp
+rm -f debian/debianrules
 
 # Add here commands to clean up after the build process.
 -$(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-cp -f /usr/share/misc/config.sub config.sub
+cp -f /usr/share/misc/config.sub $(deb_cfg_dir)/config.sub
 endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-cp -f /usr/share/misc/config.guess config.guess
+cp -f /usr/share/misc/config.guess $(deb_cfg_dir)/config.guess
 endif
 
@@ -92,5 +103,5 @@
 dh_testdir
 dh_testroot
-dh_installchangelogs ChangeLog
+dh_installchangelogs $(deb_src_dir)/ChangeLog
 dh_installdocs
 dh_installexamples




enable-final

2004-02-16 Thread Achim Bohnet
Hi,
new debianrules does not set --enable-final.  Any special reason
why it's no longer the default?

Achim
-- 
  To me vi is Zen.  To use vi is to practice zen. Every command is
  a koan. Profound to the user, unintelligible to the uninitiated.
  You discover truth everytime you use it.
  -- [EMAIL PROTECTED]



debiandir

2004-02-16 Thread Achim Bohnet
Hi,
I've seen Chris updating debianrules CVS and wondered how to
handle this in other kde pkgs.   I had a look that svn trunk:
debiandirs is ...
o is not in svn
o created and removed by rules
o -included'ed in rules file.

What confused me is that for the first run  -include debian/debiandirs
can't succeed because it not there.  The debian/debiandir rule
that creates the file does not fail (to force another build run).
Now configure would be called with an empty config_kde.

So shouldn't the debiandir rules read:

debian/debiandirs: admin/debianrules
perl -w admin/debianrules echodirs > debian/debiandirs
false

to force another debuild run with an existing debian/debiandirs?

Achim
-- 
  To me vi is Zen.  To use vi is to practice zen. Every command is
  a koan. Profound to the user, unintelligible to the uninitiated.
  You discover truth everytime you use it.
  -- [EMAIL PROTECTED]



pkg-kde: commit - rev 38 - people/jd/scripts

2004-02-16 Thread David Pashley
Author: jd-guest
Date: 2004-02-16 22:03:17 +0100 (Mon, 16 Feb 2004)
New Revision: 38

Modified:
   people/jd/scripts/check-replaces
Log:
Deal with different levels of whitespace in control lines.


Modified: people/jd/scripts/check-replaces
===
--- people/jd/scripts/check-replaces2004-02-15 15:44:37 UTC (rev 37)
+++ people/jd/scripts/check-replaces2004-02-16 21:03:17 UTC (rev 38)
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
-
 #
-# check-conflicts - Checks for conflicting files in packages currently
+# check-replaces - Checks for conflicting files in packages currently
 # in stable, testing and unstable.
 #
 # (c) 2004 David Pashley <[EMAIL PROTECTED]>
@@ -49,8 +48,8 @@
   }
   if (m/Replaces: (.*)$/) {
  my %temp;
- for my $conflict ( split /, /, $1) {
-$conflict =~ m/^([\-a-zA-Z0-9]+)( .*)?/;
+ for my $conflict ( split /,/, $1) {
+$conflict =~ m/^\s*([\-a-zA-Z0-9]+)( .*)?/;
 $temp{$1} = $conflict;
  }
  $replaces{$current_package} = \%temp;



kdepim/debian

2004-02-16 Thread Tobias Koenig
CVS commit by tokoe: 

Add install file and control entry for eGroupware resource


  Akresources-egroupware.install   1.1
  M +6 -0  control   1.88


--- kdepim/debian/control  #1.87:1.88
@@ -233,2 +233,8 @@
  This library is used by several KDE applications to handle mime types.
 
+Package: kresources-egroupware
+Section: misc
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Connectors to the eGroupware server
+ for KAddressBook and KOrganizer