[Pkg-mediawiki-commits] r194 - in mediawiki-extensions/trunk/debian: . patches source

[Thorsten Glaser]

Author: tg
Date: 2010-06-30 12:11:50 +0000 (Wed, 30 Jun 2010)
New Revision: 194

Added:
   mediawiki-extensions/trunk/debian/README.source
   mediawiki-extensions/trunk/debian/source/
   mediawiki-extensions/trunk/debian/source/format
Modified:
   mediawiki-extensions/trunk/debian/changelog
   mediawiki-extensions/trunk/debian/patches/fix_472283.patch
   mediawiki-extensions/trunk/debian/rules
Log:
make this pass ?\226?\128?\156lintian -vIi?\226?\128?\157 on a freshly d-u?\226?\128?\153d sid system


Added: mediawiki-extensions/trunk/debian/README.source
===================================================================
--- mediawiki-extensions/trunk/debian/README.source	                        (rev 0)
+++ mediawiki-extensions/trunk/debian/README.source	2010-06-30 12:11:50 UTC (rev 194)
@@ -0,0 +1,7 @@
+This package currently uses quilt style patches, for easier
+backporting to Lenny than with format 3.0 (quilt). See
+	/usr/share/doc/quilt/README.source
+for further information.
+
+
+$Id$


Property changes on: mediawiki-extensions/trunk/debian/README.source
___________________________________________________________________
Added: svn:keywords
   + Author CVSHeader Date Id LastChangedBy LastChangedDate LastChangedRevision Log Revision Source State

Modified: mediawiki-extensions/trunk/debian/changelog
===================================================================
--- mediawiki-extensions/trunk/debian/changelog	2010-06-30 08:59:20 UTC (rev 193)
+++ mediawiki-extensions/trunk/debian/changelog	2010-06-30 12:11:50 UTC (rev 194)
@@ -1,4 +1,4 @@
-mediawiki-extensions (2.3) UNRELEASED; urgency=low
+mediawiki-extensions (2.3~test+3) unstable; urgency=low
 
   * debian/control: add Vcs-SVN and Vcs-Browser
   * debian/copyright: correct FCKeditor author information
@@ -24,8 +24,9 @@
     Collection with links to the Debian packages thereof
   * Bump Standards-Version to 3.9.0.0
     - use Breaks instead of Conflicts (splitting package, §7.4)
+  * Fix Lintian warnings
 
- -- Thorsten Glaser <tg at mirbsd.de>  Wed, 30 Jun 2010 10:57:57 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 30 Jun 2010 12:11:05 +0000
 
 mediawiki-extensions (2.2) unstable; urgency=high
 

Modified: mediawiki-extensions/trunk/debian/patches/fix_472283.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_472283.patch	2010-06-30 08:59:20 UTC (rev 193)
+++ mediawiki-extensions/trunk/debian/patches/fix_472283.patch	2010-06-30 12:11:50 UTC (rev 194)
@@ -1,3 +1,5 @@
+Prevent searches with empty search string.
+
 Index: mediawiki-extensions-2.0/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php
 ===================================================================
 --- mediawiki-extensions-2.0.orig/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php	2009-05-06 12:24:47.000000000 -0500
@@ -7,8 +9,8 @@
  
  			//Search for the entry.
 -			$entry = @ldap_read( $this->ldapconn, $searchstring, "objectclass=*" );
-+                        if ( $searchstring != '' )
-+			  $entry = @ldap_read( $this->ldapconn, $searchstring, "objectclass=*" );
++			if ( $searchstring != '' )
++				$entry = @ldap_read( $this->ldapconn, $searchstring, "objectclass=*" );
  
  			//getSearchString is going to bind, but will not unbind
  			//Let's clean up

Modified: mediawiki-extensions/trunk/debian/rules
===================================================================
--- mediawiki-extensions/trunk/debian/rules	2010-06-30 08:59:20 UTC (rev 193)
+++ mediawiki-extensions/trunk/debian/rules	2010-06-30 12:11:50 UTC (rev 194)
@@ -10,7 +10,9 @@
 
 configure/mediawiki-extensions::
 	cp -rf dist/* debian
-	-find debian -name .createme -print0 | xargs -0r rm
+	-find debian/mediawiki-extensions-* \
+	    -name .createme -o -name .svn | \
+	    xargs -r rm -rf --
 	# for now (empty directory, no idea why)
 	rmdir debian/mediawiki-extensions-collection/usr/share/mediawiki-extensions/collection/collection
 

Added: mediawiki-extensions/trunk/debian/source/format
===================================================================
--- mediawiki-extensions/trunk/debian/source/format	                        (rev 0)
+++ mediawiki-extensions/trunk/debian/source/format	2010-06-30 12:11:50 UTC (rev 194)
@@ -0,0 +1 @@
+1.0