Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31128
Modified Files:
php5.info php5.patch
Log Message:
* Remove builtin json
* fix dh scripts
Index: php5.info
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.info,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- php5.info 9 Sep 2013 22:35:16 -0000 1.20
+++ php5.info 20 Sep 2013 22:48:30 -0000 1.21
@@ -124,7 +124,7 @@
Source2-MD5: 6988c4ad9f9ddb37c7f04c91542cbc7b
Source2ExtractDir: php-%v
PatchFile: %n.patch
-PatchFile-MD5: e9b283912e327d58b51851884b1318c4
+PatchFile-MD5: 0db6ab20012e4a9542c6cdd521a00bb8
PatchScript: <<
sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
@@ -196,6 +196,12 @@
cp fink/*.conf debian/
cp fink/*.load debian/
cp fink/*.ini debian/
+
+ ## Patch user out of autoscripts
+ perl -pi -e 's,\/usr,%p,g' debian/debhelper/*-php5
+
+ ## No builtin json (dfsg)
+ rm -rf ext/json/*
<<
###
ConfigureParams: <<
@@ -721,8 +727,8 @@
install -m755 fink/debhelper/dh_* debian/php5-dev%p/bin
install -d -m755 debian/php5-dev%p/share/debhelper/autoscripts/
install -m644 debian/debhelper/*-php5
debian/php5-dev%p/share/debhelper/autoscripts/
-install -d -m755 debian/php5-dev%p/share/perl5/Debian/Debhelper/Sequence
-install -m644 fink/debhelper/php5.pm
debian/php5-dev%p/share/perl5/Debian/Debhelper/Sequence
+install -d -m755 debian/php5-dev%p/lib/perl5/Debian/Debhelper/Sequence
+install -m644 fink/debhelper/php5.pm
debian/php5-dev%p/lib/perl5/Debian/Debhelper/Sequence
# install common files
install -d -m755 debian/php5-common%p/lib/php5
@@ -911,11 +917,14 @@
###
SplitOff: <<
Package: %N-dev
+ Provides: dh-php5
BuildDependsOnly: true
Depends: <<
+ libtool2,
%N-common (= %v-%r),
lib%N-embed%type_raw[embedver] (= %v-%r)
<<
+ Recommends: pkg-php-tools
DescUsage: <<
To use phpize you will need libtool2, since it is a BOD package you need to
add that BuildDepends in all php5-modules that use phpize to build.
@@ -965,8 +974,8 @@
SplitOff2: <<
Package: lib%N-embed%type_raw[embedver]
Provides: phpapi-%type_raw[sapiver]
- Replaces: lib%N-embed (<< 5.5.1)
- Conflicts: lib%N-embed (<< 5.5.1)
+ Replaces: lib%N-embed, lib%N-embed4
+ Conflicts: lib%N-embed, lib%N-embed4
Depends: <<
ucf,
%N-common (= %v-%r),
@@ -1910,6 +1919,10 @@
cron-service,
coreutils
<<
+ Provides: php5-mhash
+ Conflicts: php5-mhash
+ Recommends: php5-json
+ Suggests: php5-user-cache
Docfiles: CODING_STANDARDS CREDITS EXTENSIONS LICENSE NEWS README*
test-results.txt
InstallScript: <<
cp -a debian/%n%p/* %i/
Index: php5.patch
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- php5.patch 9 Sep 2013 22:35:16 -0000 1.15
+++ php5.patch 20 Sep 2013 22:48:30 -0000 1.16
@@ -852,9 +852,9 @@
+fi
diff -ruN php-5.5.3.orig/fink/libphp5-embed.postrm.extra
php-5.5.3/fink/libphp5-embed.postrm.extra
--- php-5.5.3.orig/fink/libphp5-embed.postrm.extra 1969-12-31
17:00:00.000000000 -0700
-+++ php-5.5.3/fink/libphp5-embed.postrm.extra 2013-07-22 00:25:25.000000000
-0600
++++ php-5.5.3/fink/libphp5-embed.postrm.extra 2013-09-09 20:31:13.000000000
-0600
@@ -0,0 +1 @@
-+[ "$1" = "remove" ] && ldconfig
++#[ "$1" = "remove" ] && ldconfig
diff -ruN php-5.5.3.orig/fink/maxlifetime php-5.5.3/fink/maxlifetime
--- php-5.5.3.orig/fink/maxlifetime 1969-12-31 17:00:00.000000000 -0700
+++ php-5.5.3/fink/maxlifetime 2013-08-08 09:39:51.000000000 -0600
------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
