r89763 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r89762‎ | r89763 | r89764 >
Date:09:50, 9 June 2011
Author:ariel
Status:deferred
Tags:
Comment:
utf8 normal packaged for lucid, using 3.0 quilt format for packaging
Modified paths:
  • /trunk/debs/wikimedia-normal (added) (history)
  • /trunk/debs/wikimedia-normal/debian.lucid (added) (history)
  • /trunk/debs/wikimedia-normal/debian.lucid/README.Debian (added) (history)
  • /trunk/debs/wikimedia-normal/debian.lucid/README.source (added) (history)
  • /trunk/debs/wikimedia-normal/debian.lucid/changelog (added) (history)
  • /trunk/debs/wikimedia-normal/debian.lucid/compat (added) (history)
  • /trunk/debs/wikimedia-normal/debian.lucid/control (added) (history)
  • /trunk/debs/wikimedia-normal/debian.lucid/copyright (added) (history)
  • /trunk/debs/wikimedia-normal/debian.lucid/dirs (added) (history)
  • /trunk/debs/wikimedia-normal/debian.lucid/docs (added) (history)
  • /trunk/debs/wikimedia-normal/debian.lucid/files (added) (history)
  • /trunk/debs/wikimedia-normal/debian.lucid/install (added) (history)
  • /trunk/debs/wikimedia-normal/debian.lucid/patches (added) (history)
  • /trunk/debs/wikimedia-normal/debian.lucid/patches/inifile.patch (added) (history)
  • /trunk/debs/wikimedia-normal/debian.lucid/patches/install.patch (added) (history)
  • /trunk/debs/wikimedia-normal/debian.lucid/patches/series (added) (history)
  • /trunk/debs/wikimedia-normal/debian.lucid/rules (added) (history)
  • /trunk/debs/wikimedia-normal/debian.lucid/source (added) (history)
  • /trunk/debs/wikimedia-normal/debian.lucid/source/format (added) (history)

Diff [purge]

Index: trunk/debs/wikimedia-normal/debian.lucid/control
@@ -0,0 +1,14 @@
 2+Source: normal
 3+Section: unknown
 4+Priority: extra
 5+Maintainer: Ariel T. Glenn <ariel@wikimedia.org>
 6+Build-Depends: debhelper (>= 7), libicu-dev, php5-cli, php5-dev, swig, g++
 7+Standards-Version: 3.8.3
 8+Vcs-svn: http://svn/wikimedia.org/viewvc/mediawiki/trunk/extensions/normal
 9+Homepage: http://svn/wikimedia.org/viewvc/mediawiki/trunk/extensions/normal
 10+
 11+Package: wikimedia-php5-utfnormal
 12+Architecture: any
 13+Depends: ${shlibs:Depends}, ${misc:Depends}, php5-cli, php5-common, libicu42
 14+Description: PHP extension to use ICU library to do stuff
 15+ PHP extension to use ICU library for UTF-8 normalization.
Index: trunk/debs/wikimedia-normal/debian.lucid/source/format
@@ -0,0 +1 @@
 2+3.0 (quilt)
Index: trunk/debs/wikimedia-normal/debian.lucid/dirs
@@ -0,0 +1 @@
 2+etc/php5/conf.d
Index: trunk/debs/wikimedia-normal/debian.lucid/files
@@ -0,0 +1 @@
 2+wikimedia-php5-utfnormal_0.0.2-1ubuntu~lucid1_amd64.deb unknown extra
Index: trunk/debs/wikimedia-normal/debian.lucid/compat
@@ -0,0 +1 @@
 2+7
Index: trunk/debs/wikimedia-normal/debian.lucid/install
@@ -0,0 +1 @@
 2+utfnormal.ini etc/php5/conf.d
\ No newline at end of file
Index: trunk/debs/wikimedia-normal/debian.lucid/changelog
@@ -0,0 +1,5 @@
 2+normal (0.0.2-1ubuntu~lucid1) lucid-wikimedia; urgency=low
 3+
 4+ * Initial release
 5+
 6+ -- Ariel T. Glenn <ariel@wikimedia.org> Wed, 08 Jun 2011 11:14:38 +0300
Index: trunk/debs/wikimedia-normal/debian.lucid/patches/install.patch
@@ -0,0 +1,78 @@
 2+Remove Debian package references from Makefile in preparation for using standard debian build system
 3+
 4+Move fPIC into g++ line, under Deb build CFLAGS must have some predefined
 5+value already which doesn't include it
 6+
 7+Remove link against libicudata, it's not used
 8+--- a/Makefile
 9+@@ -2,10 +2,8 @@
 10+ PRODUCT=utfnormal
 11+ VERSION=0.0.1
 12+
 13+-DESTDIR?=
 14+-
 15+ CXX?=g++
 16+-CFLAGS?=-O2 -fPIC
 17++CFLAGS?=-O2
 18+
 19+ # For Linux
 20+ SHARED = -shared
 21+@@ -13,19 +11,6 @@
 22+ # For Mac OS X
 23+ #SHARED = -bundle -flat_namespace -undefined suppress
 24+
 25+-DEBFILES=\
 26+-debian/changelog\
 27+-debian/compat\
 28+-debian/control\
 29+-debian/copyright\
 30+-debian/dirs\
 31+-debian/docs\
 32+-debian/README.Debian\
 33+-debian/rules
 34+-
 35+-DISTDIRS=\
 36+-debian
 37+-
 38+ TMPDIST=$(PRODUCT)-$(VERSION)
 39+ TARBALL=$(TMPDIST).tar.gz
 40+
 41+@@ -33,13 +18,13 @@
 42+ $(PRODUCT).spec \
 43+ $(PRODUCT).cpp $(PRODUCT).i \
 44+ $(PRODUCT)_wrap.cpp php_$(PRODUCT).h \
 45+- test.php \
 46+- $(DEBFILES)
 47++ test.php
 48++
 49+
 50+
 51+ php_$(PRODUCT).so : $(PRODUCT).cpp $(PRODUCT)_wrap.cpp
 52+- $(CXX) $(CFLAGS) `php-config --includes --ldflags --libs` \
 53+- -licuuc -licudata \
 54++ $(CXX) $(CFLAGS) -fPIC `php-config --includes --ldflags --libs` \
 55++ -licuuc \
 56+ $(SHARED) -o php_$(PRODUCT).so $(PRODUCT).cpp $(PRODUCT)_wrap.cpp
 57+
 58+ $(PRODUCT)_wrap.cpp : $(PRODUCT).i
 59+@@ -64,7 +49,6 @@
 60+ distclean : clean
 61+ rm -rf $(TMPDIST)
 62+ rm -f $(TMPDIST).tar.gz
 63+- rm -rf debbuild
 64+
 65+ dist : $(TARBALL)
 66+
 67+@@ -79,11 +63,3 @@
 68+ cp $(TARBALL) /usr/src/redhat/SOURCES
 69+ cp $(PRODUCT).spec /usr/src/redhat/SPECS/$(PRODUCT)-$(VERSION).spec
 70+ cd /usr/src/redhat/SPECS && rpmbuild -ba $(PRODUCT)-$(VERSION).spec
 71+-
 72+-deb : $(TARBALL)
 73+- rm -rf debbuild
 74+- mkdir debbuild
 75+- cd debbuild && tar zxvf ../$(TARBALL)
 76+- cd debbuild/$(TMPDIST) && dpkg-buildpackage -rfakeroot
 77+- #rm -rf debbuild/$(TMPDIST)
 78+-
Index: trunk/debs/wikimedia-normal/debian.lucid/patches/series
@@ -0,0 +1,2 @@
 2+install.patch
 3+inifile.patch
Index: trunk/debs/wikimedia-normal/debian.lucid/patches/inifile.patch
@@ -0,0 +1,5 @@
 2+Add utfnormal.ini file
 3+--- /dev/null
 4+@@ -0,0 +1 @@
 5++extension=php_utfnormal.so
Index: trunk/debs/wikimedia-normal/debian.lucid/copyright
@@ -0,0 +1,25 @@
 2+This work was packaged for Debian by:
 3+
 4+ Ariel T. Glenn <ariel@wikimedia.org> on Wed, 08 Jun 2011 11:14:38 +0300
 5+
 6+It was downloaded from <url://example.com>
 7+
 8+Upstream Author(s):
 9+
 10+ brion <brion@wikimedia.org>
 11+
 12+Copyright:
 13+
 14+ <Copyright (C) 2011 Brion Vibber>
 15+
 16+License:
 17+
 18+ GPL2+
 19+
 20+The Debian packaging is:
 21+
 22+ Copyright (C) 2011 Ariel T. Glenn <ariel@wikimedia.org>
 23+
 24+and is licensed under the GPL version 3,
 25+see `/usr/share/common-licenses/GPL-3'.
 26+
Index: trunk/debs/wikimedia-normal/debian.lucid/docs
Index: trunk/debs/wikimedia-normal/debian.lucid/rules
@@ -0,0 +1,17 @@
 2+#!/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.
 9+
 10+# Uncomment this to turn on verbose mode.
 11+#export DH_VERBOSE=1
 12+
 13+%:
 14+ dh $@ --with quilt
 15+
 16+override_dh_auto_test:
 17+
 18+
Property changes on: trunk/debs/wikimedia-normal/debian.lucid/rules
___________________________________________________________________
Added: svn:executable
119 + *
Index: trunk/debs/wikimedia-normal/debian.lucid/README.source
@@ -0,0 +1,9 @@
 2+normal for Debian
 3+-----------------
 4+
 5+<this file describes information about the source package, see Debian policy
 6+manual section 4.14. You WILL either need to modify or delete this file>
 7+
 8+
 9+
 10+
Index: trunk/debs/wikimedia-normal/debian.lucid/README.Debian
@@ -0,0 +1,11 @@
 2+normal for Debian
 3+-----------------
 4+
 5+This extension has been repackaged for lucid. The new format (3.0 quilt)
 6+is not available in previous Unbuntu distributions, and our repo and svn
 7+management has changed as well since this was first packaged. The debian
 8+directory that one retrieves when checking out the extension from svn is
 9+deprecated; please see instead
 10+http://svn/wikimedia.org/viewvc/mediawiki/trunk/debs/normal
 11+
 12+ -- Ariel T. Glenn <ariel@wikimedia.org> Wed, 08 Jun 2011 11:14:38 +0300

Status & tagging log