rev 8326 - in kde-extras/kdmtheme/trunk/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Sat Dec 22 15:25:01 UTC 2007 

Author: fabo
Date: 2007-12-22 15:25:00 +0000 (Sat, 22 Dec 2007)
New Revision: 8326

Modified:
   kde-extras/kdmtheme/trunk/debian/README.Debian
   kde-extras/kdmtheme/trunk/debian/changelog
   kde-extras/kdmtheme/trunk/debian/control
   kde-extras/kdmtheme/trunk/debian/copyright
   kde-extras/kdmtheme/trunk/debian/patches/02_autotools_update.diff
   kde-extras/kdmtheme/trunk/debian/patches/03_libtool_update.diff
   kde-extras/kdmtheme/trunk/debian/patches/05_pedantic-errors.diff
   kde-extras/kdmtheme/trunk/debian/patches/06_disable_no_undefined.diff
   kde-extras/kdmtheme/trunk/debian/patches/10_kdmtheme-override-warning.diff
   kde-extras/kdmtheme/trunk/debian/patches/11_replace_qlist.diff
   kde-extras/kdmtheme/trunk/debian/rules
Log:
  * New upstream release:
    * actually saves theme changes (Closes: #447683)
    * does not crash kcontrol when opened as user (Closes: #435946)
  * Update e-mail addresses.
  * Bump Standards-Version to 3.7.3.
  * Use Homepage field.

  [ Kel Modderman ]
  * Refresh debian/patches/10_kdmtheme-override-warning.diff to apply against
    new upstream release.

  [ Fathi Boudra ]
  * Build with --as-needed linker flag.


Modified: kde-extras/kdmtheme/trunk/debian/README.Debian
===================================================================
--- kde-extras/kdmtheme/trunk/debian/README.Debian	2007-12-22 14:44:33 UTC (rev 8325)
+++ kde-extras/kdmtheme/trunk/debian/README.Debian	2007-12-22 15:25:00 UTC (rev 8326)
@@ -4,4 +4,4 @@
 kdmtheme is a KDE Control Module (KCM). To run it, open KDE Control Center and
 go to System Administration to find KDM Theme Manager.
 
- -- Fathi Boudra <fboudra at free.fr>, Mon, 31 Jul 2006 18:33:26 +0200
+ -- Fathi Boudra <fabo at debian.org>, Mon, 31 Jul 2006 18:33:26 +0200

Modified: kde-extras/kdmtheme/trunk/debian/changelog
===================================================================
--- kde-extras/kdmtheme/trunk/debian/changelog	2007-12-22 14:44:33 UTC (rev 8325)
+++ kde-extras/kdmtheme/trunk/debian/changelog	2007-12-22 15:25:00 UTC (rev 8326)
@@ -1,3 +1,21 @@
+kdmtheme (1.2.2-1) unstable; urgency=low
+
+  * New upstream release:
+    * actually saves theme changes (Closes: #447683)
+    * does not crash kcontrol when opened as user (Closes: #435946)
+  * Update e-mail addresses.
+  * Bump Standards-Version to 3.7.3.
+  * Use Homepage field.
+
+  [ Kel Modderman ]
+  * Refresh debian/patches/10_kdmtheme-override-warning.diff to apply against
+    new upstream release.
+
+  [ Fathi Boudra ]
+  * Build with --as-needed linker flag.
+
+ -- Fathi Boudra <fabo at debian.org>  Sat, 22 Dec 2007 15:36:15 +0100
+
 kdmtheme (1.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: kde-extras/kdmtheme/trunk/debian/control
===================================================================
--- kde-extras/kdmtheme/trunk/debian/control	2007-12-22 14:44:33 UTC (rev 8325)
+++ kde-extras/kdmtheme/trunk/debian/control	2007-12-22 15:25:00 UTC (rev 8326)
@@ -2,10 +2,11 @@
 Section: kde
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: Kel Modderman <kelrin at tpg.com.au>, Fathi Boudra <fabo at debian.org>,
+Uploaders: Kel Modderman <kel at otaku42.de>, Fathi Boudra <fabo at debian.org>,
  Mark Purcell <msp at debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt, automake1.7, kdelibs4-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
+Homepage: http://beta.smileaf.org/projects
 
 Package: kdmtheme
 Architecture: any
@@ -13,5 +14,3 @@
 Description: theme manager for KDM
  kdmtheme is a theme manager for KDM. It provides a KDE Control Module (KCM)
  that allows you to easily install, remove and change your KDM themes.
- .
-  Homepage: http://beta.smileaf.org/projects

Modified: kde-extras/kdmtheme/trunk/debian/copyright
===================================================================
--- kde-extras/kdmtheme/trunk/debian/copyright	2007-12-22 14:44:33 UTC (rev 8325)
+++ kde-extras/kdmtheme/trunk/debian/copyright	2007-12-22 15:25:00 UTC (rev 8326)
@@ -1,4 +1,4 @@
-This package was debianized by Kel Modderman <kelrin at tpg.com.au> on
+This package was debianized by Kel Modderman <kel at otaku42.de> on
 Tue,  1 Aug 2006 00:25:11 +0000.
 
 It was downloaded from http://beta.smileaf.org/projects/
@@ -33,7 +33,7 @@
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
-The Debian packaging is (C) 2006, Kel Modderman <kelrin at tpg.com.au> and
+The Debian packaging is (C) 2007, Kel Modderman <kel at otaku42.de> and
 is licensed under the GPL, see above.
 
 The documentations provided with kdmtheme is distributed under

Modified: kde-extras/kdmtheme/trunk/debian/patches/02_autotools_update.diff
===================================================================
--- kde-extras/kdmtheme/trunk/debian/patches/02_autotools_update.diff	2007-12-22 14:44:33 UTC (rev 8325)
+++ kde-extras/kdmtheme/trunk/debian/patches/02_autotools_update.diff	2007-12-22 15:25:00 UTC (rev 8326)
@@ -1,6 +1,5 @@
-diff -Nrua a/admin/compile b/admin/compile
---- a/admin/compile	2006-11-09 23:42:52.000000000 +0100
-+++ b/admin/compile	2007-10-03 12:20:42.000000000 +0200
+--- a/admin/compile
++++ b/admin/compile
 @@ -1,8 +1,9 @@
  #! /bin/sh
 -
@@ -190,9 +189,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua a/admin/depcomp b/admin/depcomp
---- a/admin/depcomp	2006-11-09 23:42:52.000000000 +0100
-+++ b/admin/depcomp	2007-10-03 12:20:42.000000000 +0200
+--- a/admin/depcomp
++++ b/admin/depcomp
 @@ -1,7 +1,9 @@
  #! /bin/sh
 -
@@ -687,9 +685,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua a/admin/install-sh b/admin/install-sh
---- a/admin/install-sh	2006-11-09 23:42:52.000000000 +0100
-+++ b/admin/install-sh	2007-10-03 12:20:42.000000000 +0200
+--- a/admin/install-sh
++++ b/admin/install-sh
 @@ -1,19 +1,38 @@
  #!/bin/sh
 -#
@@ -1239,9 +1236,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua a/admin/missing b/admin/missing
---- a/admin/missing	2006-11-09 23:42:52.000000000 +0100
-+++ b/admin/missing	2007-10-03 12:20:42.000000000 +0200
+--- a/admin/missing
++++ b/admin/missing
 @@ -1,6 +1,10 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
@@ -1527,9 +1523,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua a/admin/mkinstalldirs b/admin/mkinstalldirs
---- a/admin/mkinstalldirs	2006-11-09 23:42:52.000000000 +0100
-+++ b/admin/mkinstalldirs	2007-10-03 12:20:42.000000000 +0200
+--- a/admin/mkinstalldirs
++++ b/admin/mkinstalldirs
 @@ -1,21 +1,33 @@
  #! /bin/sh
  # mkinstalldirs --- make directory hierarchy
@@ -1686,9 +1681,8 @@
 +# time-stamp-end: "$"
  # End:
 -# mkinstalldirs ends here
-diff -Nrua a/admin/ylwrap b/admin/ylwrap
---- a/admin/ylwrap	2006-11-09 23:42:52.000000000 +0100
-+++ b/admin/ylwrap	2007-10-03 12:20:42.000000000 +0200
+--- a/admin/ylwrap
++++ b/admin/ylwrap
 @@ -1,6 +1,11 @@
  #! /bin/sh
  # ylwrap - wrapper for lex/yacc invocations.

Modified: kde-extras/kdmtheme/trunk/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/kdmtheme/trunk/debian/patches/03_libtool_update.diff	2007-12-22 14:44:33 UTC (rev 8325)
+++ kde-extras/kdmtheme/trunk/debian/patches/03_libtool_update.diff	2007-12-22 15:25:00 UTC (rev 8326)
@@ -1,6 +1,5 @@
-diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in	2006-11-09 23:42:52.000000000 +0100
-+++ b/admin/libtool.m4.in	2007-10-03 12:20:42.000000000 +0200
+--- a/admin/libtool.m4.in
++++ b/admin/libtool.m4.in
 @@ -1,28 +1,13 @@
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 -## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -31,7 +30,7 @@
 +## modifications, as long as this notice is preserved.
  
 -# serial 47 AC_PROG_LIBTOOL
-+# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL
++# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
  
  
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -4354,9 +4353,8 @@
 +AC_SUBST([SED])
  AC_MSG_RESULT([$SED])
  ])
-diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
---- a/admin/ltmain.sh	2006-11-09 23:42:52.000000000 +0100
-+++ b/admin/ltmain.sh	2007-10-03 12:20:42.000000000 +0200
+--- a/admin/ltmain.sh
++++ b/admin/ltmain.sh
 @@ -1,8 +1,8 @@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.
@@ -4399,7 +4397,7 @@
 +
 +PROGRAM=ltmain.sh
 +PACKAGE=libtool
-+VERSION="1.5.24 Debian 1.5.24-1"
++VERSION="1.5.24 Debian 1.5.24-2"
 +TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
 +
 +# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).

Modified: kde-extras/kdmtheme/trunk/debian/patches/05_pedantic-errors.diff
===================================================================
--- kde-extras/kdmtheme/trunk/debian/patches/05_pedantic-errors.diff	2007-12-22 14:44:33 UTC (rev 8325)
+++ kde-extras/kdmtheme/trunk/debian/patches/05_pedantic-errors.diff	2007-12-22 15:25:00 UTC (rev 8326)
@@ -1,6 +1,6 @@
 --- a/admin/acinclude.m4.in
 +++ b/admin/acinclude.m4.in
-@@ -2144,9 +2144,6 @@
+@@ -2139,9 +2139,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"

Modified: kde-extras/kdmtheme/trunk/debian/patches/06_disable_no_undefined.diff
===================================================================
--- kde-extras/kdmtheme/trunk/debian/patches/06_disable_no_undefined.diff	2007-12-22 14:44:33 UTC (rev 8325)
+++ kde-extras/kdmtheme/trunk/debian/patches/06_disable_no_undefined.diff	2007-12-22 15:25:00 UTC (rev 8326)
@@ -1,6 +1,6 @@
 --- a/admin/acinclude.m4.in
 +++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
+@@ -1690,15 +1690,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""

Modified: kde-extras/kdmtheme/trunk/debian/patches/10_kdmtheme-override-warning.diff
===================================================================
--- kde-extras/kdmtheme/trunk/debian/patches/10_kdmtheme-override-warning.diff	2007-12-22 14:44:33 UTC (rev 8325)
+++ kde-extras/kdmtheme/trunk/debian/patches/10_kdmtheme-override-warning.diff	2007-12-22 15:25:00 UTC (rev 8326)
@@ -1,24 +1,24 @@
---- kdmtheme-1.2.orig/src/kdmtheme.cpp
-+++ kdmtheme-1.2/src/kdmtheme.cpp
-@@ -182,6 +182,21 @@
- 
+--- a/src/kdmtheme.cpp
++++ b/src/kdmtheme.cpp
+@@ -186,6 +186,21 @@
  void KDMThemeWidget::toggleUseTheme(bool useTheme) {
  	setReadOnly( useTheme );
+ 	emit changed(true);
 +
-+    if (useTheme && getuid() == 0)
-+    {
-+        QDir dir("/etc/default/kdm.d/")  ;
-+        dir.setFilter(QDir::Files);
-+        if (dir.count())
-+        {
-+            KMessageBox::information(this,
-+                                     "Override files found, selected theme will not have effect.\n"
-+                                     "Please see /usr/share/doc/kdm/README.Debian for more informations",
-+                                     NULL,
-+                                     "kdmtheme-overrides-found",
-+                                     0);
-+        }
-+    }
++	if (useTheme && getuid() == 0)
++	{
++		QDir dir("/etc/default/kdm.d/")  ;
++		dir.setFilter(QDir::Files);
++		if (dir.count())
++		{
++			KMessageBox::information(this,
++			                         "Override files found, selected theme will not have effect.\n"
++			                         "Please see /usr/share/doc/kdm/README.Debian for more informations",
++			                         NULL,
++			                         "kdmtheme-overrides-found",
++			                         0);
++		}
++	}
  }
  
  void KDMThemeWidget::setReadOnly(bool ro)

Modified: kde-extras/kdmtheme/trunk/debian/patches/11_replace_qlist.diff
===================================================================
--- kde-extras/kdmtheme/trunk/debian/patches/11_replace_qlist.diff	2007-12-22 14:44:33 UTC (rev 8325)
+++ kde-extras/kdmtheme/trunk/debian/patches/11_replace_qlist.diff	2007-12-22 15:25:00 UTC (rev 8326)
@@ -1,5 +1,5 @@
---- kdmtheme-1.2.orig/src/kdmtheme.cpp
-+++ kdmtheme-1.2/src/kdmtheme.cpp
+--- a/src/kdmtheme.cpp
++++ b/src/kdmtheme.cpp
 @@ -37,7 +37,7 @@
  #include <qdir.h>
  #include <qlayout.h>

Modified: kde-extras/kdmtheme/trunk/debian/rules
===================================================================
--- kde-extras/kdmtheme/trunk/debian/rules	2007-12-22 14:44:33 UTC (rev 8325)
+++ kde-extras/kdmtheme/trunk/debian/rules	2007-12-22 15:25:00 UTC (rev 8326)
@@ -5,6 +5,8 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
+
 install/kdmtheme::
 	install -D -p -m644 debian/kdmtheme.lintian-overrides \
 	debian/kdmtheme/usr/share/lintian/overrides/kdmtheme

More information about the pkg-kde-commits mailing list