wok-6.x rev 15724

Move to undigest: php-cups fotoxx printoxx gtkaml v4l-dvb
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Dec 26 14:11:39 2013 +0000 (2013-12-26)
parents e10c58dd2635
children 5baff08ebc11
files fotoxx/receipt fotoxx/stuff/fotoxx.desktop gtkaml/receipt linmodem-hsfmodem/receipt linmodem-hsfmodem/stuff/hsfmodem-7.80.02.05full.diff linmodem-hsfmodem/stuff/zone.tab php-cups/receipt printoxx/receipt printoxx/stuff/printoxx.desktop v4l-dvb/receipt v4l-dvb/stuff/414e0bbd99bf v4l-dvb/stuff/d0a2ff731670 v4l-dvb/stuff/d64b014c5253
line diff
     1.1 --- a/fotoxx/receipt	Thu Dec 26 13:52:49 2013 +0000
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,34 +0,0 @@
     1.4 -# SliTaz package receipt.
     1.5 -
     1.6 -PACKAGE="fotoxx"
     1.7 -VERSION="11.05.2"
     1.8 -CATEGORY="graphics"
     1.9 -SHORT_DESC="lightweight image editor"
    1.10 -MAINTAINER="gokhlayeh@slitaz.org"
    1.11 -LICENSE="GPL3"
    1.12 -SUGGESTED="exiftool ufraw printoxx"
    1.13 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.14 -WEB_SITE="http://kornelix.squarespace.com/fotoxx" 
    1.15 -WGET_URL="http://kornelix.squarespace.com/storage/downloads/$TARBALL"
    1.16 -TAGS="image editor photo jpeg jpg bmp png gif"
    1.17 -
    1.18 -DEPENDS="gtk+"
    1.19 -BUILD_DEPENDS="exiftool gtk+-dev freeimage freeimage-dev xdg-utils"
    1.20 -
    1.21 -# Rules to configure and make the package.
    1.22 -compile_rules()
    1.23 -{
    1.24 -   	cd $src
    1.25 -	export PREFIX=/usr make
    1.26 -	make DESTDIR=$DESTDIR install
    1.27 -}
    1.28 -
    1.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
    1.30 -genpkg_rules()
    1.31 -{
    1.32 -	mkdir -p $fs/usr/bin $fs/usr/share/$PACKAGE
    1.33 -	cp -a $install/usr/bin $fs/usr
    1.34 -	cp -a $install/usr/share/$PACKAGE/icons $fs/usr/share/$PACKAGE
    1.35 -	#non-standard locale path
    1.36 -	cp -a $install/usr/share/$PACKAGE/locales $fs/usr/share/$PACKAGE
    1.37 -}
     2.1 --- a/fotoxx/stuff/fotoxx.desktop	Thu Dec 26 13:52:49 2013 +0000
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,10 +0,0 @@
     2.4 -[Desktop Entry]
     2.5 -Name=Fotoxx Editor
     2.6 -Comment=A fast GTK+ Image Editor
     2.7 -Exec=fotoxx %f
     2.8 -Terminal=false
     2.9 -Type=Application
    2.10 -Icon=fotoxx
    2.11 -Categories=GTK;Graphics;2DGraphics;Viewer;
    2.12 -MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff
    2.13 -
     3.1 --- a/gtkaml/receipt	Thu Dec 26 13:52:49 2013 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,29 +0,0 @@
     3.4 -# SliTaz package receipt.
     3.5 -
     3.6 -PACKAGE="gtkaml"
     3.7 -VERSION="0.4.2"
     3.8 -CATEGORY="development"
     3.9 -SHORT_DESC="Markup language based on Vala to create Gtk+ apps in XML"
    3.10 -MAINTAINER="pankso@slitaz.org"
    3.11 -LICENSE="LGPL2.1"
    3.12 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
    3.13 -WEB_SITE="http://code.google.com/p/gtkaml/"
    3.14 -WGET_URL="http://gtkaml.googlecode.com/files/$TARBALL"
    3.15 -
    3.16 -DEPENDS="gtk+ libxml2"
    3.17 -BUILD_DEPENDS="gtk+-dev libxml2-dev vala"
    3.18 -
    3.19 -# Rules to configure and make the package.
    3.20 -compile_rules()
    3.21 -{
    3.22 -	cd $src
    3.23 -	./configure && make && make install
    3.24 -}
    3.25 -
    3.26 -# Rules to gen a SliTaz package suitable for Tazpkg.
    3.27 -genpkg_rules()
    3.28 -{
    3.29 -	mkdir -p $fs/usr
    3.30 -	cp -a $install/usr/bin $fs/usr
    3.31 -	cp -a $install/usr/share $fs/usr
    3.32 -}
     4.1 --- a/linmodem-hsfmodem/receipt	Thu Dec 26 13:52:49 2013 +0000
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,85 +0,0 @@
     4.4 -# SliTaz package receipt.
     4.5 -
     4.6 -PACKAGE="linmodem-hsfmodem"
     4.7 -SOURCE="hsfmodem"
     4.8 -VERSION="7.80.02.06full"
     4.9 -CATEGORY="non-free"
    4.10 -SHORT_DESC="Driver for the Conexant (formerly Rockwell) HSF Softmodem family."
    4.11 -MAINTAINER="orphaned@slitaz.org"
    4.12 -LICENSE="other"
    4.13 -TARBALL="$SOURCE-$VERSION.tar.gz"
    4.14 -WEB_SITE="http://www.linuxant.com/drivers"
    4.15 -WGET_URL="http://www.linuxant.com/drivers/hsf/full/archive/$SOURCE-$VERSION/$TARBALL"
    4.16 -
    4.17 -DEPENDS="module-init-tools perl usbutils"
    4.18 -BUILD_DEPENDS="cpio linux lzma linux-module-headers util-linux-getopt \
    4.19 -usbutils-dev"
    4.20 -
    4.21 -# Rules to configure and make the package.
    4.22 -compile_rules()
    4.23 -{
    4.24 -	cd $src
    4.25 -	echo "Apply $file..."
    4.26 -	patch -p1 < $(ls $stuff/$SOURCE-*.diff) || return 1
    4.27 -	grep -rl 'uname -r' . | xargs sed -i "s/uname -r/echo $kvers/g"
    4.28 -	sed -i 's/DECLARE_MUTEX/DEFINE_SEMAPHORE/' \
    4.29 -		modules/osnvm.c modules/GPL/serial_cnxt.c
    4.30 -	sed -i 's/\.ioctl/.unlocked_ioctl/' modules/osdiag.c
    4.31 -	# build driver
    4.32 -	echo "Build driver"
    4.33 -	make ROOT=$DESTDIR install
    4.34 -	# build kernel modules
    4.35 -	echo "Running $DESTDIR/usr/sbin/hsfconfig -ka..."
    4.36 -	$DESTDIR/usr/sbin/hsfconfig -ka
    4.37 -	echo " OK"
    4.38 -}
    4.39 -
    4.40 -# Rules to gen a SliTaz package suitable for Tazpkg.
    4.41 -genpkg_rules()
    4.42 -{
    4.43 -	# kernel modules
    4.44 -	mkdir -p $fs/lib/modules/$kvers
    4.45 -	cp -a /lib/modules/$kvers/extra $fs/lib/modules/$kvers
    4.46 -	# cleaning up
    4.47 -	rm -r /lib/modules/$kvers/extra
    4.48 -	# command files
    4.49 -	mkdir -p $fs/usr
    4.50 -	cp -a $install/usr/sbin $fs/usr
    4.51 -	cp -a $install/usr/lib $fs/usr
    4.52 -	# config files
    4.53 -	mkdir -p $fs/etc
    4.54 -	cp -a $install/etc/hsfmodem $fs/etc
    4.55 -	cp -a $stuff/zone.tab $fs/etc/hsfmodem
    4.56 -}
    4.57 -
    4.58 -post_install()
    4.59 -{
    4.60 -	depmod -a
    4.61 -	echo -n "Install serial port devices"
    4.62 -	hsfconfig -s > /dev/null
    4.63 -	status
    4.64 -	echo -n "Install kernel modules"
    4.65 -	modprobe -v /dev/ttySHSF > /dev/null
    4.66 -	status
    4.67 -	echo -n "Set region"
    4.68 -	hsfconfig -c AUTO
    4.69 -	echo "-----------------------------------------------------------------------------"
    4.70 -	echo "To enable your modem's full functionality (high-speed 56k data and FAX),"
    4.71 -	echo "a license registration key must be obtained from Linuxant and entered with"
    4.72 -	echo "hsfconfig --license."
    4.73 -	echo ""
    4.74 -	echo "Without a proper license key, the modem can only operate in FREE mode,"
    4.75 -	echo "limited to a maximum speed of 14.4Kbps (V.32bis) and the FAX"
    4.76 -	echo "functionality will not be available."
    4.77 -}
    4.78 -
    4.79 -pre_remove()
    4.80 -{
    4.81 -	hsfstop
    4.82 -}
    4.83 -
    4.84 -post_remove()
    4.85 -{
    4.86 -	depmod -a
    4.87 -	rm -r /etc/hsfmodem
    4.88 -}
     5.1 --- a/linmodem-hsfmodem/stuff/hsfmodem-7.80.02.05full.diff	Thu Dec 26 13:52:49 2013 +0000
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,207 +0,0 @@
     5.4 ---- hsfmodem-7.80.02.05full/config.mak	Fri Feb 20 22:30:12 2009
     5.5 -+++ hsfmodem-7.80.02.05full+patch2/config.mak	Sun Apr 11 19:29:08 2010
     5.6 -@@ -131,4 +131,4 @@
     5.7 - 		-e "s!@SCR_SUPPORT@!`test ! \"$(IMPORTED_SCR_SUPPORT)\" = yes; echo $$?`!g" \
     5.8 - 		-e "s!@DMP_SUPPORT@!`test -z \"$(IMPORTED_DMP_SUPPORT)\"; echo $$?`!g" \
     5.9 - 		< $< > $@
    5.10 --	chmod --reference=$< $@
    5.11 -+	chmod 755 $@
    5.12 ---- hsfmodem-7.80.02.05full/makefile	Mon Feb 23 22:51:37 2009
    5.13 -+++ hsfmodem-7.80.02.05full+patch2/makefile	Sun Apr 11 19:29:08 2010
    5.14 -@@ -149,7 +149,7 @@
    5.15 - ifeq ($(RPMOPTEVAL),yes)
    5.16 - RPMTARGETCPU=$(shell rpm --eval '%_target_cpu')
    5.17 - else
    5.18 --RPMTARGETCPU=$(shell uname -i)
    5.19 -+RPMTARGETCPU=$(shell uname -m)
    5.20 - endif
    5.21 - 
    5.22 - ifneq ($(RPMOPTDEFINE),yes)
    5.23 ---- hsfmodem-7.80.02.05full/modules/Makefile	Thu Oct 22 00:35:59 2009
    5.24 -+++ hsfmodem-7.80.02.05full+patch2/modules/Makefile	Sun Apr 11 19:49:54 2010
    5.25 -@@ -20,7 +20,7 @@
    5.26 - include $(TOP)/config.mak
    5.27 - 
    5.28 - IMPORTED = $(TOP)/modules/imported
    5.29 --MACHINE_ARCH := $(shell if uname --hardware-platform >/dev/null 2>&1 && ! uname --hardware-platform | grep -q "unknown"; then uname --hardware-platform; else uname --machine | sed 's/^i.86$$/i386/'; fi)
    5.30 -+MACHINE_ARCH := $(shell if uname -p >/dev/null 2>&1 && ! uname -p | grep -q "unknown"; then uname -p; else uname -m | sed 's/^i.86$$/i386/'; fi)
    5.31 - ifneq ($(subst powerpc,ppc,$(IMPORTED_ARCH)),$(MACHINE_ARCH))
    5.32 - $(warning *** WARNING: Trying to compile kernel modules on a $(MACHINE_ARCH) system while the installed $(CNXTTARGET) driver package is for $(IMPORTED_ARCH), this is likely to fail... ***)
    5.33 - endif
    5.34 -@@ -56,6 +56,7 @@
    5.35 - CNXT_KERNELSRC := /usr/src/kernel-headers-$(shell uname -r)
    5.36 - else
    5.37 - CNXT_KERNELSRC := /usr/src/linux
    5.38 -+CNXT_KERNELSRC := ../../../linux/linux-$(shell uname -r | sed s/-slitaz//)
    5.39 - endif
    5.40 - KERNELSRC_EXISTS := $(shell test -r ${CNXT_KERNELSRC}/include/linux/version.h && echo yes || echo no)
    5.41 - endif
    5.42 -
    5.43 ---- hsfmodem-7.80.02.05full/nvm/linksame	Fri Jan 13 20:23:51 2006
    5.44 -+++ hsfmodem-7.80.02.05full+patch2/nvm/linksame	Sun Apr 11 19:29:08 2010
    5.45 -@@ -17,7 +17,7 @@
    5.46 - 
    5.47 - if $dryrun; then
    5.48 - 	echo "dry run.."
    5.49 --	find . -type f ! -empty -exec md5sum {} \; | sort | while read sum file ; do
    5.50 -+	find . -type f ! -size 0 -exec md5sum {} \; | sort | while read sum file ; do
    5.51 - 		if [ "$sum" = "$prevsum" ] && cmp -s "$file" "$prevfile"; then
    5.52 - 			echo ln "$prevfile" "$file"
    5.53 - 		else
    5.54 -@@ -28,7 +28,7 @@
    5.55 - 	exit $?
    5.56 - fi
    5.57 - 
    5.58 --find . -type f ! -empty -exec md5sum {} \; | sort | while read sum file ; do
    5.59 -+find . -type f ! -size 0 -exec md5sum {} \; | sort | while read sum file ; do
    5.60 - 	if [ "$sum" = "$prevsum" ] && cmp -s "$file" "$prevfile"; then
    5.61 - 		rm -f "$file"
    5.62 - 		echo ln "$prevfile" "$file"
    5.63 ---- hsfmodem-7.80.02.05full/nvm/makefile	Wed Oct  1 17:23:26 2008
    5.64 -+++ hsfmodem-7.80.02.05full+patch2/nvm/makefile	Sun Apr 11 19:29:08 2010
    5.65 -@@ -52,7 +52,7 @@
    5.66 - all: $(ALL)
    5.67 - 
    5.68 - $(NVMCVTDIR)/.linksame: $(NVMDIRS_CVT)
    5.69 --	cd $(NVMCVTDIR) && find . -type f ! -empty -exec md5sum {} ';' | sort | \
    5.70 -+	cd $(NVMCVTDIR) && find . -type f ! -size 0 -exec md5sum {} ';' | sort | \
    5.71 - 	while read sum file ; do \
    5.72 - 		if [ "$$sum" = "$$prevsum" ] && cmp -s "$$file" "$$prevfile"; then \
    5.73 - 			rm -f "$$file"; \
    5.74 ---- hsfmodem-7.80.02.05full/scripts/cnxtconfig.in	Thu Oct 22 00:35:59 2009
    5.75 -+++ hsfmodem-7.80.02.05full+patch2/scripts/cnxtconfig.in	Sun Apr 11 19:29:08 2010
    5.76 -@@ -74,7 +74,7 @@
    5.77 - 				answer="${region}"
    5.78 - 				;;
    5.79 - 			*)
    5.80 --				answer="`echo \"${answer}\" | tr '[a-z ]' '[A-Z_]'`"
    5.81 -+				answer="`echo \"${answer}\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
    5.82 - 				;;
    5.83 - 			esac
    5.84 - 		fi
    5.85 -@@ -109,15 +109,13 @@
    5.86 - {
    5.87 - 	# Try to guess what region we're in, using the timezone settings
    5.88 - 
    5.89 --	localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`"
    5.90 --
    5.91 --	if ! [ ${localtime_size} -gt 0 ]; then
    5.92 -+	if [ ! -e /etc/TZ ]; then
    5.93 - 		return 1
    5.94 - 	fi
    5.95 - 
    5.96 --	zoneinfo_dir=/usr/share/zoneinfo
    5.97 -+	zoneinfo_dir=/etc/hsfmodem
    5.98 - 
    5.99 --	if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then
   5.100 -+	if [ ! -f ${zoneinfo_dir}/zone.tab ]; then
   5.101 - 		return 1
   5.102 - 	fi
   5.103 - 
   5.104 -@@ -206,18 +204,11 @@
   5.105 - 	iso_VN=00BC # VIETNAM
   5.106 - 
   5.107 - 	(
   5.108 --		cd ${zoneinfo_dir} 2>/dev/null || return 1
   5.109 --		find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \
   5.110 --			while read file; do
   5.111 --				cmp -s /etc/localtime $file || continue
   5.112 --# in the egrep and sed regular expressions below, it is very important to
   5.113 --# have tabs, not spaces
   5.114 --				egrep "	$file(	.*|\$)" ${zoneinfo_dir}/zone.tab
   5.115 --			done | sed -n '/^[^#]/s/	.*//p' | sort | uniq | \
   5.116 --				while read code; do
   5.117 --					eval "echo \${iso_${code}}"
   5.118 --				done | sort | uniq
   5.119 -+		zone=`cat /etc/TZ`
   5.120 -+		code=`grep $zone ${zoneinfo_dir}/zone.tab | awk '{print $1}' | sort | uniq`
   5.121 -+		eval "echo \${iso_${code}}"
   5.122 - 		return 0
   5.123 -+		
   5.124 - 	)
   5.125 - }
   5.126 - 
   5.127 -@@ -271,7 +262,7 @@
   5.128 - # The md5sum is used for input verification.
   5.129 - disptokey()
   5.130 - {
   5.131 --	k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9A-F\012]'`"
   5.132 -+	k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9][A-F][\012]'`"
   5.133 - 	case $k in
   5.134 - 	00000000)
   5.135 - 		echo "$k"
   5.136 -@@ -1655,7 +1646,7 @@
   5.137 - 		update-modules
   5.138 - 	else
   5.139 - 		if ("$@" "${modulesconf}" | "${filter}"; cat ${f}) > ${modulesconf}.$$; then
   5.140 --			if ! cmp --silent ${modulesconf}.$$ ${modulesconf}; then
   5.141 -+			if ! cmp -s ${modulesconf}.$$ ${modulesconf}; then
   5.142 - 				if ! cp ${modulesconf}.$$ ${modulesconf}; then
   5.143 - 					rm -f ${modulesconf}.$$ ${f}
   5.144 - 					exit 1
   5.145 -@@ -1681,7 +1672,7 @@
   5.146 - 	fi
   5.147 - 
   5.148 - 	if ("$@" "${modprobeconf}" | "${filter}"; cat ${f}) > ${modprobeconf}.$$; then
   5.149 --		if ! cmp --silent ${modprobeconf}.$$ ${modprobeconf}; then
   5.150 -+		if ! cmp -s ${modprobeconf}.$$ ${modprobeconf}; then
   5.151 - 			if ! cp ${modprobeconf}.$$ ${modprobeconf}; then
   5.152 - 				rm -f ${modprobeconf}.$$ ${f}
   5.153 - 				exit 1
   5.154 -@@ -2214,6 +2205,10 @@
   5.155 - 	elif [ -d /var/lib/LST ]; then
   5.156 - 		OSDISTNAME=Caldera
   5.157 - 		OSDISTIDNT=caldera
   5.158 -+	elif [ -f /etc/slitaz-release ]; then
   5.159 -+		OSDISTNAME=SliTaz
   5.160 -+		OSDISTIDNT=slitaz
   5.161 -+		OSDISTVERS="`cat /etc/slitaz-release`"
   5.162 - 	fi
   5.163 - 
   5.164 - 	OSKERNNAME="`uname -s | tr '[A-Z]' '[a-z]'`"
   5.165 -@@ -2268,7 +2263,7 @@
   5.166 - 
   5.167 - dump_file()
   5.168 - {
   5.169 --	dump_cmd cat -v $@
   5.170 -+	dump_cmd cat $@
   5.171 - }
   5.172 - 
   5.173 - dump_diagnostics()
   5.174 -@@ -2587,7 +2582,7 @@
   5.175 - 	fi
   5.176 - 	units="${specificunit}"
   5.177 - 	if [ -z "${units}" ]; then
   5.178 --		units=`ls --ignore=flush_nvm ${procdrvdir}`
   5.179 -+		units=`ls ${procdrvdir} | grep -v flush_nvm`
   5.180 - 
   5.181 - 		if [ -z "${units}" ]; then
   5.182 - 			echo ""
   5.183 -@@ -2884,7 +2879,7 @@
   5.184 - 			explicitopt=true
   5.185 - 			do_cfgregion=true
   5.186 - 			if [ -n "$2" ]; then
   5.187 --				setregion="`echo \"$2\" | tr '[a-z ]' '[A-Z_]'`"
   5.188 -+				setregion="`echo \"$2\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
   5.189 - 			fi
   5.190 - 			shift 2
   5.191 - 			;;
   5.192 -@@ -2954,7 +2949,7 @@
   5.193 - 
   5.194 - # Accept --region <name> as equivalent to --region=<name>
   5.195 - if ${do_cfgregion} && [ $# -ge 1 -a -z "${setregion}" ]; then
   5.196 --	setregion="`echo \"$1\" | tr '[a-z ]' '[A-Z_]'`"
   5.197 -+	setregion="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
   5.198 - 	shift
   5.199 - fi
   5.200 - 
   5.201 -@@ -3033,7 +3028,7 @@
   5.202 - 
   5.203 - if ${do_cfgnewinstance}; then
   5.204 - 	if [ ! -d "${cnxtnvmdir}/dynamic/${newinstance}" ]; then
   5.205 --		mkdir --mode=700 --parents "${cnxtnvmdir}/dynamic/${newinstance}" || exit $?
   5.206 -+		mkdir -m 700 -p "${cnxtnvmdir}/dynamic/${newinstance}" || exit $?
   5.207 - 		# The purpose of --info here is to ensure module reload:
   5.208 - 		(sleep 2; exec @CNXTTARGET@config --auto --region=AUTO --info) </dev/null >/dev/null 2>&1 &
   5.209 - 	fi
   5.210 -
     6.1 --- a/linmodem-hsfmodem/stuff/zone.tab	Thu Dec 26 13:52:49 2013 +0000
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,407 +0,0 @@
     6.4 -# @(#)zone.tab	1.32
     6.5 -#
     6.6 -# TZ zone descriptions
     6.7 -#
     6.8 -# From Paul Eggert (1996-08-05):
     6.9 -#
    6.10 -# This file contains a table with the following columns:
    6.11 -# 1.  ISO 3166 2-character country code.  See the file `iso3166.tab'.
    6.12 -# 2.  Latitude and longitude of the zone's principal location
    6.13 -#     in ISO 6709 sign-degrees-minutes-seconds format,
    6.14 -#     either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
    6.15 -#     first latitude (+ is north), then longitude (+ is east).
    6.16 -# 3.  Zone name used in value of TZ environment variable.
    6.17 -# 4.  Comments; present if and only if the country has multiple rows.
    6.18 -#
    6.19 -# Columns are separated by a single tab.
    6.20 -# The table is sorted first by country, then an order within the country that
    6.21 -# (1) makes some geographical sense, and
    6.22 -# (2) puts the most populous zones first, where that does not contradict (1).
    6.23 -#
    6.24 -# Lines beginning with `#' are comments.
    6.25 -#
    6.26 -#country-
    6.27 -#code	coordinates	TZ			comments
    6.28 -AD	+4230+00131	Europe/Andorra
    6.29 -AE	+2518+05518	Asia/Dubai
    6.30 -AF	+3431+06912	Asia/Kabul
    6.31 -AG	+1703-06148	America/Antigua
    6.32 -AI	+1812-06304	America/Anguilla
    6.33 -AL	+4120+01950	Europe/Tirane
    6.34 -AM	+4011+04430	Asia/Yerevan
    6.35 -AN	+1211-06900	America/Curacao
    6.36 -AO	-0848+01314	Africa/Luanda
    6.37 -AQ	-7750+16636	Antarctica/McMurdo	McMurdo Station, Ross Island
    6.38 -AQ	-9000+00000	Antarctica/South_Pole	Amundsen-Scott Station, South Pole
    6.39 -AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
    6.40 -AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
    6.41 -AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
    6.42 -AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
    6.43 -AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
    6.44 -AQ	-7824+10654	Antarctica/Vostok	Vostok Station, S Magnetic Pole
    6.45 -AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Base, Terre Adelie
    6.46 -AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
    6.47 -AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
    6.48 -AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, LP, MN, NQ, RN, SA, SE, SF, SL)
    6.49 -AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
    6.50 -AR	-3124-06411	America/Argentina/Tucuman	Tucuman (TM)
    6.51 -AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
    6.52 -AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
    6.53 -AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
    6.54 -AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
    6.55 -AR	-5138-06913	America/Argentina/Rio_Gallegos	Santa Cruz (SC)
    6.56 -AR	-5448-06818	America/Argentina/Ushuaia	Tierra del Fuego (TF)
    6.57 -AS	-1416-17042	Pacific/Pago_Pago
    6.58 -AT	+4813+01620	Europe/Vienna
    6.59 -AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
    6.60 -AU	-4253+14719	Australia/Hobart	Tasmania - most locations
    6.61 -AU	-3956+14352	Australia/Currie	Tasmania - King Island
    6.62 -AU	-3749+14458	Australia/Melbourne	Victoria
    6.63 -AU	-3352+15113	Australia/Sydney	New South Wales - most locations
    6.64 -AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
    6.65 -AU	-2728+15302	Australia/Brisbane	Queensland - most locations
    6.66 -AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
    6.67 -AU	-3455+13835	Australia/Adelaide	South Australia
    6.68 -AU	-1228+13050	Australia/Darwin	Northern Territory
    6.69 -AU	-3157+11551	Australia/Perth	Western Australia
    6.70 -AW	+1230-06858	America/Aruba
    6.71 -AX	+6006+01957	Europe/Mariehamn
    6.72 -AZ	+4023+04951	Asia/Baku
    6.73 -BA	+4352+01825	Europe/Sarajevo
    6.74 -BB	+1306-05937	America/Barbados
    6.75 -BD	+2343+09025	Asia/Dhaka
    6.76 -BE	+5050+00420	Europe/Brussels
    6.77 -BF	+1222-00131	Africa/Ouagadougou
    6.78 -BG	+4241+02319	Europe/Sofia
    6.79 -BH	+2623+05035	Asia/Bahrain
    6.80 -BI	-0323+02922	Africa/Bujumbura
    6.81 -BJ	+0629+00237	Africa/Porto-Novo
    6.82 -BM	+3217-06446	Atlantic/Bermuda
    6.83 -BN	+0456+11455	Asia/Brunei
    6.84 -BO	-1630-06809	America/La_Paz
    6.85 -BR	-0351-03225	America/Noronha	Atlantic islands
    6.86 -BR	-0127-04829	America/Belem	Amapa, E Para
    6.87 -BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
    6.88 -BR	-0803-03454	America/Recife	Pernambuco
    6.89 -BR	-0712-04812	America/Araguaina	Tocantins
    6.90 -BR	-0940-03543	America/Maceio	Alagoas, Sergipe
    6.91 -BR	-1259-03831	America/Bahia	Bahia
    6.92 -BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
    6.93 -BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
    6.94 -BR	-1535-05605	America/Cuiaba	Mato Grosso
    6.95 -BR	-0846-06354	America/Porto_Velho	W Para, Rondonia
    6.96 -BR	+0249-06040	America/Boa_Vista	Roraima
    6.97 -BR	-0308-06001	America/Manaus	E Amazonas
    6.98 -BR	-0640-06952	America/Eirunepe	W Amazonas
    6.99 -BR	-0958-06748	America/Rio_Branco	Acre
   6.100 -BS	+2505-07721	America/Nassau
   6.101 -BT	+2728+08939	Asia/Thimphu
   6.102 -BW	-2545+02555	Africa/Gaborone
   6.103 -BY	+5354+02734	Europe/Minsk
   6.104 -BZ	+1730-08812	America/Belize
   6.105 -CA	+4734-05243	America/St_Johns	Newfoundland Island
   6.106 -CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), NB, W Labrador, E Quebec & PEI
   6.107 -CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
   6.108 -CA	+5320-06025	America/Goose_Bay	Atlantic Time - E Labrador
   6.109 -CA	+4531-07334	America/Montreal	Eastern Time - Quebec - most locations
   6.110 -CA	+4339-07923	America/Toronto	Eastern Time - Ontario - most locations
   6.111 -CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
   6.112 -CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
   6.113 -CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
   6.114 -CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut
   6.115 -CA	+6408-08310	America/Coral_Harbour	Eastern Standard Time - Southampton Island
   6.116 -CA	+6245-09210	America/Rankin_Inlet	Central Time - central Nunavut
   6.117 -CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
   6.118 -CA	+4843-09429	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
   6.119 -CA	+6903-10505	America/Cambridge_Bay	Central Time - west Nunavut
   6.120 -CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
   6.121 -CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
   6.122 -CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
   6.123 -CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
   6.124 -CA	+6825-11330	America/Inuvik	Mountain Time - west Northwest Territories
   6.125 -CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
   6.126 -CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
   6.127 -CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
   6.128 -CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
   6.129 -CC	-1210+09655	Indian/Cocos
   6.130 -CD	-0418+01518	Africa/Kinshasa	west Dem. Rep. of Congo
   6.131 -CD	-1140+02728	Africa/Lubumbashi	east Dem. Rep. of Congo
   6.132 -CF	+0422+01835	Africa/Bangui
   6.133 -CG	-0416+01517	Africa/Brazzaville
   6.134 -CH	+4723+00832	Europe/Zurich
   6.135 -CI	+0519-00402	Africa/Abidjan
   6.136 -CK	-2114-15946	Pacific/Rarotonga
   6.137 -CL	-3327-07040	America/Santiago	most locations
   6.138 -CL	-2710-10927	Pacific/Easter	Easter Island & Sala y Gomez
   6.139 -CM	+0403+00942	Africa/Douala
   6.140 -CN	+3114+12128	Asia/Shanghai	east China - Beijing, Guangdong, Shanghai, etc.
   6.141 -CN	+4545+12641	Asia/Harbin	Heilongjiang
   6.142 -CN	+2934+10635	Asia/Chongqing	central China - Gansu, Guizhou, Sichuan, Yunnan, etc.
   6.143 -CN	+4348+08735	Asia/Urumqi	Tibet & most of Xinjiang Uyghur
   6.144 -CN	+3929+07559	Asia/Kashgar	southwest Xinjiang Uyghur
   6.145 -CO	+0436-07405	America/Bogota
   6.146 -CR	+0956-08405	America/Costa_Rica
   6.147 -CS	+4450+02030	Europe/Belgrade
   6.148 -CU	+2308-08222	America/Havana
   6.149 -CV	+1455-02331	Atlantic/Cape_Verde
   6.150 -CX	-1025+10543	Indian/Christmas
   6.151 -CY	+3510+03322	Asia/Nicosia
   6.152 -CZ	+5005+01426	Europe/Prague
   6.153 -DE	+5230+01322	Europe/Berlin
   6.154 -DJ	+1136+04309	Africa/Djibouti
   6.155 -DK	+5540+01235	Europe/Copenhagen
   6.156 -DM	+1518-06124	America/Dominica
   6.157 -DO	+1828-06954	America/Santo_Domingo
   6.158 -DZ	+3647+00303	Africa/Algiers
   6.159 -EC	-0210-07950	America/Guayaquil	mainland
   6.160 -EC	-0054-08936	Pacific/Galapagos	Galapagos Islands
   6.161 -EE	+5925+02445	Europe/Tallinn
   6.162 -EG	+3003+03115	Africa/Cairo
   6.163 -EH	+2709-01312	Africa/El_Aaiun
   6.164 -ER	+1520+03853	Africa/Asmera
   6.165 -ES	+4024-00341	Europe/Madrid	mainland
   6.166 -ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
   6.167 -ES	+2806-01524	Atlantic/Canary	Canary Islands
   6.168 -ET	+0902+03842	Africa/Addis_Ababa
   6.169 -FI	+6010+02458	Europe/Helsinki
   6.170 -FJ	-1808+17825	Pacific/Fiji
   6.171 -FK	-5142-05751	Atlantic/Stanley
   6.172 -FM	+0725+15147	Pacific/Truk	Truk (Chuuk) and Yap
   6.173 -FM	+0658+15813	Pacific/Ponape	Ponape (Pohnpei)
   6.174 -FM	+0519+16259	Pacific/Kosrae	Kosrae
   6.175 -FO	+6201-00646	Atlantic/Faeroe
   6.176 -FR	+4852+00220	Europe/Paris
   6.177 -GA	+0023+00927	Africa/Libreville
   6.178 -GB	+512830-0001845	Europe/London
   6.179 -GD	+1203-06145	America/Grenada
   6.180 -GE	+4143+04449	Asia/Tbilisi
   6.181 -GF	+0456-05220	America/Cayenne
   6.182 -GH	+0533-00013	Africa/Accra
   6.183 -GI	+3608-00521	Europe/Gibraltar
   6.184 -GL	+6411-05144	America/Godthab	most locations
   6.185 -GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
   6.186 -GL	+7030-02215	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
   6.187 -GL	+7634-06847	America/Thule	Thule / Pituffik
   6.188 -GM	+1328-01639	Africa/Banjul
   6.189 -GN	+0931-01343	Africa/Conakry
   6.190 -GP	+1614-06132	America/Guadeloupe
   6.191 -GQ	+0345+00847	Africa/Malabo
   6.192 -GR	+3758+02343	Europe/Athens
   6.193 -GS	-5416-03632	Atlantic/South_Georgia
   6.194 -GT	+1438-09031	America/Guatemala
   6.195 -GU	+1328+14445	Pacific/Guam
   6.196 -GW	+1151-01535	Africa/Bissau
   6.197 -GY	+0648-05810	America/Guyana
   6.198 -HK	+2217+11409	Asia/Hong_Kong
   6.199 -HN	+1406-08713	America/Tegucigalpa
   6.200 -HR	+4548+01558	Europe/Zagreb
   6.201 -HT	+1832-07220	America/Port-au-Prince
   6.202 -HU	+4730+01905	Europe/Budapest
   6.203 -ID	-0610+10648	Asia/Jakarta	Java & Sumatra
   6.204 -ID	-0002+10920	Asia/Pontianak	west & central Borneo
   6.205 -ID	-0507+11924	Asia/Makassar	east & south Borneo, Celebes, Bali, Nusa Tengarra, west Timor
   6.206 -ID	-0232+14042	Asia/Jayapura	Irian Jaya & the Moluccas
   6.207 -IE	+5320-00615	Europe/Dublin
   6.208 -IL	+3146+03514	Asia/Jerusalem
   6.209 -IN	+2232+08822	Asia/Calcutta
   6.210 -IO	-0720+07225	Indian/Chagos
   6.211 -IQ	+3321+04425	Asia/Baghdad
   6.212 -IR	+3540+05126	Asia/Tehran
   6.213 -IS	+6409-02151	Atlantic/Reykjavik
   6.214 -IT	+4154+01229	Europe/Rome
   6.215 -JM	+1800-07648	America/Jamaica
   6.216 -JO	+3157+03556	Asia/Amman
   6.217 -JP	+353916+1394441	Asia/Tokyo
   6.218 -KE	-0117+03649	Africa/Nairobi
   6.219 -KG	+4254+07436	Asia/Bishkek
   6.220 -KH	+1133+10455	Asia/Phnom_Penh
   6.221 -KI	+0125+17300	Pacific/Tarawa	Gilbert Islands
   6.222 -KI	-0308-17105	Pacific/Enderbury	Phoenix Islands
   6.223 -KI	+0152-15720	Pacific/Kiritimati	Line Islands
   6.224 -KM	-1141+04316	Indian/Comoro
   6.225 -KN	+1718-06243	America/St_Kitts
   6.226 -KP	+3901+12545	Asia/Pyongyang
   6.227 -KR	+3733+12658	Asia/Seoul
   6.228 -KW	+2920+04759	Asia/Kuwait
   6.229 -KY	+1918-08123	America/Cayman
   6.230 -KZ	+4315+07657	Asia/Almaty	most locations
   6.231 -KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
   6.232 -KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
   6.233 -KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
   6.234 -KZ	+5113+05121	Asia/Oral	West Kazakhstan
   6.235 -LA	+1758+10236	Asia/Vientiane
   6.236 -LB	+3353+03530	Asia/Beirut
   6.237 -LC	+1401-06100	America/St_Lucia
   6.238 -LI	+4709+00931	Europe/Vaduz
   6.239 -LK	+0656+07951	Asia/Colombo
   6.240 -LR	+0618-01047	Africa/Monrovia
   6.241 -LS	-2928+02730	Africa/Maseru
   6.242 -LT	+5441+02519	Europe/Vilnius
   6.243 -LU	+4936+00609	Europe/Luxembourg
   6.244 -LV	+5657+02406	Europe/Riga
   6.245 -LY	+3254+01311	Africa/Tripoli
   6.246 -MA	+3339-00735	Africa/Casablanca
   6.247 -MC	+4342+00723	Europe/Monaco
   6.248 -MD	+4700+02850	Europe/Chisinau
   6.249 -MG	-1855+04731	Indian/Antananarivo
   6.250 -MH	+0709+17112	Pacific/Majuro	most locations
   6.251 -MH	+0905+16720	Pacific/Kwajalein	Kwajalein
   6.252 -MK	+4159+02126	Europe/Skopje
   6.253 -ML	+1239-00800	Africa/Bamako
   6.254 -MM	+1647+09610	Asia/Rangoon
   6.255 -MN	+4755+10653	Asia/Ulaanbaatar	most locations
   6.256 -MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
   6.257 -MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
   6.258 -MO	+2214+11335	Asia/Macau
   6.259 -MP	+1512+14545	Pacific/Saipan
   6.260 -MQ	+1436-06105	America/Martinique
   6.261 -MR	+1806-01557	Africa/Nouakchott
   6.262 -MS	+1644-06213	America/Montserrat
   6.263 -MT	+3554+01431	Europe/Malta
   6.264 -MU	-2010+05730	Indian/Mauritius
   6.265 -MV	+0410+07330	Indian/Maldives
   6.266 -MW	-1547+03500	Africa/Blantyre
   6.267 -MX	+1924-09909	America/Mexico_City	Central Time - most locations
   6.268 -MX	+2105-08646	America/Cancun	Central Time - Quintana Roo
   6.269 -MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatan
   6.270 -MX	+2540-10019	America/Monterrey	Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas
   6.271 -MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
   6.272 -MX	+2838-10605	America/Chihuahua	Mountain Time - Chihuahua
   6.273 -MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
   6.274 -MX	+3232-11701	America/Tijuana	Pacific Time
   6.275 -MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
   6.276 -MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
   6.277 -MZ	-2558+03235	Africa/Maputo
   6.278 -NA	-2234+01706	Africa/Windhoek
   6.279 -NC	-2216+16530	Pacific/Noumea
   6.280 -NE	+1331+00207	Africa/Niamey
   6.281 -NF	-2903+16758	Pacific/Norfolk
   6.282 -NG	+0627+00324	Africa/Lagos
   6.283 -NI	+1209-08617	America/Managua
   6.284 -NL	+5222+00454	Europe/Amsterdam
   6.285 -NO	+5955+01045	Europe/Oslo
   6.286 -NP	+2743+08519	Asia/Katmandu
   6.287 -NR	-0031+16655	Pacific/Nauru
   6.288 -NU	-1901+16955	Pacific/Niue
   6.289 -NZ	-3652+17446	Pacific/Auckland	most locations
   6.290 -NZ	-4357-17633	Pacific/Chatham	Chatham Islands
   6.291 -OM	+2336+05835	Asia/Muscat
   6.292 -PA	+0858-07932	America/Panama
   6.293 -PE	-1203-07703	America/Lima
   6.294 -PF	-1732-14934	Pacific/Tahiti	Society Islands
   6.295 -PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
   6.296 -PF	-2308-13457	Pacific/Gambier	Gambier Islands
   6.297 -PG	-0930+14710	Pacific/Port_Moresby
   6.298 -PH	+1435+12100	Asia/Manila
   6.299 -PK	+2452+06703	Asia/Karachi
   6.300 -PL	+5215+02100	Europe/Warsaw
   6.301 -PM	+4703-05620	America/Miquelon
   6.302 -PN	-2504-13005	Pacific/Pitcairn
   6.303 -PR	+182806-0660622	America/Puerto_Rico
   6.304 -PS	+3130+03428	Asia/Gaza
   6.305 -PT	+3843-00908	Europe/Lisbon	mainland
   6.306 -PT	+3238-01654	Atlantic/Madeira	Madeira Islands
   6.307 -PT	+3744-02540	Atlantic/Azores	Azores
   6.308 -PW	+0720+13429	Pacific/Palau
   6.309 -PY	-2516-05740	America/Asuncion
   6.310 -QA	+2517+05132	Asia/Qatar
   6.311 -RE	-2052+05528	Indian/Reunion
   6.312 -RO	+4426+02606	Europe/Bucharest
   6.313 -RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
   6.314 -RU	+5545+03735	Europe/Moscow	Moscow+00 - west Russia
   6.315 -RU	+5312+05009	Europe/Samara	Moscow+01 - Caspian Sea
   6.316 -RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
   6.317 -RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
   6.318 -RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
   6.319 -RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
   6.320 -RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
   6.321 -RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
   6.322 -RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
   6.323 -RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
   6.324 -RU	+5934+15048	Asia/Magadan	Moscow+08 - Magadan
   6.325 -RU	+5301+15839	Asia/Kamchatka	Moscow+09 - Kamchatka
   6.326 -RU	+6445+17729	Asia/Anadyr	Moscow+10 - Bering Sea
   6.327 -RW	-0157+03004	Africa/Kigali
   6.328 -SA	+2438+04643	Asia/Riyadh
   6.329 -SB	-0932+16012	Pacific/Guadalcanal
   6.330 -SC	-0440+05528	Indian/Mahe
   6.331 -SD	+1536+03232	Africa/Khartoum
   6.332 -SE	+5920+01803	Europe/Stockholm
   6.333 -SG	+0117+10351	Asia/Singapore
   6.334 -SH	-1555-00542	Atlantic/St_Helena
   6.335 -SI	+4603+01431	Europe/Ljubljana
   6.336 -SJ	+7800+01600	Arctic/Longyearbyen	Svalbard
   6.337 -SJ	+7059-00805	Atlantic/Jan_Mayen	Jan Mayen
   6.338 -SK	+4809+01707	Europe/Bratislava
   6.339 -SL	+0830-01315	Africa/Freetown
   6.340 -SM	+4355+01228	Europe/San_Marino
   6.341 -SN	+1440-01726	Africa/Dakar
   6.342 -SO	+0204+04522	Africa/Mogadishu
   6.343 -SR	+0550-05510	America/Paramaribo
   6.344 -ST	+0020+00644	Africa/Sao_Tome
   6.345 -SV	+1342-08912	America/El_Salvador
   6.346 -SY	+3330+03618	Asia/Damascus
   6.347 -SZ	-2618+03106	Africa/Mbabane
   6.348 -TC	+2128-07108	America/Grand_Turk
   6.349 -TD	+1207+01503	Africa/Ndjamena
   6.350 -TF	-492110+0701303	Indian/Kerguelen
   6.351 -TG	+0608+00113	Africa/Lome
   6.352 -TH	+1345+10031	Asia/Bangkok
   6.353 -TJ	+3835+06848	Asia/Dushanbe
   6.354 -TK	-0922-17114	Pacific/Fakaofo
   6.355 -TL	-0833+12535	Asia/Dili
   6.356 -TM	+3757+05823	Asia/Ashgabat
   6.357 -TN	+3648+01011	Africa/Tunis
   6.358 -TO	-2110+17510	Pacific/Tongatapu
   6.359 -TR	+4101+02858	Europe/Istanbul
   6.360 -TT	+1039-06131	America/Port_of_Spain
   6.361 -TV	-0831+17913	Pacific/Funafuti
   6.362 -TW	+2503+12130	Asia/Taipei
   6.363 -TZ	-0648+03917	Africa/Dar_es_Salaam
   6.364 -UA	+5026+03031	Europe/Kiev	most locations
   6.365 -UA	+4837+02218	Europe/Uzhgorod	Ruthenia
   6.366 -UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk
   6.367 -UA	+4457+03406	Europe/Simferopol	central Crimea
   6.368 -UG	+0019+03225	Africa/Kampala
   6.369 -UM	+1700-16830	Pacific/Johnston	Johnston Atoll
   6.370 -UM	+2813-17722	Pacific/Midway	Midway Islands
   6.371 -UM	+1917+16637	Pacific/Wake	Wake Island
   6.372 -US	+404251-0740023	America/New_York	Eastern Time
   6.373 -US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
   6.374 -US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
   6.375 -US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
   6.376 -US	+394606-0860929	America/Indiana/Indianapolis	Eastern Standard Time - Indiana - most locations
   6.377 -US	+382232-0862041	America/Indiana/Marengo	Eastern Standard Time - Indiana - Crawford County
   6.378 -US	+411745-0863730	America/Indiana/Knox	Eastern Standard Time - Indiana - Starke County
   6.379 -US	+384452-0850402	America/Indiana/Vevay	Eastern Standard Time - Indiana - Switzerland County
   6.380 -US	+415100-0873900	America/Chicago	Central Time
   6.381 -US	+450628-0873651	America/Menominee	Central Time - Michigan - Wisconsin border
   6.382 -US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
   6.383 -US	+394421-1045903	America/Denver	Mountain Time
   6.384 -US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
   6.385 -US	+364708-1084111	America/Shiprock	Mountain Time - Navajo
   6.386 -US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona
   6.387 -US	+340308-1181434	America/Los_Angeles	Pacific Time
   6.388 -US	+611305-1495401	America/Anchorage	Alaska Time
   6.389 -US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
   6.390 -US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
   6.391 -US	+643004-1652423	America/Nome	Alaska Time - west Alaska
   6.392 -US	+515248-1763929	America/Adak	Aleutian Islands
   6.393 -US	+211825-1575130	Pacific/Honolulu	Hawaii
   6.394 -UY	-3453-05611	America/Montevideo
   6.395 -UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
   6.396 -UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
   6.397 -VA	+4154+01227	Europe/Vatican
   6.398 -VC	+1309-06114	America/St_Vincent
   6.399 -VE	+1030-06656	America/Caracas
   6.400 -VG	+1827-06437	America/Tortola
   6.401 -VI	+1821-06456	America/St_Thomas
   6.402 -VN	+1045+10640	Asia/Saigon
   6.403 -VU	-1740+16825	Pacific/Efate
   6.404 -WF	-1318-17610	Pacific/Wallis
   6.405 -WS	-1350-17144	Pacific/Apia
   6.406 -YE	+1245+04512	Asia/Aden
   6.407 -YT	-1247+04514	Indian/Mayotte
   6.408 -ZA	-2615+02800	Africa/Johannesburg
   6.409 -ZM	-1525+02817	Africa/Lusaka
   6.410 -ZW	-1750+03103	Africa/Harare
     7.1 --- a/php-cups/receipt	Thu Dec 26 13:52:49 2013 +0000
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,72 +0,0 @@
     7.4 -# SliTaz package receipt."
     7.5 -
     7.6 -PACKAGE="php-cups"
     7.7 -VERSION="1.6.2"
     7.8 -CATEGORY="development"
     7.9 -SHORT_DESC="Common UNIX Printing System bindings for php."
    7.10 -MAINTAINER="pascal.bellard@slitaz.org"
    7.11 -LICENSE="GPL2 LGPL2"
    7.12 -WANTED="cups"
    7.13 -WEB_SITE="http://www.cups.org/"
    7.14 -
    7.15 -DEPENDS="cups libtasn1"
    7.16 -
    7.17 -# Rules to gen a SliTaz package suitable for Tazpkg.
    7.18 -genpkg_rules()
    7.19 -{
    7.20 -	mkdir -p $fs/usr/share/php
    7.21 -	cp $(find $install | grep phpcups.so) $fs/usr/share/php/cups.so
    7.22 -}
    7.23 -
    7.24 -# Post and pre install commans to stop
    7.25 -# and restart Web server if needed.
    7.26 -pre_install()
    7.27 -{
    7.28 -	while read daemon file; do
    7.29 -		if [ -z "$1" -a -f "/var/run/$file" ]; then
    7.30 -			/etc/init.d/$daemon stop
    7.31 -		fi
    7.32 -	done <<EOT
    7.33 -apache apache/httpd.pid
    7.34 -lighttpd lighttpd.pid
    7.35 -EOT
    7.36 -}
    7.37 -
    7.38 -post_install()
    7.39 -{
    7.40 -	grep -q ^extension=cups.so $1/etc/php.ini || \
    7.41 -	    sed -e 's|extension=msql.so|extension=msql.so\nextension=cups.so|' -i $1/etc/php.ini
    7.42 -	# Start Web server.
    7.43 -	while read daemon file; do
    7.44 -		[ -z "$1" ] || continue
    7.45 -		if [ -z "$1" -a -f "/var/run/$file" ]; then
    7.46 -			/etc/init.d/$daemon stop
    7.47 -			sleep 2
    7.48 -		fi
    7.49 -		if [ -z "$1" -a -f /etc/init.d/$daemon ]; then
    7.50 -			/etc/init.d/$daemon start
    7.51 -		fi
    7.52 -	done <<EOT
    7.53 -apache apache/httpd.pid
    7.54 -lighttpd lighttpd.pid
    7.55 -EOT
    7.56 -}
    7.57 -
    7.58 -# Pre and post remove commands for Tazpkg.
    7.59 -pre_remove()
    7.60 -{
    7.61 -	sed -i '/.*=cups.so.*/d' /etc/php.ini
    7.62 -
    7.63 -	# Start Web server.
    7.64 -	while read daemon file; do
    7.65 -		[ -f "/var/run/$file" ] || continue
    7.66 -		if [ -f /etc/init.d/$daemon  ]; then
    7.67 -			/etc/init.d/$daemon stop
    7.68 -			sleep 2
    7.69 -			/etc/init.d/$daemon start
    7.70 -		fi
    7.71 -	done <<EOT
    7.72 -apache apache/httpd.pid
    7.73 -lighttpd lighttpd.pid
    7.74 -EOT
    7.75 -}
     8.1 --- a/printoxx/receipt	Thu Dec 26 13:52:49 2013 +0000
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,36 +0,0 @@
     8.4 -# SliTaz package receipt.
     8.5 -
     8.6 -PACKAGE="printoxx"
     8.7 -VERSION="2.8.1"
     8.8 -CATEGORY="graphics"
     8.9 -SHORT_DESC="fotoxx plugin for printing one or more image files with a user-defined page layout"
    8.10 -MAINTAINER="gokhlayeh@slitaz.org"
    8.11 -LICENSE="GPL3"
    8.12 -SUGGESTED="fotoxx"
    8.13 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    8.14 -WEB_SITE="http://kornelix.squarespace.com/printoxx" 
    8.15 -WGET_URL="http://kornelix.squarespace.com/storage/downloads/$TARBALL"
    8.16 -TAGS="print images jpeg jpg bmp png gif"
    8.17 -
    8.18 -DEPENDS="gtk+ "
    8.19 -BUILD_DEPENDS="gtk+-dev"
    8.20 -
    8.21 -# Rules to configure and make the package.
    8.22 -compile_rules()
    8.23 -{
    8.24 -   	cd $src
    8.25 -	export PREFIX=/usr make
    8.26 -	make DESTDIR=$DESTDIR install
    8.27 -	
    8.28 -}
    8.29 -
    8.30 -# Rules to gen a SliTaz package suitable for Tazpkg.
    8.31 -genpkg_rules()
    8.32 -{
    8.33 -    mkdir -p $fs/usr/bin $fs/usr/share/$PACKAGE/locales  $fs/usr/share/applications 
    8.34 -	cp -a $install/usr/bin $fs/usr
    8.35 -	cp -a $install/usr/share/$PACKAGE/icons $fs/usr/share/$PACKAGE
    8.36 -	#non-standard local path
    8.37 -	cp -a $install/usr/share/$PACKAGE/locales/* $fs/usr/share/$PACKAGE/locales/
    8.38 -	cp -a stuff/$PACKAGE.desktop $fs/usr/share/applications
    8.39 -}
    8.40 \ No newline at end of file
     9.1 --- a/printoxx/stuff/printoxx.desktop	Thu Dec 26 13:52:49 2013 +0000
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,10 +0,0 @@
     9.4 -[Desktop Entry]
     9.5 -Name=printoxx
     9.6 -Comment=Fotoxx Image adjustment for printing
     9.7 -Exec=printoxx %f
     9.8 -Terminal=false
     9.9 -Type=Application
    9.10 -Icon=printer
    9.11 -Categories=GTK;Graphics;2DGraphics;Viewer;
    9.12 -MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;
    9.13 -
    10.1 --- a/v4l-dvb/receipt	Thu Dec 26 13:52:49 2013 +0000
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,79 +0,0 @@
    10.4 -# SliTaz package receipt.
    10.5 -
    10.6 -PACKAGE="v4l-dvb"
    10.7 -VERSION="development"
    10.8 -CATEGORY="multimedia"
    10.9 -MAINTAINER="jozee@slitaz.org"
   10.10 -LICENSE="GPL2"
   10.11 -SHORT_DESC="v4l-dvb development repository"
   10.12 -WEB_SITE="http://linuxtv.org/hg/v4l-dvb/"
   10.13 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
   10.14 -TAGS="webcam"
   10.15 -WGET_URL="hg|$WEB_SITE"
   10.16 -
   10.17 -DEPENDS="linux"
   10.18 -BUILD_DEPENDS="python mercurial coreutils-operations module-init-tools xz"
   10.19 -
   10.20 -# Rules to configure and make the package.
   10.21 -compile_rules() {
   10.22 -	cd $src
   10.23 -	patch -p1 < $stuff/414e0bbd99bf
   10.24 -	patch -p1 < $stuff/d64b014c5253
   10.25 -	patch -p1 < $stuff/d0a2ff731670
   10.26 -	sed -i 's/0 | xargs -0n 255 ln -sf --target-directory=\./ | while read file; do ln -sf $file . ; done/' v4l/Makefile
   10.27 -	grep -rl /sbin/depmod * | xargs sed -i 's|/sbin/depmod|/bin/echo|'
   10.28 -	grep -rl i2c_new_probed_device * | xargs sed -i 's/i2c_new_probed_device([^)]*/&, NULL/'
   10.29 -	
   10.30 -	sed -i 's/\.ioctl/.unlocked_ioctl/' linux/drivers/media/dvb/dvb-core/dmxdev.c \
   10.31 -		linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c \
   10.32 -		linux/drivers/media/dvb/dvb-core/dvb_frontend.c \
   10.33 -		linux/drivers/media/dvb/dvb-core/dvb_net.c \
   10.34 -		linux/drivers/media/dvb/ttpci/av7110*.c \
   10.35 -		linux/drivers/media/dvb/firewire/firedtv-ci.c \
   10.36 -		linux/drivers/media/video/v4l2-dev.c \
   10.37 -		linux/drivers/media/IR/lirc_dev.c \
   10.38 -		linux/drivers/media/IR/ir-lirc-codec.c
   10.39 -	
   10.40 -	sed -i 's/>ioctl)/>unlocked_ioctl)/' linux/drivers/media/IR/lirc_dev.c
   10.41 -	sed -i -e 's|/sbin/lsmod|/bin/lsmod|' \
   10.42 -		-e 's/print | while.*/exec ln -s {} . \\;/' v4l/Makefile
   10.43 -	
   10.44 -	IFS="." ; set -- $kvers ; unset IFS
   10.45 -	cat > v4l/.version << EOF
   10.46 -VERSION=$1
   10.47 -PATCHLEVEL:=$2
   10.48 -SUBLEVEL:=$3
   10.49 -KERNELRELEASE:=$kvers-slitaz
   10.50 -EOF
   10.51 -	[ -x /usr/bin/cook ] && SRCDIR="$WOK/linux/source/linux-$kvers"
   10.52 -	[ -x /usr/bin/tazwok ] && SRCDIR="$WOK/linux/linux-$kvers"
   10.53 -	make SRCDIR=$SRCDIR CONFIG_MEDIA_TUNER_CUSTOMISE=n CONFIG_RADIO_ADAPTERS=n \
   10.54 -		CONFIG_RADIO_MIROPCM20=n CONFIG_MANTIS_CORE=n &&
   10.55 -	make DESTDIR=$DESTDIR install
   10.56 -}
   10.57 -	
   10.58 -# Rules to gen a SliTaz package suitable for Tazpkg.
   10.59 -genpkg_rules()
   10.60 -{
   10.61 -	EXTRAVERSION=_${kvers%.*}
   10.62 -	 
   10.63 -	mkdir -p $fs/lib/modules/$kvers-slitaz/kernel/ 
   10.64 -	
   10.65 -	find $install/lib/modules/$kvers-slitaz -name "*.ko" \
   10.66 -		-exec xz '{}' \; 2> /dev/null
   10.67 -	find $install/lib/modules/$kvers-slitaz -name "*.ko" -exec rm '{}' \;	
   10.68 -	cp -a $install/lib/modules/$kvers-slitaz/kernel/drivers \
   10.69 -		$fs/lib/modules/$kvers-slitaz/kernel/
   10.70 -}
   10.71 -
   10.72 -post_install()
   10.73 -{
   10.74 -	echo "Processing post-install commands..."
   10.75 -	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
   10.76 -}
   10.77 -
   10.78 -post_remove()
   10.79 -{
   10.80 -	echo "Processing post-remove commands..."
   10.81 -	depmod -a
   10.82 -}
    11.1 --- a/v4l-dvb/stuff/414e0bbd99bf	Thu Dec 26 13:52:49 2013 +0000
    11.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.3 @@ -1,49 +0,0 @@
    11.4 -
    11.5 -# HG changeset patch
    11.6 -# User Igor M. Liplianin <liplianin@me.by>
    11.7 -# Date 1293902198 -7200
    11.8 -# Node ID 414e0bbd99bf23b178c4b8aa539ef8f9f270117e
    11.9 -# Parent  d64b014c5253e3699e025339619a6f7704f2fb81
   11.10 -[PATCH 1/1] [media] i2c: Stop using I2C_CLASS_TV_ANALOG
   11.11 -
   11.12 -From: Jean Delvare <khali@linux-fr.org>
   11.13 -
   11.14 -Detection class I2C_CLASS_TV_ANALOG is set by a few adapters but no
   11.15 -I2C device driver is setting it anymore, which means it can be
   11.16 -dropped. I2C devices on analog TV adapters are instantiated
   11.17 -explicitly these days, which is much better.
   11.18 -
   11.19 -Signed-off-by: Jean Delvare <khali@linux-fr.org>
   11.20 -Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
   11.21 -
   11.22 ---- a/linux/drivers/media/video/hdpvr/hdpvr-i2c.c	Sat Jan 01 19:13:39 2011 +0200
   11.23 -+++ b/linux/drivers/media/video/hdpvr/hdpvr-i2c.c	Sat Jan 01 19:16:38 2011 +0200
   11.24 -@@ -127,7 +127,6 @@
   11.25 - 	strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
   11.26 - 		sizeof(i2c_adap->name));
   11.27 - 	i2c_adap->algo  = &hdpvr_algo;
   11.28 --	i2c_adap->class = I2C_CLASS_TV_ANALOG;
   11.29 - 	i2c_adap->owner = THIS_MODULE;
   11.30 - 	i2c_adap->dev.parent = &dev->udev->dev;
   11.31 - 
   11.32 ---- a/linux/drivers/media/video/hexium_gemini.c	Sat Jan 01 19:13:39 2011 +0200
   11.33 -+++ b/linux/drivers/media/video/hexium_gemini.c	Sat Jan 01 19:16:38 2011 +0200
   11.34 -@@ -368,7 +368,6 @@
   11.35 - 	saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26));
   11.36 - 
   11.37 - 	hexium->i2c_adapter = (struct i2c_adapter) {
   11.38 --		.class = I2C_CLASS_TV_ANALOG,
   11.39 - 		.name = "hexium gemini",
   11.40 - 	};
   11.41 - 	saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
   11.42 ---- a/linux/drivers/media/video/hexium_orion.c	Sat Jan 01 19:13:39 2011 +0200
   11.43 -+++ b/linux/drivers/media/video/hexium_orion.c	Sat Jan 01 19:16:38 2011 +0200
   11.44 -@@ -231,7 +231,6 @@
   11.45 - 	saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26));
   11.46 - 
   11.47 - 	hexium->i2c_adapter = (struct i2c_adapter) {
   11.48 --		.class = I2C_CLASS_TV_ANALOG,
   11.49 - 		.name = "hexium orion",
   11.50 - 	};
   11.51 - 	saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
   11.52 -
    12.1 --- a/v4l-dvb/stuff/d0a2ff731670	Thu Dec 26 13:52:49 2013 +0000
    12.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.3 @@ -1,181 +0,0 @@
    12.4 -
    12.5 -# HG changeset patch
    12.6 -# User Jean Delvare <khali@linux-fr.org>
    12.7 -# Date 1293818674 -7200
    12.8 -# Node ID d0a2ff731670f853f4e661e8542eacd29fd55131
    12.9 -# Parent  3be76b724b85004860ba7c625a735bc8b060bac4
   12.10 -[PATCH] [media] i2c: Stop using I2C_CLASS_TV_DIGITAL
   12.11 -
   12.12 -From: Jean Delvare <khali@linux-fr.org>
   12.13 -
   12.14 -Detection class I2C_CLASS_TV_DIGITAL is set by many adapters but no
   12.15 -I2C device driver is setting it anymore, which means it can be
   12.16 -dropped. I2C devices on digital TV adapters are instantiated
   12.17 -explicitly these days, which is much better.
   12.18 -
   12.19 -Signed-off-by: Jean Delvare <khali@linux-fr.org>
   12.20 -Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
   12.21 -
   12.22 ---- a/linux/drivers/media/dvb/b2c2/flexcop-i2c.c	Fri Dec 31 12:33:14 2010 +0100
   12.23 -+++ b/linux/drivers/media/dvb/b2c2/flexcop-i2c.c	Fri Dec 31 20:04:34 2010 +0200
   12.24 -@@ -248,9 +248,6 @@
   12.25 - 	i2c_set_adapdata(&fc->fc_i2c_adap[1].i2c_adap, &fc->fc_i2c_adap[1]);
   12.26 - 	i2c_set_adapdata(&fc->fc_i2c_adap[2].i2c_adap, &fc->fc_i2c_adap[2]);
   12.27 - 
   12.28 --	fc->fc_i2c_adap[0].i2c_adap.class =
   12.29 --		fc->fc_i2c_adap[1].i2c_adap.class =
   12.30 --		fc->fc_i2c_adap[2].i2c_adap.class = I2C_CLASS_TV_DIGITAL;
   12.31 - 	fc->fc_i2c_adap[0].i2c_adap.algo =
   12.32 - 		fc->fc_i2c_adap[1].i2c_adap.algo =
   12.33 - 		fc->fc_i2c_adap[2].i2c_adap.algo = &flexcop_algo;
   12.34 ---- a/linux/drivers/media/dvb/dm1105/dm1105.c	Fri Dec 31 12:33:14 2010 +0100
   12.35 -+++ b/linux/drivers/media/dvb/dm1105/dm1105.c	Fri Dec 31 20:04:34 2010 +0200
   12.36 -@@ -894,7 +894,6 @@
   12.37 - 	i2c_set_adapdata(&dev->i2c_adap, dev);
   12.38 - 	strcpy(dev->i2c_adap.name, DRIVER_NAME);
   12.39 - 	dev->i2c_adap.owner = THIS_MODULE;
   12.40 --	dev->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
   12.41 - 	dev->i2c_adap.dev.parent = &pdev->dev;
   12.42 - 	dev->i2c_adap.algo = &dm1105_algo;
   12.43 - 	dev->i2c_adap.algo_data = dev;
   12.44 ---- a/linux/drivers/media/dvb/dvb-usb/af9015.c	Fri Dec 31 12:33:14 2010 +0100
   12.45 -+++ b/linux/drivers/media/dvb/dvb-usb/af9015.c	Fri Dec 31 20:04:34 2010 +0200
   12.46 -@@ -1135,11 +1135,6 @@
   12.47 - 
   12.48 - 	strncpy(state->i2c_adap.name, d->desc->name,
   12.49 - 		sizeof(state->i2c_adap.name));
   12.50 --#ifdef I2C_ADAP_CLASS_TV_DIGITAL
   12.51 --	state->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL,
   12.52 --#else
   12.53 --	state->i2c_adap.class = I2C_CLASS_TV_DIGITAL,
   12.54 --#endif
   12.55 - 	state->i2c_adap.algo      = d->props.i2c_algo;
   12.56 - 	state->i2c_adap.algo_data = NULL;
   12.57 - 	state->i2c_adap.dev.parent = &d->udev->dev;
   12.58 ---- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c	Fri Dec 31 12:33:14 2010 +0100
   12.59 -+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c	Fri Dec 31 20:04:34 2010 +0200
   12.60 -@@ -20,7 +20,6 @@
   12.61 - 	}
   12.62 - 
   12.63 - 	strlcpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name));
   12.64 --	d->i2c_adap.class = I2C_CLASS_TV_DIGITAL,
   12.65 - 	d->i2c_adap.algo      = d->props.i2c_algo;
   12.66 - 	d->i2c_adap.algo_data = NULL;
   12.67 - 	d->i2c_adap.dev.parent = &d->udev->dev;
   12.68 ---- a/linux/drivers/media/dvb/frontends/cx24123.c	Fri Dec 31 12:33:14 2010 +0100
   12.69 -+++ b/linux/drivers/media/dvb/frontends/cx24123.c	Fri Dec 31 20:04:34 2010 +0200
   12.70 -@@ -1111,7 +1111,6 @@
   12.71 - 
   12.72 - 	strlcpy(state->tuner_i2c_adapter.name, "CX24123 tuner I2C bus",
   12.73 - 		sizeof(state->tuner_i2c_adapter.name));
   12.74 --	state->tuner_i2c_adapter.class     = I2C_CLASS_TV_DIGITAL,
   12.75 - 	state->tuner_i2c_adapter.algo      = &cx24123_tuner_i2c_algo;
   12.76 - 	state->tuner_i2c_adapter.algo_data = NULL;
   12.77 - 	i2c_set_adapdata(&state->tuner_i2c_adapter, state);
   12.78 ---- a/linux/drivers/media/dvb/frontends/dibx000_common.c	Fri Dec 31 12:33:14 2010 +0100
   12.79 -+++ b/linux/drivers/media/dvb/frontends/dibx000_common.c	Fri Dec 31 20:04:34 2010 +0200
   12.80 -@@ -172,7 +172,6 @@
   12.81 - 			    struct dibx000_i2c_master *mst)
   12.82 - {
   12.83 - 	strncpy(i2c_adap->name, name, sizeof(i2c_adap->name));
   12.84 --	i2c_adap->class = I2C_CLASS_TV_DIGITAL, i2c_adap->algo = algo;
   12.85 - 	i2c_adap->algo_data = NULL;
   12.86 - 	i2c_set_adapdata(i2c_adap, mst);
   12.87 - 	if (i2c_add_adapter(i2c_adap) < 0)
   12.88 ---- a/linux/drivers/media/dvb/frontends/s5h1420.c	Fri Dec 31 12:33:14 2010 +0100
   12.89 -+++ b/linux/drivers/media/dvb/frontends/s5h1420.c	Fri Dec 31 20:04:34 2010 +0200
   12.90 -@@ -955,7 +955,6 @@
   12.91 - 	/* create tuner i2c adapter */
   12.92 - 	strlcpy(state->tuner_i2c_adapter.name, "S5H1420-PN1010 tuner I2C bus",
   12.93 - 		sizeof(state->tuner_i2c_adapter.name));
   12.94 --	state->tuner_i2c_adapter.class     = I2C_CLASS_TV_DIGITAL,
   12.95 - 	state->tuner_i2c_adapter.algo      = &s5h1420_tuner_i2c_algo;
   12.96 - 	state->tuner_i2c_adapter.algo_data = NULL;
   12.97 - 	i2c_set_adapdata(&state->tuner_i2c_adapter, state);
   12.98 ---- a/linux/drivers/media/dvb/mantis/mantis_i2c.c	Fri Dec 31 12:33:14 2010 +0100
   12.99 -+++ b/linux/drivers/media/dvb/mantis/mantis_i2c.c	Fri Dec 31 20:04:34 2010 +0200
  12.100 -@@ -159,7 +159,6 @@
  12.101 - 	.owner			= THIS_MODULE,
  12.102 - 	.name			= "Mantis I2C",
  12.103 - 	.id			= I2C_HW_B_MANTIS,
  12.104 --	.class			= I2C_CLASS_TV_DIGITAL,
  12.105 - 	.algo			= &mantis_algo,
  12.106 - };
  12.107 - 
  12.108 ---- a/linux/drivers/media/dvb/ngene/ngene-i2c.c	Fri Dec 31 12:33:14 2010 +0100
  12.109 -+++ b/linux/drivers/media/dvb/ngene/ngene-i2c.c	Fri Dec 31 20:04:34 2010 +0200
  12.110 -@@ -212,11 +212,6 @@
  12.111 - 	struct i2c_adapter *adap = &(dev->channel[dev_nr].i2c_adapter);
  12.112 - 
  12.113 - 	i2c_set_adapdata(adap, &(dev->channel[dev_nr]));
  12.114 --#ifdef I2C_CLASS_TV_DIGITAL
  12.115 --	adap->class = I2C_CLASS_TV_DIGITAL | I2C_CLASS_TV_ANALOG;
  12.116 --#else
  12.117 --	adap->class = I2C_CLASS_TV_ANALOG;
  12.118 --#endif
  12.119 - 
  12.120 - 	strcpy(adap->name, "nGene");
  12.121 - 
  12.122 ---- a/linux/drivers/media/dvb/pluto2/pluto2.c	Fri Dec 31 12:33:14 2010 +0100
  12.123 -+++ b/linux/drivers/media/dvb/pluto2/pluto2.c	Fri Dec 31 20:04:34 2010 +0200
  12.124 -@@ -655,7 +655,6 @@
  12.125 - 	i2c_set_adapdata(&pluto->i2c_adap, pluto);
  12.126 - 	strcpy(pluto->i2c_adap.name, DRIVER_NAME);
  12.127 - 	pluto->i2c_adap.owner = THIS_MODULE;
  12.128 --	pluto->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
  12.129 - 	pluto->i2c_adap.dev.parent = &pdev->dev;
  12.130 - 	pluto->i2c_adap.algo_data = &pluto->i2c_bit;
  12.131 - 	pluto->i2c_bit.data = pluto;
  12.132 ---- a/linux/drivers/media/dvb/pt1/pt1.c	Fri Dec 31 12:33:14 2010 +0100
  12.133 -+++ b/linux/drivers/media/dvb/pt1/pt1.c	Fri Dec 31 20:04:34 2010 +0200
  12.134 -@@ -1087,7 +1087,6 @@
  12.135 - 	pt1_update_power(pt1);
  12.136 - 
  12.137 - 	i2c_adap = &pt1->i2c_adap;
  12.138 --	i2c_adap->class = I2C_CLASS_TV_DIGITAL;
  12.139 - 	i2c_adap->algo = &pt1_i2c_algo;
  12.140 - 	i2c_adap->algo_data = NULL;
  12.141 - 	i2c_adap->dev.parent = &pdev->dev;
  12.142 ---- a/linux/drivers/media/dvb/ttpci/av7110.c	Fri Dec 31 12:33:14 2010 +0100
  12.143 -+++ b/linux/drivers/media/dvb/ttpci/av7110.c	Fri Dec 31 20:04:34 2010 +0200
  12.144 -@@ -2479,7 +2479,6 @@
  12.145 - 	   get recognized before the main driver is fully loaded */
  12.146 - 	saa7146_write(dev, GPIO_CTRL, 0x500000);
  12.147 - 
  12.148 --	av7110->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
  12.149 - 	strlcpy(av7110->i2c_adap.name, pci_ext->ext_priv, sizeof(av7110->i2c_adap.name));
  12.150 - 
  12.151 - 	saa7146_i2c_adapter_prepare(dev, &av7110->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120); /* 275 kHz */
  12.152 ---- a/linux/drivers/media/dvb/ttpci/budget-core.c	Fri Dec 31 12:33:14 2010 +0100
  12.153 -+++ b/linux/drivers/media/dvb/ttpci/budget-core.c	Fri Dec 31 20:04:34 2010 +0200
  12.154 -@@ -495,8 +495,6 @@
  12.155 - 	if (bi->type != BUDGET_FS_ACTIVY)
  12.156 - 		saa7146_write(dev, GPIO_CTRL, 0x500000);	/* GPIO 3 = 1 */
  12.157 - 
  12.158 --	budget->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
  12.159 --
  12.160 - 	strlcpy(budget->i2c_adap.name, budget->card->name, sizeof(budget->i2c_adap.name));
  12.161 - 
  12.162 - 	saa7146_i2c_adapter_prepare(dev, &budget->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120);
  12.163 ---- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c	Fri Dec 31 12:33:14 2010 +0100
  12.164 -+++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c	Fri Dec 31 20:04:34 2010 +0200
  12.165 -@@ -1717,7 +1717,6 @@
  12.166 - 
  12.167 - 	i2c_set_adapdata(&ttusb->i2c_adap, ttusb);
  12.168 - 
  12.169 --	ttusb->i2c_adap.class		  = I2C_CLASS_TV_DIGITAL;
  12.170 - 	ttusb->i2c_adap.algo              = &ttusb_dec_algo;
  12.171 - 	ttusb->i2c_adap.algo_data         = NULL;
  12.172 - 	ttusb->i2c_adap.dev.parent	  = &udev->dev;
  12.173 ---- a/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c	Fri Dec 31 12:33:14 2010 +0100
  12.174 -+++ b/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c	Fri Dec 31 20:04:34 2010 +0200
  12.175 -@@ -121,8 +121,6 @@
  12.176 - 	memcpy(&vp3054_i2c->algo, &vp3054_i2c_algo_template,
  12.177 - 	       sizeof(vp3054_i2c->algo));
  12.178 - 
  12.179 --	vp3054_i2c->adap.class |= I2C_CLASS_TV_DIGITAL;
  12.180 --
  12.181 - 	vp3054_i2c->adap.dev.parent = &dev->pci->dev;
  12.182 - 	strlcpy(vp3054_i2c->adap.name, core->name,
  12.183 - 		sizeof(vp3054_i2c->adap.name));
  12.184 -
    13.1 --- a/v4l-dvb/stuff/d64b014c5253	Thu Dec 26 13:52:49 2013 +0000
    13.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.3 @@ -1,37 +0,0 @@
    13.4 -
    13.5 -# HG changeset patch
    13.6 -# User Igor M. Liplianin <liplianin@me.by>
    13.7 -# Date 1293902019 -7200
    13.8 -# Node ID d64b014c5253e3699e025339619a6f7704f2fb81
    13.9 -# Parent  d0a2ff731670f853f4e661e8542eacd29fd55131
   13.10 -V4L/DVB: dvb: Convert "mutex" to semaphore
   13.11 -
   13.12 -From: Thomas Gleixner <tglx@linutronix.de>
   13.13 -
   13.14 -Get rid of init_MUTEX[_LOCKED]() and use sema_init() instead.
   13.15 -
   13.16 -Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
   13.17 -Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
   13.18 ----
   13.19 -
   13.20 ---- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c	Fri Dec 31 20:04:34 2010 +0200
   13.21 -+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c	Sat Jan 01 19:13:39 2011 +0200
   13.22 -@@ -715,7 +715,7 @@
   13.23 - 
   13.24 - 	kthread_stop(fepriv->thread);
   13.25 - 
   13.26 --	init_MUTEX (&fepriv->sem);
   13.27 -+	sema_init(&fepriv->sem, 1);
   13.28 - 	fepriv->state = FESTATE_IDLE;
   13.29 - 
   13.30 - 	/* paranoia check in case a signal arrived */
   13.31 -@@ -2074,7 +2074,7 @@
   13.32 - 	}
   13.33 - 	fepriv = fe->frontend_priv;
   13.34 - 
   13.35 --	init_MUTEX (&fepriv->sem);
   13.36 -+	sema_init(&fepriv->sem, 1);
   13.37 - 	init_waitqueue_head (&fepriv->wait_queue);
   13.38 - 	init_waitqueue_head (&fepriv->events.wait_queue);
   13.39 - 	mutex_init(&fepriv->events.mtx);
   13.40 -