Changeset: da5b4376d8b5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=da5b4376d8b5
Modified Files:
        debian/control
        debian/fix-deb.sh
Branch: Jun2016
Log Message:

php-common is presumably the future.


diffs (39 lines):

diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -136,7 +136,9 @@ Description: MonetDB ODBC driver
 
 Package: php5-monetdb-client
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, php5-common
+# wheezy, jessie, precise, trusty, wily: php5-common
+# xenial: php-common
+Depends: ${shlibs:Depends}, ${misc:Depends}, php-common
 Description: MonetDB php5 client module
  MonetDB is a database management system that is developed from a
  main-memory perspective with use of a fully decomposed storage model,
diff --git a/debian/fix-deb.sh b/debian/fix-deb.sh
--- a/debian/fix-deb.sh
+++ b/debian/fix-deb.sh
@@ -38,10 +38,18 @@ case $SUITE in
 wheezy | precise | trusty)
     # fix control file because these systems don't have liblas and a
     # too old version of libgeos
-    sed -i 's/, libgeos-dev[^,]*//;s/, liblas-c-dev[^,]*//' debian/control
-    sed -i '/^Package:.*lidar/,/^$/d' debian/control
-    sed -i '/^Package:.*geom/,/^$/d' debian/control
+    sed -i -e 's/, libgeos-dev[^,]*//;s/, liblas-c-dev[^,]*//' \
+       -e '/^Package:.*lidar/,/^$/d' \
+       -e '/^Package:.*geom/,/^$/d' debian/control
     rm debian/libmonetdb5-server-lidar.install 
debian/libmonetdb5-server-geom.install
     sed -i 
'/geo[ms]=yes/s/yes/no/;/gdal=yes/s/yes/no/;/lidar=yes/s/yes/no/;/liblas=yes/s/yes/no/'
 debian/rules
     ;;
 esac
+
+case $SUITE in
+wheezy | jessie | precise | trusty | wily)
+    # Xenial Xerus (and presumably newer releases) uses php-common,
+    # all others still have php5-common
+    sed -i 's/php-common/php5-common/' debian/control
+    ;;
+esac
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to