[Pkg-mediawiki-commits] r324 - mediawiki/trunk/debian

[Jonathan Wiltshire]

Author: jmw
Date: 2012-06-05 20:52:19 +0000 (Tue, 05 Jun 2012)
New Revision: 324

Removed:
   mediawiki/trunk/debian/control.in
Modified:
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/control
   mediawiki/trunk/debian/mediawiki.install
   mediawiki/trunk/debian/rules
Log:
Remove CDBS logic and dependencies; use dh auto-sequencer instead

Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2012-06-04 19:58:32 UTC (rev 323)
+++ mediawiki/trunk/debian/changelog	2012-06-05 20:52:19 UTC (rev 324)
@@ -1,6 +1,8 @@
 mediawiki (1:1.19.0-2) UNRELEASED; urgency=low
 
   * Remove last traces of mediaiki-math binary package
+  * Remove CDBS logic and dependencies and use dh
+    auto-sequencer instead
 
  -- Jonathan Wiltshire <jmw at debian.org>  Mon, 04 Jun 2012 20:52:39 +0100
 

Modified: mediawiki/trunk/debian/control
===================================================================
--- mediawiki/trunk/debian/control	2012-06-04 19:58:32 UTC (rev 323)
+++ mediawiki/trunk/debian/control	2012-06-05 20:52:19 UTC (rev 324)
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: Mediawiki Maintenance Team <pkg-mediawiki-devel at lists.alioth.debian.org>
 Uploaders: Romain Beauxis <toots at rastageeks.org>, Jonathan Wiltshire <jmw at debian.org>
-Build-Depends: cdbs,
- debhelper,
+Build-Depends: debhelper,
  dh-buildinfo,
  debhelper (>= 7.0.1), ocaml-nox | ocaml, xsltproc, docbook-xml, docbook-xsl, po-debconf
 Homepage: http://www.mediawiki.org/

Deleted: mediawiki/trunk/debian/control.in
===================================================================
--- mediawiki/trunk/debian/control.in	2012-06-04 19:58:32 UTC (rev 323)
+++ mediawiki/trunk/debian/control.in	2012-06-05 20:52:19 UTC (rev 324)
@@ -1,27 +0,0 @@
-Source: mediawiki
-Section: web
-Priority: optional
-Maintainer: Mediawiki Maintenance Team <pkg-mediawiki-devel at lists.alioth.debian.org>
-Uploaders: Romain Beauxis <toots at rastageeks.org>, Jonathan Wiltshire <jmw at debian.org>
-Build-Depends: @cdbs@,
- debhelper (>= 7.0.1), ocaml-nox | ocaml, xsltproc, docbook-xml, docbook-xsl, po-debconf
-Homepage: http://www.mediawiki.org/
-Standards-Version: 3.9.2
-Vcs-SVN: svn://svn.debian.org/svn/pkg-mediawiki/mediawiki/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-mediawiki/mediawiki/trunk/
-
-Package: mediawiki
-Architecture: all
-Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite, mime-support, libjs-jquery, libjs-jquery-tipsy, libjs-jquery-cookie, libjs-jquery-form, libjs-jquery-tablesorter, ${misc:Depends} 
-Recommends: mysql-server | postgresql-contrib, php5-cli, python
-Suggests: imagemagick | php5-gd, mediawiki-math, memcached, clamav
-Description: website engine for collaborative work
- MediaWiki is a wiki engine (a program for creating a collaboratively
- edited website). It is designed to handle heavy websites containing
- library-like document collections, and supports user uploads of
- images/sounds, multilingual content, TOC autogeneration, ISBN links,
- etc.
- .
- Moreover, it keeps track of changes, so users can receive
- notifications, view diffs and revert edits. This system has many
- other features and can easily be extended.

Modified: mediawiki/trunk/debian/mediawiki.install
===================================================================
--- mediawiki/trunk/debian/mediawiki.install	2012-06-04 19:58:32 UTC (rev 323)
+++ mediawiki/trunk/debian/mediawiki.install	2012-06-05 20:52:19 UTC (rev 324)
@@ -1,2 +1,3 @@
+debian/etc/*	etc/mediawiki
 *.php *.phtml includes index.php languages maintenance mw-config resources skins usr/share/mediawiki
 cache extensions images var/lib/mediawiki

Modified: mediawiki/trunk/debian/rules
===================================================================
--- mediawiki/trunk/debian/rules	2012-06-04 19:58:32 UTC (rev 323)
+++ mediawiki/trunk/debian/rules	2012-06-05 20:52:19 UTC (rev 324)
@@ -1,15 +1,15 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
+DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
 
-# In order to regenerate 'debian/control' :
-#   DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
-# Then check manually if everything's ok
-
-binary-install/mediawiki::
-	cp -rf $(CURDIR)/debian/etc/* $(CURDIR)/debian/mediawiki/etc/mediawiki
+override_dh_install:
+	dh_install
+	# Now some tidying up is required
 	chmod a+x debian/mediawiki/usr/share/mediawiki/maintenance/postgres/compare_schemas.pl
 	chmod a+x debian/mediawiki/usr/share/mediawiki/maintenance/postgres/mediawiki_mysql2postgres.pl
+	find debian/mediawiki -depth \( -name ".cvsignore" -o -name ".arch-ids" \) -exec rm -rf {} \;
 	find debian/mediawiki/usr/share/mediawiki -maxdepth 1 -mindepth 1 | grep -v "\(LocalSettings.php\|AdminSettings.php\|debian-scripts\|images\|extensions\|config\)" | \
 	while read i; do \
 		dh_link "`echo "$$i" | sed -e s#debian/mediawiki/##`" \
@@ -38,9 +38,8 @@
 	sed -e "s#$(DEB_UPSTREAM_VERSION)#$(DEB_NOEPOCH_VERSION)#" \
 			-i debian/mediawiki/usr/share/mediawiki/includes/DefaultSettings.php
 
-binary-predeb/mediawiki::
-	find debian/mediawiki -depth \( -name ".cvsignore" -o -name ".arch-ids" \) -exec rm -rf {} \;
-
 clean::
 	debconf-updatepo
 
+%:
+	dh $@