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

Revision: 115460
Author:   faidon
Date:     2012-05-29 18:03:17 +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.
* 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.

Modified Paths:
--------------
    trunk/php/wmerrors/debian/changelog
    trunk/php/wmerrors/debian/compat
    trunk/php/wmerrors/debian/control
    trunk/php/wmerrors/debian/rules

Removed Paths:
-------------
    trunk/php/wmerrors/debian/dirs

Modified: trunk/php/wmerrors/debian/changelog
===================================================================
--- trunk/php/wmerrors/debian/changelog 2012-05-29 17:57:28 UTC (rev 115459)
+++ trunk/php/wmerrors/debian/changelog 2012-05-29 18:03:17 UTC (rev 115460)
@@ -1,3 +1,17 @@
+php5-wmerrors (1.1.4-2) precise-wikimedia; urgency=low
+
+  * 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 21:01:31 +0300
+
 php5-wmerrors (1.1.4-1) lucid-wikimedia; urgency=low
 
   * Don't strip symbols

Modified: trunk/php/wmerrors/debian/compat
===================================================================
--- trunk/php/wmerrors/debian/compat    2012-05-29 17:57:28 UTC (rev 115459)
+++ trunk/php/wmerrors/debian/compat    2012-05-29 18:03:17 UTC (rev 115460)
@@ -1 +1 @@
-5
+8

Modified: trunk/php/wmerrors/debian/control
===================================================================
--- trunk/php/wmerrors/debian/control   2012-05-29 17:57:28 UTC (rev 115459)
+++ trunk/php/wmerrors/debian/control   2012-05-29 18:03:17 UTC (rev 115460)
@@ -1,11 +1,11 @@
 Source: php5-wmerrors
-Section: web
+Section: php
 Priority: extra
 Maintainer: Tim Starling <tstarl...@wikimedia.org>
-Build-Depends: debhelper (>= 5), autotools-dev, php5-dev
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 8), autotools-dev, php5-dev
+Standards-Version: 3.9.3
 
 Package: php5-wmerrors
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}
 Description: An extension for enhancing and customising the handling of PHP 
errors.

Deleted: trunk/php/wmerrors/debian/dirs
===================================================================
--- trunk/php/wmerrors/debian/dirs      2012-05-29 17:57:28 UTC (rev 115459)
+++ trunk/php/wmerrors/debian/dirs      2012-05-29 18:03:17 UTC (rev 115460)
@@ -1 +0,0 @@
-usr/lib/php5/20060613+lfs/

Modified: trunk/php/wmerrors/debian/rules
===================================================================
--- trunk/php/wmerrors/debian/rules     2012-05-29 17:57:28 UTC (rev 115459)
+++ trunk/php/wmerrors/debian/rules     2012-05-29 18:03:17 UTC (rev 115460)
@@ -1,21 +1,12 @@
 #!/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
 
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-
 config.status:
        dh_testdir
        # Add here commands to configure the package.
@@ -25,72 +16,47 @@
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
        cp -f /usr/share/misc/config.guess config.guess
 endif
-       phpize
+       phpize5
        ./configure
-       #./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) 
--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info 
CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
-
 build: build-stamp
 
 build-stamp:  config.status
        dh_testdir
-
-       # Add here commands to compile the package.
        $(MAKE)
-       #docbook-to-man debian/wmerrors.sgml > wmerrors.1
-
        touch $@
 
 clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp 
-
-       # Add here commands to clean up after the build process.
-       -$(MAKE) distclean
+       $(MAKE) distclean
        rm -f config.sub config.guess
-
        dh_clean 
 
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k 
+       dh_prep
        dh_installdirs
 
-       # Add here commands to install the package into debian/wmerrors.
        INSTALL_ROOT=$(CURDIR)/debian/php5-wmerrors $(MAKE) install
 
-
-# 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-wmerrors.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