https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115458

Revision: 115458
Author:   faidon
Date:     2012-05-29 17:55:00 +0000 (Tue, 29 May 2012)
Log Message:
-----------
* Build for precise.
* Replace php5-common build-dep with ${php:Depends} and add a stanza to
  debian/rules to generate that, to always depend on the built-for PHP API.
* Bump debhelper compatibility level & build-dep to >= 8.
* Cleanup debian/rules a bit.
* Bump Standards-Version to 3.9.3.
* Change Section to php.
* Use dh_strip's -k to keep debugging symbols in /usr/lib/debug.

Modified Paths:
--------------
    trunk/debs/php5-fss/debian/changelog
    trunk/debs/php5-fss/debian/compat
    trunk/debs/php5-fss/debian/control
    trunk/debs/php5-fss/debian/rules

Modified: trunk/debs/php5-fss/debian/changelog
===================================================================
--- trunk/debs/php5-fss/debian/changelog        2012-05-29 17:52:58 UTC (rev 
115457)
+++ trunk/debs/php5-fss/debian/changelog        2012-05-29 17:55:00 UTC (rev 
115458)
@@ -1,14 +1,22 @@
-php5-fss (0.0.1-5ubuntu1~lucid1) lucid-wikimedia; urgency=low  
+php5-fss (0.0.1-5) precise-wikimedia; urgency=low
 
   [ Sam Reed ]
   * Remove deprecated hash comment from fss.ini
 
   [ Faidon Liambotis ]
+  * Build for precise.
+  * Replace php5-common build-dep with ${php:Depends} and add a stanza to
+    debian/rules to generate that, to always depend on the built-for PHP API.
   * Get rid of useless debian/dirs.
+  * Bump debhelper compatibility level & build-dep to >= 8.
+  * Cleanup debian/rules a bit.
+  * Bump Standards-Version to 3.9.3.
+  * Change Section to php.
+  * Use dh_strip's -k to keep debugging symbols in /usr/lib/debug.
 
- -- Faidon Liambotis <fai...@wikimedia.org>  Tue, 29 May 2012 20:52:09 +0300
+ -- Faidon Liambotis <fai...@wikimedia.org>  Tue, 29 May 2012 20:54:29 +0300
 
-php5-fss (0.0.1-4ubuntu1~lucid1) lucid-wikimedia; urgency=low  
+php5-fss (0.0.1-4ubuntu1~lucid1) lucid-wikimedia; urgency=low
 
   * Include patch for php 5.3
 

Modified: trunk/debs/php5-fss/debian/compat
===================================================================
--- trunk/debs/php5-fss/debian/compat   2012-05-29 17:52:58 UTC (rev 115457)
+++ trunk/debs/php5-fss/debian/compat   2012-05-29 17:55:00 UTC (rev 115458)
@@ -1 +1 @@
-5
+8

Modified: trunk/debs/php5-fss/debian/control
===================================================================
--- trunk/debs/php5-fss/debian/control  2012-05-29 17:52:58 UTC (rev 115457)
+++ trunk/debs/php5-fss/debian/control  2012-05-29 17:55:00 UTC (rev 115458)
@@ -1,12 +1,12 @@
 Source: php5-fss
-Section: web
+Section: php
 Priority: optional
 Maintainer: Brion Vibber <br...@wikimedia.org>
-Build-Depends: debhelper (>= 5), php5-dev
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 8), php5-dev
+Standards-Version: 3.9.3
 
 Package: php5-fss
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, php5-common
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}
 Description: FastStringSearch extension used for MediaWiki
  FastStringSearch extension used for MediaWiki

Modified: trunk/debs/php5-fss/debian/rules
===================================================================
--- trunk/debs/php5-fss/debian/rules    2012-05-29 17:52:58 UTC (rev 115457)
+++ trunk/debs/php5-fss/debian/rules    2012-05-29 17:55:00 UTC (rev 115458)
@@ -1,17 +1,7 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
-
-
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -23,74 +13,50 @@
 configure: configure-stamp
 configure-stamp:
        dh_testdir
-       # Add here commands to configure the package.
-       phpize
+       phpize5 --clean
+       phpize5
        ./configure
-
        touch configure-stamp
 
-
 build: build-stamp
 
 build-stamp: configure-stamp 
        dh_testdir
-
-       # Add here commands to compile the package.
        $(MAKE)
-       #docbook-to-man debian/php5-fss.sgml > php5-fss.1
-
        touch $@
 
 clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
-
-       # Add here commands to clean up after the build process.
-       -$(MAKE) clean
-
+       $(MAKE) clean
+       phpize5 --clean
        dh_clean 
 
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k 
+       dh_prep
        dh_installdirs
-
-       # Add here commands to install the package into debian/php5-fss.
        $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/php5-fss install
        install -m 0644 -D debian/fss.ini 
$(CURDIR)/debian/php5-fss/etc/php5/conf.d/fss.ini
 
-
-# Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
 
-# Build architecture-dependent files here.
 binary-arch: build install
+       echo "php:Depends=phpapi-`php-config5 --phpapi`" >> 
debian/php5-fss.substvars
        dh_testdir
        dh_testroot
        dh_installchangelogs 
        dh_installdocs
        dh_installexamples
-#      dh_install
-#      dh_installmenu
-#      dh_installdebconf       
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_python
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
+       dh_install
        dh_installman
        dh_link
-       dh_strip
+       dh_strip -s -k
        dh_compress
        dh_fixperms
-#      dh_perl
-#      dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol


_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to