[Pkg-kde-commits] rev 1612 - in branches/kde-3.4.0/packages/kdenetwork/debian: . patches

[Luk Claes]

Author: luk
Date: 2005-08-30 15:38:20 +0000 (Tue, 30 Aug 2005)
New Revision: 1612

Modified:
   branches/kde-3.4.0/packages/kdenetwork/debian/changelog
   branches/kde-3.4.0/packages/kdenetwork/debian/control
   branches/kde-3.4.0/packages/kdenetwork/debian/patches/98_buildprep.diff
Log:
Preparing upload of 3.4.2-1


Modified: branches/kde-3.4.0/packages/kdenetwork/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/changelog	2005-08-30 15:02:32 UTC (rev 1611)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/changelog	2005-08-30 15:38:20 UTC (rev 1612)
@@ -1,7 +1,7 @@
-kdenetwork (4:3.4.2-1) UNRELEASED; urgency=low
+kdenetwork (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.
-    
+
   * This upload:
 
     - happily builds with gcc4. (Closes: #300536)
@@ -26,8 +26,12 @@
     Replaces) to eliminate potential problems.
 
   * kdict: Add a missing Replaces for kdebase-data.
+  
+  +++ Changes by Luk Claes:
+  
+  * Added me to uploaders
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 20 Aug 2005 03:27:53 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 30 Aug 2005 16:40:41 +0200
 
 kdenetwork (4:3.4.1-1) experimental; urgency=low
 

Modified: branches/kde-3.4.0/packages/kdenetwork/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/control	2005-08-30 15:02:32 UTC (rev 1611)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/control	2005-08-30 15:38:20 UTC (rev 1612)
@@ -2,7 +2,7 @@
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at freeshell.org>, Adeodato Simó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>
+Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at freeshell.org>, Adeodato Simó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
 Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>= 4:3.4.2), libgadu-dev, libiw-dev (>> 27+28pre8), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386], xmms-dev, libxxf86vm-dev
 Standards-Version: 3.6.2
 

Modified: branches/kde-3.4.0/packages/kdenetwork/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/patches/98_buildprep.diff	2005-08-30 15:02:32 UTC (rev 1611)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/patches/98_buildprep.diff	2005-08-30 15:38:20 UTC (rev 1612)
@@ -1517,59 +1517,6 @@
  AC_MSG_RESULT([$SED])
  ])
  
---- aclocal.m4
-+++ aclocal.m4
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
-+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005  Free Software Foundation, Inc.
-@@ -28,7 +28,7 @@
- # Call AM_AUTOMAKE_VERSION so it can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--	 [AM_AUTOMAKE_VERSION([1.9.5])])
-+	 [AM_AUTOMAKE_VERSION([1.9.6])])
- 
- # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
- 
-@@ -501,6 +501,35 @@
- rmdir .tst 2>/dev/null
- AC_SUBST([am__leading_dot])])
- 
-+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-+# From Jim Meyering
-+
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+  dnl maintainer-mode is disabled by default
-+  AC_ARG_ENABLE(maintainer-mode,
-+[  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer],
-+      USE_MAINTAINER_MODE=$enableval,
-+      USE_MAINTAINER_MODE=no)
-+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  AC_SUBST(MAINT)dnl
-+]
-+)
-+
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+
- # Check to see how 'make' treats includes.	            -*- Autoconf -*-
- 
- # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
 --- config.h.in
 +++ config.h.in
 @@ -505,9 +505,6 @@
@@ -25481,7 +25428,7 @@
  
  #>+ 2
 -KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in 
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in 
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in 
  
  #>+ 2
  docs-am: