r7791 - in /trunk/libmediawiki-perl/debian: changelog control patches/ patches/fix_edit_token.patch patches/series rules

hanska-guest at users.alioth.debian.org hanska-guest at users.alioth.debian.org
Thu Sep 20 12:53:27 UTC 2007


Author: hanska-guest
Date: Thu Sep 20 12:53:27 2007
New Revision: 7791

URL: http://svn.debian.org/wsvn/?sc=1&rev=7791
Log:
This module has been fixed, now the testsuite is ok.

Added:
    trunk/libmediawiki-perl/debian/patches/
    trunk/libmediawiki-perl/debian/patches/fix_edit_token.patch
    trunk/libmediawiki-perl/debian/patches/series
Modified:
    trunk/libmediawiki-perl/debian/changelog
    trunk/libmediawiki-perl/debian/control
    trunk/libmediawiki-perl/debian/rules

Modified: trunk/libmediawiki-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libmediawiki-perl/debian/changelog?rev=7791&op=diff
==============================================================================
--- trunk/libmediawiki-perl/debian/changelog (original)
+++ trunk/libmediawiki-perl/debian/changelog Thu Sep 20 12:53:27 2007
@@ -1,7 +1,22 @@
 libmediawiki-perl (1.11-1) UNRELEASED; urgency=low
 
-  * We have to wait for dependencies:
-    libconfig-inihash-perl
+  [ Michael Mende ]
   * Initial Release (Closes: #432253).
 
- -- Michael Mende <debian at menole.net>  Mon, 20 Aug 2007 08:31:18 +0000
+  [ David Paleino ]
+  * debian/rules:
+    - fixed to use quilt
+    - some stylistic changes
+    - removed unneeded dh_* calls
+    - moved $(MAKE) test under the build target
+    - using environment variables to avoid the creation of empty
+      /usr/lib/perl5/
+    - removed unneeded comments
+  * debian/control:
+    - Homepage pseudo-field added
+    - quilt dependency added
+    - added myself to Uploaders field
+  * debian/patches/fix_edit_token.patch -- Wikipedia has changed the 
+    "edit token", and this patch fixes it (now $(MAKE) test works).
+
+ -- David Paleino <d.paleino at gmail.com>  Thu, 20 Sep 2007 13:41:59 +0200

Modified: trunk/libmediawiki-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libmediawiki-perl/debian/control?rev=7791&op=diff
==============================================================================
--- trunk/libmediawiki-perl/debian/control (original)
+++ trunk/libmediawiki-perl/debian/control Thu Sep 20 12:53:27 2007
@@ -2,9 +2,10 @@
 Section: perl
 Priority: optional
 Build-Depends: debhelper (>= 5.0.0)
-Build-Depends-Indep: perl (>= 5.8.8-7), libwww-perl, libconfig-inihash-perl, libtest-pod-perl
+Build-Depends-Indep: perl (>= 5.8.8-7), libwww-perl, libconfig-inihash-perl, libtest-pod-perl,
+ quilt
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Michael Mende <debian at menole.net>
+Uploaders: Michael Mende <debian at menole.net>, David Paleino <d.paleino at gmail.com>
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libmediawiki-perl/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libmediawiki-perl/
@@ -15,3 +16,5 @@
 Description:  MediaWiki engine client
  The MediaWiki module provides high-level interface to MediaWiki content
  management system.
+ .
+  Homepage: http://search.cpan.org/dist/MediaWiki/

Added: trunk/libmediawiki-perl/debian/patches/fix_edit_token.patch
URL: http://svn.debian.org/wsvn/trunk/libmediawiki-perl/debian/patches/fix_edit_token.patch?rev=7791&op=file
==============================================================================
--- trunk/libmediawiki-perl/debian/patches/fix_edit_token.patch (added)
+++ trunk/libmediawiki-perl/debian/patches/fix_edit_token.patch Thu Sep 20 12:53:27 2007
@@ -1,0 +1,15 @@
+Index: libmediawiki-perl/lib/MediaWiki/page.pm
+===================================================================
+--- libmediawiki-perl.orig/lib/MediaWiki/page.pm	2007-09-20 14:45:44.000000000 +0200
++++ libmediawiki-perl/lib/MediaWiki/page.pm	2007-09-20 14:46:20.000000000 +0200
+@@ -47,8 +47,8 @@
+ 	$edittime_regex = qr/(?<=value=["'])[0-9]+(?=["'] name=["']wpEdittime["'])/;
+ 	$watchthis_regex = qr/name=["']wpWatchthis["'] checked/;
+ 	$minoredit_regex = qr/(?<=value=["'])1(?=["'] name=["']wpMinoredit["'])/;
+-	$edittoken_regex = qr/(?<=value=["'])[0-9a-f]*\\?(?=["'] name=["']wpEditToken["'])/;
+-	$edittoken_rev_regex = qr/(?<=name=['"]wpEditToken['"] value=["'])[0-9a-f]+\\?(?=["'])/;
++	$edittoken_regex = qr/(?<=value=["'])[0-9a-f]*\+?\\?(?=["'] name=["']wpEditToken["'])/;
++	$edittoken_rev_regex = qr/(?<=name=['"]wpEditToken['"] value=["'])[0-9a-f]+\+?\\?(?=["'])/;
+ 	$autosumm_regex = qr/(?<=name=["']wpAutoSummary["'] value=["'])[0-9a-f]+(?=["'])/;
+ 	$edittoken_delete_regex = qr/^.*wpEditToken["'][^>]*?value=["'](.*?)["'].*$/s;
+ 	$pagehistory_delete_regex = qr/.*<ul id\=["']pagehistory["']>(.*?)<\/ul>.*/;

Added: trunk/libmediawiki-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libmediawiki-perl/debian/patches/series?rev=7791&op=file
==============================================================================
--- trunk/libmediawiki-perl/debian/patches/series (added)
+++ trunk/libmediawiki-perl/debian/patches/series Thu Sep 20 12:53:27 2007
@@ -1,0 +1,1 @@
+fix_edit_token.patch

Modified: trunk/libmediawiki-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libmediawiki-perl/debian/rules?rev=7791&op=diff
==============================================================================
--- trunk/libmediawiki-perl/debian/rules (original)
+++ trunk/libmediawiki-perl/debian/rules Thu Sep 20 12:53:27 2007
@@ -19,24 +19,26 @@
 
 TMP     =$(CURDIR)/debian/$(PACKAGE)
 
-build: build-stamp
+include /usr/share/quilt/quilt.make
+
+build: patch build-stamp
 build-stamp:
 	dh_testdir
 
-	# Add commands to compile the package here
-	$(PERL) Makefile.PL INSTALLDIRS=vendor
-	$(MAKE) OPTIMIZE="-Wall -O2 -g"
+	$(PERL) Makefile.PL \
+		INSTALLDIRS=vendor \
+		VENDORARCHEXP=/usr/share/perl5/ \
+		INSTALLVENDORARCH=/usr/share/perl5/
+	$(MAKE)
+	$(MAKE) test
 
-	touch build-stamp
+	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
-
-	# Add commands to clean up after the build process here
+	dh_clean build-stamp install-stamp
 	[ ! -f Makefile ] || $(MAKE) realclean
-
-	dh_clean build-stamp install-stamp
 
 install: build install-stamp
 install-stamp:
@@ -44,31 +46,17 @@
 	dh_testroot
 	dh_clean -k
 
-	# Add commands to install the package into debian/$PACKAGE_NAME here
-	$(MAKE) test
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
 
-	# As this is a architecture independent package, we are not
-	# supposed to install stuff to /usr/lib. MakeMaker creates
-	# the dirs, we delete them from the deb:
-	rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/lib/perl5
-
-	touch install-stamp
+	touch $@
 
 binary-arch:
-# We have nothing to do by default.
-
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-#	dh_installcron
-#	dh_installmenu
-#	dh_installexamples
 	dh_installdocs README
 	dh_installchangelogs Changes
 	dh_perl
-	dh_link
-	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_installdeb




More information about the Pkg-perl-cvs-commits mailing list