r68303 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r68302‎ | r68303 | r68304 >
Date:08:55, 20 June 2010
Author:tstarling
Status:deferred
Tags:
Comment:
Updated packaging for new non-swig version. Switched to debhelper 7 since it's the first version of debhelper designed for use by humans (as opposed to Debian maintainers).
Modified paths:
  • /trunk/extensions/wikidiff2/debian/changelog (modified) (history)
  • /trunk/extensions/wikidiff2/debian/compat (modified) (history)
  • /trunk/extensions/wikidiff2/debian/control (modified) (history)
  • /trunk/extensions/wikidiff2/debian/rules (modified) (history)

Diff [purge]

Index: trunk/extensions/wikidiff2/debian/compat
@@ -1 +1 @@
2 -5
 2+7
Index: trunk/extensions/wikidiff2/debian/changelog
@@ -1,3 +1,9 @@
 2+php5-wikidiff2 (1.1.0-1) lucid; urgency=low
 3+
 4+ * New non-swig version
 5+
 6+ -- Tim Starling <tstarling@wikimedia.org> Sun, 20 Jun 2010 17:45:37 +1000
 7+
28 php5-wikidiff2 (1.0.2-1) unstable; urgency=low
39
410 * Initial release as deb package
Index: trunk/extensions/wikidiff2/debian/rules
@@ -1,98 +1,21 @@
22 #!/usr/bin/make -f
3 -# -*- makefile -*-
4 -# Sample debian/rules that uses debhelper.
5 -# This file was originally written by Joey Hess and Craig Small.
6 -# As a special exception, when this file is copied by dh-make into a
7 -# dh-make output file, you may use that output file without restriction.
8 -# This special exception was added by Craig Small in version 0.37 of dh-make.
93
10 -# Uncomment this to turn on verbose mode.
11 -#export DH_VERBOSE=1
 4+# The PHP header files are not designed to be run with C++, they hit this
 5+# warning a lot.
 6+CXXFLAGS=-Wno-write-strings
127
 8+%:
 9+ dh $@
1310
1411
 12+override_dh_auto_configure:
 13+ # Slightly hacked here to make it work with other PHP installations
 14+ # earlier in the path, so I don't have to make chroots. Really it should just
 15+ # be phpize && dh_auto_configure.
 16+ /usr/bin/phpize
 17+ dh_auto_configure -- --with-php-config=/usr/bin/php-config
1518
16 -CFLAGS = -Wall -g
 19+override_dh_auto_test:
1720
18 -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
19 - CFLAGS += -O0
20 -else
21 - CFLAGS += -O2
22 -endif
23 -
24 -configure: configure-stamp
25 -configure-stamp:
26 - dh_testdir
27 - # Add here commands to configure the package.
28 -
29 - touch configure-stamp
30 -
31 -
32 -build: build-stamp
33 -
34 -build-stamp: configure-stamp
35 - dh_testdir
36 -
37 - # Add here commands to compile the package.
38 - $(MAKE)
39 - #docbook-to-man debian/php5-wikidiff2.sgml > php5-wikidiff2.1
40 -
41 - touch $@
42 -
43 -clean:
44 - dh_testdir
45 - dh_testroot
46 - rm -f build-stamp configure-stamp
47 -
48 - # Add here commands to clean up after the build process.
49 - -$(MAKE) clean
50 -
51 - dh_clean
52 -
53 -install: build
54 - dh_testdir
55 - dh_testroot
56 - dh_clean -k
57 - dh_installdirs
58 -
59 - # Add here commands to install the package into debian/php5-wikidiff2.
60 - $(MAKE) INSTALL_TARGET=$(CURDIR)/debian/php5-wikidiff2 install
61 -
62 -
63 -# Build architecture-independent files here.
64 -binary-indep: build install
65 -# We have nothing to do by default.
66 -
67 -# Build architecture-dependent files here.
68 -binary-arch: build install
69 - dh_testdir
70 - dh_testroot
71 - dh_installchangelogs
72 - dh_installdocs
73 - dh_installexamples
74 -# dh_install
75 -# dh_installmenu
76 -# dh_installdebconf
77 -# dh_installlogrotate
78 -# dh_installemacsen
79 -# dh_installpam
80 -# dh_installmime
81 -# dh_python
82 -# dh_installinit
83 -# dh_installcron
84 -# dh_installinfo
85 - dh_installman
86 - dh_link
87 - dh_strip
88 - dh_compress
89 - dh_fixperms
90 -# dh_perl
91 -# dh_makeshlibs
92 - dh_installdeb
93 - dh_shlibdeps
94 - dh_gencontrol
95 - dh_md5sums
96 - dh_builddeb
97 -
98 -binary: binary-indep binary-arch
99 -.PHONY: build clean binary-indep binary-arch binary install configure
 21+override_dh_auto_install:
 22+ INSTALL_ROOT=$(CURDIR)/debian/php5-wikidiff2 make install
Index: trunk/extensions/wikidiff2/debian/control
@@ -1,8 +1,8 @@
22 Source: php5-wikidiff2
33 Section: web
44 Priority: optional
5 -Maintainer: Brion Vibber <brion@wikimedia.org>
6 -Build-Depends: debhelper (>= 5), php5-dev
 5+Maintainer: Tim Starling <tstarling@wikimedia.org>
 6+Build-Depends: debhelper (>= 7.0.50), php5-dev, libthai-dev
77 Standards-Version: 3.7.2
88
99 Package: php5-wikidiff2

Status & tagging log