Bugzilla – Attachment 11066 Details for
Bug 8489
Revised ubuntu-pkg-check.sh, renamed ubuntu package files, tweaked 12.04 package file, copied 12.04 package file to ubuntu.packages
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8489: Revise Ubuntu install files
Bug-8489-Revise-Ubuntu-install-files.patch (text/plain), 11.73 KB, created by
Jared Camins-Esakov
on 2012-07-21 17:37:21 UTC
(
hide
)
Description:
Bug 8489: Revise Ubuntu install files
Filename:
MIME Type:
Creator:
Jared Camins-Esakov
Created:
2012-07-21 17:37:21 UTC
Size:
11.73 KB
patch
obsolete
>From 975c5c898024d605628575648d19a5e06fc1c332 Mon Sep 17 00:00:00 2001 >From: Mark Tompsett <mtompset@hotmail.com> >Date: Sat, 21 Jul 2012 22:04:23 +0800 >Subject: [PATCH] Bug 8489: Revise Ubuntu install files >Content-Type: text/plain; charset="UTF-8" > >1) Changed ubuntu-pkg-check.sh to use lsb_release to determine version > of ubuntu.{version}.packages file. If a versioned file does not > exist, the user is warned, and ubuntu.packages is used. Told the > user which file is being used. Caught apt-cache policy errors nicely. > NOTE: ubuntu.packages MUST BE A COPY OF THE > LATEST ubuntu.{version}.packages FILE! >2) Moved: ubuntu.packages -> ubuntu.10.04.packages > ubuntu_maverick.packages -> ubuntu.10.10.packages > ubuntu.precise.packages -> ubuntu.12.04 packages > (last file created new, but effectively supersedes bug 8488) >3) Tweaked ubuntu.12.04.packages: > * changed yaz3 references to yaz4 > * dropped libmysqlclient16-dev > * changed libmysqlclient16 to libmysqlclient18 >4) Copied the ubuntu.12.04.packages file to ubuntu.packages > >Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> >--- > install_misc/ubuntu-pkg-check.sh | 24 ++++++++++----- > ...ntu_maverick.packages => ubuntu.10.04.packages} | 15 ++++++--- > ...ntu_maverick.packages => ubuntu.10.10.packages} | 0 > ...ntu_maverick.packages => ubuntu.12.04.packages} | 31 ++++++++++++++------ > install_misc/ubuntu.packages | 16 +++++++-- > 5 files changed, 60 insertions(+), 26 deletions(-) > copy install_misc/{ubuntu_maverick.packages => ubuntu.10.04.packages} (91%) > copy install_misc/{ubuntu_maverick.packages => ubuntu.10.10.packages} (100%) > rename install_misc/{ubuntu_maverick.packages => ubuntu.12.04.packages} (83%) > >diff --git a/install_misc/ubuntu-pkg-check.sh b/install_misc/ubuntu-pkg-check.sh >index 9303082..75bec3f 100755 >--- a/install_misc/ubuntu-pkg-check.sh >+++ b/install_misc/ubuntu-pkg-check.sh >@@ -1,19 +1,27 @@ > #!/bin/sh > >-UBUNTU_PACKAGES=`dirname $0`/ubuntu.packages >+# determine what directory this script is in, because the packages files >+# should be there too. >+DIR=`dirname $0` > >-# sanity checks >+#determine which vbersion of ubuntu >+VERSION=`lsb_release -r | cut -f2 -d' '` >+UBUNTU_PACKAGES=$DIR/ubuntu.$VERSION.packages > >+# sanity checks > if [ ! -e $UBUNTU_PACKAGES ]; then >- echo ERROR: Could not find $UBUNTU_PACKAGES file for running check. >- exit >+ echo "WARNING! We strongly recommend an LTS release." >+ UBUNTU_PACKAGES=$DIR/ubuntu.packages > fi >+echo "Using the $UBUNTU_PACKAGES file." > > # main >- > UBUNTU_PACKAGES_LIST=`awk '{print $1}' $UBUNTU_PACKAGES | grep -v '^\s*#' | grep -v '^\s*$'` > for F in $UBUNTU_PACKAGES_LIST; do >- UBUNTU_PKG_POLICY=`apt-cache policy $F | grep "Installed:"` >- UBUNTU_PKG_VERSION=`echo $UBUNTU_PKG_POLICY | awk '{print $2}'` >- echo "$F = $UBUNTU_PKG_VERSION" >+ UBUNTU_PKG_POLICY=`apt-cache policy $F 2> /dev/null | grep "Installed:"` >+ if [ "${#UBUNTU_PKG_POLICY}" -eq "0" ]; then >+ UBUNTU_PKG_POLICY="Installed: \(none\)\*" >+ fi >+ UBUNTU_PKG_VERSION=`echo $UBUNTU_PKG_POLICY | awk '{print $2}'` >+ echo "$F = $UBUNTU_PKG_VERSION" > done >diff --git a/install_misc/ubuntu_maverick.packages b/install_misc/ubuntu.10.04.packages >similarity index 91% >copy from install_misc/ubuntu_maverick.packages >copy to install_misc/ubuntu.10.04.packages >index 9b806bb..61fbebf 100644 >--- a/install_misc/ubuntu_maverick.packages >+++ b/install_misc/ubuntu.10.04.packages >@@ -1,4 +1,3 @@ >- > apache2 install > at install > daemon install >@@ -53,6 +52,7 @@ libalgorithm-checkdigits-perl install > libauthen-cas-client-perl install > libbiblio-endnotestyle-perl install > libbusiness-isbn-perl install >+libcgi-session-driver-memcached-perl install > libcgi-session-perl install > libcgi-session-serialize-yaml-perl install > libclass-factory-util-perl install >@@ -60,6 +60,7 @@ libdata-ical-perl install > libdate-calc-perl install > libdate-manip-perl install > libdatetime-perl install >+libdatetime-format-dateparse-perl install > libdatetime-format-ical-perl install > libdatetime-format-mail-perl install > libdatetime-format-strptime-perl install >@@ -72,6 +73,7 @@ libdbi-perl install > libemail-date-perl install > libgd-barcode-perl install > libgraphics-magick-perl install >+libgravatar-url-perl install > libhtml-scrubber-perl install > libhtml-template-pro-perl install > libhttp-oai-perl install >@@ -79,7 +81,7 @@ liblingua-ispell-perl install > liblingua-stem-perl install > liblingua-stem-snowball-perl install > liblist-moreutils-perl install >-liblocale-currency-format-perl install >+liblocale-currency-format-perl install > liblocale-gettext-perl install > liblocale-po-perl install > libmail-sendmail-perl install >@@ -87,16 +89,19 @@ libmarc-charset-perl install > libmarc-crosswalk-dublincore-perl install > libmarc-record-perl install > libmarc-xml-perl install >-libmemoize-memcached-perl install >+libmemoize-memcached-perl install > libmime-lite-perl install >+libmodern-perl install > libmodule-install-perl install > libnet-ldap-perl install > libnet-server-perl install >+libpdf-api2-simple-perl install >+libreadonly-perl install >+libreadonly-xs-perl install > libnet-z3950-zoom-perl install > libnumber-format-perl install > libpdf-api2-perl install > libpdf-reuse-perl install >-libpdf-api2-simple-perl install > libpdf-reuse-barcode-perl install > libpdf-table-perl install > libpoe-perl install >@@ -104,7 +109,7 @@ libschedule-at-perl install > libsms-send-perl install > libtemplate-perl install > libtext-charwidth-perl install >-libtext-csv-encoded-perl install >+libtext-csv-encoded-perl install > libtext-csv-perl install > libtext-iconv-perl install > libtext-wrapi18n-perl install >diff --git a/install_misc/ubuntu_maverick.packages b/install_misc/ubuntu.10.10.packages >similarity index 100% >copy from install_misc/ubuntu_maverick.packages >copy to install_misc/ubuntu.10.10.packages >diff --git a/install_misc/ubuntu_maverick.packages b/install_misc/ubuntu.12.04.packages >similarity index 83% >rename from install_misc/ubuntu_maverick.packages >rename to install_misc/ubuntu.12.04.packages >index 9b806bb..dff4053 100644 >--- a/install_misc/ubuntu_maverick.packages >+++ b/install_misc/ubuntu.12.04.packages >@@ -1,4 +1,3 @@ >- > apache2 install > at install > daemon install >@@ -9,15 +8,14 @@ make install > # mysql packages > > mysql-server install >-libmysqlclient16 install >-libmysqlclient16-dev install >+libmysqlclient18 install > > # yaz packages > > yaz install > yaz-doc install >-libyaz3 install >-libyaz3-dev install >+libyaz4 install >+libyaz4-dev install > > # zebra packages > >@@ -53,13 +51,16 @@ libalgorithm-checkdigits-perl install > libauthen-cas-client-perl install > libbiblio-endnotestyle-perl install > libbusiness-isbn-perl install >+libcgi-session-driver-memcached-perl install > libcgi-session-perl install > libcgi-session-serialize-yaml-perl install >+libclass-accessor-perl install > libclass-factory-util-perl install > libdata-ical-perl install > libdate-calc-perl install > libdate-manip-perl install > libdatetime-perl install >+libdatetime-format-dateparse-perl install > libdatetime-format-ical-perl install > libdatetime-format-mail-perl install > libdatetime-format-strptime-perl install >@@ -72,14 +73,18 @@ libdbi-perl install > libemail-date-perl install > libgd-barcode-perl install > libgraphics-magick-perl install >+libgravatar-url-perl install > libhtml-scrubber-perl install > libhtml-template-pro-perl install >+libhttp-cookies-perl install >+libhttp-message-perl install > libhttp-oai-perl install >+libjson-perl install > liblingua-ispell-perl install > liblingua-stem-perl install > liblingua-stem-snowball-perl install > liblist-moreutils-perl install >-liblocale-currency-format-perl install >+liblocale-currency-format-perl install > liblocale-gettext-perl install > liblocale-po-perl install > libmail-sendmail-perl install >@@ -87,16 +92,20 @@ libmarc-charset-perl install > libmarc-crosswalk-dublincore-perl install > libmarc-record-perl install > libmarc-xml-perl install >-libmemoize-memcached-perl install >+libmemoize-memcached-perl install > libmime-lite-perl install >+libmodern-perl install >+libmodern-perl-perl install > libmodule-install-perl install > libnet-ldap-perl install > libnet-server-perl install >+libpdf-api2-simple-perl install >+libreadonly-perl install >+libreadonly-xs-perl install > libnet-z3950-zoom-perl install > libnumber-format-perl install > libpdf-api2-perl install > libpdf-reuse-perl install >-libpdf-api2-simple-perl install > libpdf-reuse-barcode-perl install > libpdf-table-perl install > libpoe-perl install >@@ -104,8 +113,9 @@ libschedule-at-perl install > libsms-send-perl install > libtemplate-perl install > libtext-charwidth-perl install >-libtext-csv-encoded-perl install >+libtext-csv-encoded-perl install > libtext-csv-perl install >+libtext-csv-xs-perl install > libtext-iconv-perl install > libtext-wrapi18n-perl install > libtimedate-perl install >@@ -113,6 +123,8 @@ libtime-duration-perl install > libtime-format-perl install > libuniversal-require-perl install > libunix-syslog-perl install >+liburi-perl install >+libwww-perl install > libxml-perl install > libxml-dom-perl install > libxml-dumper-perl install >@@ -122,6 +134,7 @@ libxml-namespacesupport-perl install > libxml-parser-perl install > libxml-regexp-perl install > libxml-rss-perl install >+libxml-sax-perl install > libxml-sax-writer-perl install > libxml-simple-perl install > libxml-xslt-perl install >diff --git a/install_misc/ubuntu.packages b/install_misc/ubuntu.packages >index 61fbebf..dff4053 100644 >--- a/install_misc/ubuntu.packages >+++ b/install_misc/ubuntu.packages >@@ -8,15 +8,14 @@ make install > # mysql packages > > mysql-server install >-libmysqlclient16 install >-libmysqlclient16-dev install >+libmysqlclient18 install > > # yaz packages > > yaz install > yaz-doc install >-libyaz3 install >-libyaz3-dev install >+libyaz4 install >+libyaz4-dev install > > # zebra packages > >@@ -55,6 +54,7 @@ libbusiness-isbn-perl install > libcgi-session-driver-memcached-perl install > libcgi-session-perl install > libcgi-session-serialize-yaml-perl install >+libclass-accessor-perl install > libclass-factory-util-perl install > libdata-ical-perl install > libdate-calc-perl install >@@ -76,7 +76,10 @@ libgraphics-magick-perl install > libgravatar-url-perl install > libhtml-scrubber-perl install > libhtml-template-pro-perl install >+libhttp-cookies-perl install >+libhttp-message-perl install > libhttp-oai-perl install >+libjson-perl install > liblingua-ispell-perl install > liblingua-stem-perl install > liblingua-stem-snowball-perl install >@@ -92,6 +95,7 @@ libmarc-xml-perl install > libmemoize-memcached-perl install > libmime-lite-perl install > libmodern-perl install >+libmodern-perl-perl install > libmodule-install-perl install > libnet-ldap-perl install > libnet-server-perl install >@@ -111,6 +115,7 @@ libtemplate-perl install > libtext-charwidth-perl install > libtext-csv-encoded-perl install > libtext-csv-perl install >+libtext-csv-xs-perl install > libtext-iconv-perl install > libtext-wrapi18n-perl install > libtimedate-perl install >@@ -118,6 +123,8 @@ libtime-duration-perl install > libtime-format-perl install > libuniversal-require-perl install > libunix-syslog-perl install >+liburi-perl install >+libwww-perl install > libxml-perl install > libxml-dom-perl install > libxml-dumper-perl install >@@ -127,6 +134,7 @@ libxml-namespacesupport-perl install > libxml-parser-perl install > libxml-regexp-perl install > libxml-rss-perl install >+libxml-sax-perl install > libxml-sax-writer-perl install > libxml-simple-perl install > libxml-xslt-perl install >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 8489
:
11063
|
11064
|
11065
| 11066