--- scuttle-0.7.4.orig/debian/README.source +++ scuttle-0.7.4/debian/README.source @@ -0,0 +1,57 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. --- scuttle-0.7.4.orig/debian/apache.conf +++ scuttle-0.7.4/debian/apache.conf @@ -0,0 +1 @@ +Alias /scuttle /usr/share/scuttle/www --- scuttle-0.7.4.orig/debian/changelog +++ scuttle-0.7.4/debian/changelog @@ -0,0 +1,161 @@ +scuttle (0.7.4-8.1ubuntu1) xenial; urgency=medium + + * Update to PHP7.0 dependencies (LP: #1565162). + + -- Nishanth Aravamudan Fri, 01 Apr 2016 17:00:07 -0700 + +scuttle (0.7.4-8.1) unstable; urgency=high + + * Non-maintainer upload. + * Disable overriding of PHP error_reporting and display_errors settings + in scuttle. Follow the settings as specified by the administrator in + php.ini (closes: #704300). + + -- Thijs Kinkhorst Mon, 01 Apr 2013 10:09:54 +0200 + +scuttle (0.7.4-8) unstable; urgency=high + + * Fixed configuration file in /var (policy 10.7) (Closes: #688500) + - Moving config_debconf.inc.php from /var/lib to /etc + + -- Marcelo Jorge Vieira (metal) Mon, 22 Oct 2012 02:18:10 -0200 + +scuttle (0.7.4-7) unstable; urgency=low + + * Added Italian debconf template translation (Closes: #665703) + * Changed VCS information to my new Alioth account + + -- Marcelo Jorge Vieira (metal) Wed, 09 May 2012 11:45:54 -0300 + +scuttle (0.7.4-6.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix pending l10n issues. Debconf translations: + - Danish (Joe Hansen). Closes: #628409 + - Polish (Michał Kułach). Closes: #664065 + + -- Christian Perrier Sat, 31 Mar 2012 17:40:27 +0200 + +scuttle (0.7.4-6) unstable; urgency=high + + * Conditionally call wwwconfig-common/restart.sh + in postrm script (Closes: #606688); Thanks HIGUCHI Daisuke. + + -- Marcelo Jorge Vieira (metal) Wed, 15 Dec 2010 15:43:14 -0200 + +scuttle (0.7.4-5) unstable; urgency=low + + * Many PHP warnings (Closes: #571804) + - Changed date_default_timezone.patch; setting default timezone + in config.inc.php instead of index.php. + - Fixed deprecated eregi function + - Fixed deprecated split function + + -- Marcelo Jorge Vieira (metal) Fri, 12 Mar 2010 11:42:48 -0300 + +scuttle (0.7.4-4) unstable; urgency=low + + * Many PHP warnings (Closes: #571804) + - Assigning the return value of new by reference is deprecated + - Fixed default timezone + * Setting PHP dependency to >= 5.1.0 + * Wrapping depends field + * Changing my email for Debian address + * Removed DM-Upload-Allowed field + * Updated Standards-Version to 3.8.4 (no changes) + + -- Marcelo Jorge Vieira (metal) Sat, 06 Mar 2010 11:29:42 -0300 + +scuttle (0.7.4-3) unstable; urgency=low + + * Added Japanese debconf template translation (Closes: #554108) + + -- Marcelo Jorge Vieira (metal) Tue, 22 Dec 2009 10:25:25 -0200 + +scuttle (0.7.4-2) unstable; urgency=low + + * Fixed patches headers + * Removing cdbs references and bumping package to debhelper 7 + * Updated Standards-Version to 3.8.3 + * Added DM-Upload-Allowed control field + * Renamed functions.inc.php.diff file to using_php-gettext_package.patch + * Renamed header.inc.php.diff file to moving_config_to_etc.patch + * Fixed base URL to work with https (Closes: #546002) + Thanks Jeffrey C. Carlyle + * Removed po-debconf dependency + * Added httpd with alternative to apache2 + + -- Marcelo Jorge Vieira (metal) Fri, 18 Sep 2009 12:35:00 -0300 + +scuttle (0.7.4-1) unstable; urgency=low + + * New Upstream Release + * Updated debian/config.inc.php.diff + * Updated copyright + * Changed VCS information from upstream VCS to maintainers VCS + * Updated Standards-Version to 3.8.0 + + -- Marcelo Jorge Vieira (metal) Wed, 16 Jul 2008 13:54:52 -0300 + +scuttle (0.7.2-8) unstable; urgency=low + + * Added Spanish debconf templates translation (Closes: #460874) + * Added Vcs-Svn and Vcs-Browser fields on debian/control + + -- Marcelo Jorge Vieira (metal) Tue, 15 Jan 2008 18:11:14 -0200 + +scuttle (0.7.2-7) unstable; urgency=low + + * Added Finnish debconf templates translation (Closes: #457428) + * Fixed a typo in the debconf templates + * Updated Standards-Version to 3.7.3 + + -- Marcelo Jorge Vieira (metal) Thu, 03 Jan 2008 18:12:43 -0200 + +scuttle (0.7.2-6) unstable; urgency=low + + * Added Dutch debconf templates translation (Closes: #450990) + + -- Marcelo Jorge Vieira (metal) Tue, 13 Nov 2007 13:56:48 -0200 + +scuttle (0.7.2-5) unstable; urgency=low + + * Added Galician debconf templates translation (Closes:#444760) + + -- Marcelo Jorge Vieira (metal) Sun, 30 Sep 2007 18:06:16 -0300 + +scuttle (0.7.2-4) unstable; urgency=low + + * Replaced dbc_load_include_args by dbc_generate_include_args in + scuttle.postinst, fixing args in database.php. + + -- Marcelo Jorge Vieira (metal) Thu, 13 Sep 2007 17:11:38 -0300 + +scuttle (0.7.2-3) unstable; urgency=low + + * Fixed debconf configuration file to database.php + * Removed php4, php4-mysql, apache and apache-ssl from control depends + * Removed questions from debconf to configure apache and apache-ssl (Closes: #434049) + * Removed db_set from "locale" debconf template + * Added German debconf templates translation (Closes: #434176, #438622) + * Added French debconf templates translation (Closes: #435492, #441154) + * Added Russian debconf templates translation (Closes: #436067) + * Added Vietnamese debconf templates translation + * Added Swedish debconf templates translation (Closes: #435925) + * Added Portuguese debconf templates translation (Closes: #436225) + * Added Czech debconf templates translation (Closes: #437057) + + -- Marcelo Jorge Vieira (metal) Fri, 03 Aug 2007 11:04:34 -0300 + +scuttle (0.7.2-2) unstable; urgency=low + + * Removed useless part in description (Closes: #433534) + + -- Marcelo Jorge Vieira (metal) Tue, 17 Jul 2007 19:15:45 -0300 + +scuttle (0.7.2-1) unstable; urgency=low + + * Initial release (Closes: #362114) + + -- Marcelo Jorge Vieira (metal) Thu, 7 Jun 2007 11:45:03 -0300 + --- scuttle-0.7.4.orig/debian/compat +++ scuttle-0.7.4/debian/compat @@ -0,0 +1 @@ +7 --- scuttle-0.7.4.orig/debian/config.inc.php.diff +++ scuttle-0.7.4/debian/config.inc.php.diff @@ -0,0 +1,55 @@ +--- config.inc.php.example 2008-07-14 15:38:16.000000000 -0300 ++++ config.inc.php.example.new 2008-07-16 11:32:34.000000000 -0300 +@@ -25,12 +25,8 @@ + # dbname: Database name + ###################################################################### + +-$dbtype = 'mysql'; +-$dbhost = '127.0.0.1'; +-$dbport = '3306'; +-$dbuser = 'username'; +-$dbpass = 'password'; +-$dbname = 'scuttle'; ++# dbconfig-common ++include_once('/etc/scuttle/database.php'); + + ###################################################################### + # You have finished configuring the database! +@@ -85,8 +81,11 @@ + # reservedusers : An array of usernames that cannot be registered + ###################################################################### + ++# $locale and $adminemail at ++# /var/cache/scuttle/config_debconf.php ++include_once('/etc/scuttle/config_debconf.inc.php'); ++ + $sitename = 'Scuttle'; +-$locale = 'en_GB'; + $top_include = 'top.inc.php'; + $bottom_include = 'bottom.inc.php'; + $shortdate = 'd-m-Y'; +@@ -95,15 +94,14 @@ + $defaultPerPage = 10; + $defaultRecentDays = 14; + $defaultOrderBy = 'date_desc'; +-$TEMPLATES_DIR = dirname(__FILE__) .'/templates/'; ++$TEMPLATES_DIR = '/usr/share/scuttle/www/templates/'; + $root = NULL; + $cookieprefix = 'SCUTTLE'; + $tableprefix = 'sc_'; +-$adminemail = 'admin@example.org'; + $cleanurls = false; + + $usecache = false; +-$dir_cache = dirname(__FILE__) .'/cache/'; ++$dir_cache = '/var/cache/scuttle'; + + $useredir = false; + $url_redir = 'http://www.google.com/url?sa=D&q='; +@@ -116,5 +114,5 @@ + ); + $reservedusers = array('all', 'watchlist'); + +-include_once('debug.inc.php'); ++include_once('/usr/share/scuttle/www/debug.inc.php'); + ?> --- scuttle-0.7.4.orig/debian/config_debconf.inc.php +++ scuttle-0.7.4/debian/config_debconf.inc.php @@ -0,0 +1,6 @@ + --- scuttle-0.7.4.orig/debian/control +++ scuttle-0.7.4/debian/control @@ -0,0 +1,31 @@ +Source: scuttle +Section: web +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Marcelo Jorge Vieira (metal) +Build-Depends: debhelper (>= 7), quilt +Standards-Version: 3.8.4 +Homepage: http://sourceforge.net/projects/scuttle +Vcs-Git: git://git.debian.org/git/users/metal/scuttle.git +Vcs-Browser: http://git.debian.org/?p=users/metal/scuttle.git;a=summary + +Package: scuttle +Architecture: all +Depends: ${misc:Depends}, + php, + php-mysql, + apache2 | httpd, + wwwconfig-common, + dbconfig-common, + php-gettext, + mysql-client, + ucf +Suggests: mysql-server +Description: Web-based social bookmarking system + Allows multiple users to store, share and tag their favourite links online. + . + * Scuttle supports most of the del.icio.us API. + Almost all of the neat tools made for that system can be + modified to work with Scuttle instead. If you find a tool + that won't let you change the API address, ask the creator + to add this setting. You never know, they might just do it. --- scuttle-0.7.4.orig/debian/copyright +++ scuttle-0.7.4/debian/copyright @@ -0,0 +1,36 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat +Upstream-Name: Scuttle +Upstream-Maintainer: Marcus Campbell +Upstream-Source: http://sourceforge.net/projects/scuttle/ + +Files: * +Copyright: (c) 2006, Marcus Campbell +License: GPL-2+ + +Files: includes/db/* +Homepage: http://www.phpbb.com/ +Copyright: (c) 2005, phpBB Group +License: GPL-2+ + +Files: includes/utf8.php +Homepage: http://wiki.splitbrain.org/wiki:utf8update +Copyright: (c) 2006, Andreas Gohr +License: GPL-2 + +Files: includes/player/* +Homepage: http://musicplayer.sourceforge.net/ +Copyright: (c) 2005, Fabricio Zuardi +License: BSD + +Files: debian/* +Copyright: (c) 2006-2008 Marcelo Jorge Vieira (metal) +License: GPL-2+ + + +License: GPL-2 + On Debian GNU/Linux systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-2'. + +License: BSD + On Debian GNU/Linux systems, the complete text of the BSD License + can be found in `/usr/share/common-licenses/BSD'. --- scuttle-0.7.4.orig/debian/patches/date_default_timezone.patch +++ scuttle-0.7.4/debian/patches/date_default_timezone.patch @@ -0,0 +1,12 @@ +Index: scuttle/config.inc.php.example +=================================================================== +--- scuttle.orig/config.inc.php.example 2010-03-12 10:11:53.000000000 -0300 ++++ scuttle/config.inc.php.example 2010-03-12 10:13:14.000000000 -0300 +@@ -116,5 +116,7 @@ + ); + $reservedusers = array('all', 'watchlist'); + ++date_default_timezone_set( @date_default_timezone_get() ); ++ + include_once('debug.inc.php'); + ?> --- scuttle-0.7.4.orig/debian/patches/deprecated_eregi.patch +++ scuttle-0.7.4/debian/patches/deprecated_eregi.patch @@ -0,0 +1,157 @@ +Index: scuttle/services/userservice.php +=================================================================== +--- scuttle.orig/services/userservice.php 2010-03-12 11:04:43.000000000 -0300 ++++ scuttle/services/userservice.php 2010-03-12 11:04:43.000000000 -0300 +@@ -40,7 +40,7 @@ + if(!empty($host)) { + @exec("nslookup -type=$type $host", $output); + while(list($k, $line) = each($output)) { +- if(eregi("^$host", $line)) { ++ if(preg_match("/^$host/i", $line)) { + return true; + } + } +Index: scuttle/includes/php-gettext/gettext.php +=================================================================== +--- scuttle.orig/includes/php-gettext/gettext.php 2010-03-12 11:02:40.000000000 -0300 ++++ scuttle/includes/php-gettext/gettext.php 2010-03-12 11:04:43.000000000 -0300 +@@ -279,7 +279,7 @@ + } else { + $header = $this->get_translation_string(0); + } +- if (eregi("plural-forms: ([^\n]*)\n", $header, $regs)) ++ if (preg_match("/plural-forms: ([^\n]*)\n/i", $header, $regs)) + $expr = $regs[1]; + else + $expr = "nplurals=2; plural=n == 1 ? 0 : 1;"; +Index: scuttle/includes/db/oracle.php +=================================================================== +--- scuttle.orig/includes/db/oracle.php 2010-03-12 11:02:40.000000000 -0300 ++++ scuttle/includes/db/oracle.php 2010-03-12 11:04:43.000000000 -0300 +@@ -102,7 +102,7 @@ + $this->last_query = $query; + $this->num_queries++; + +- if(eregi("LIMIT", $query)) ++ if(preg_match("/LIMIT/i", $query)) + { + preg_match("/^(.*)LIMIT ([0-9]+)[, ]*([0-9]+)*/s", $query, $limits); + +@@ -119,7 +119,7 @@ + } + } + +- if(eregi("^(INSERT|UPDATE) ", $query)) ++ if(preg_match("/^(INSERT|UPDATE) /i", $query)) + { + $query = preg_replace("/\\\'/s", "''", $query); + } +@@ -372,7 +372,7 @@ + } + if($query_id && $this->last_query_text[$query_id] != "") + { +- if( eregi("^(INSERT{1}|^INSERT INTO{1})[[:space:]][\"]?([a-zA-Z0-9\_\-]+)[\"]?", $this->last_query_text[$query_id], $tablename)) ++ if( preg_match("/^(INSERT{1}|^INSERT INTO{1})[[:space:]][\"]?([a-zA-Z0-9\_\-]+)[\"]?/i", $this->last_query_text[$query_id], $tablename)) + { + $query = "SELECT ".$tablename[2]."_id_seq.currval FROM DUAL"; + $stmt = @OCIParse($this->db_connect_id, $query); +@@ -406,7 +406,7 @@ + } + if($query_id && $this->last_query_text[$query_id] != "") + { +- if( eregi("^(INSERT{1}|^INSERT INTO{1})[[:space:]][\"]?([a-zA-Z0-9\_\-]+)[\"]?", $this->last_query_text[$query_id], $tablename)) ++ if( preg_match("/^(INSERT{1}|^INSERT INTO{1})[[:space:]][\"]?([a-zA-Z0-9\_\-]+)[\"]?/i", $this->last_query_text[$query_id], $tablename)) + { + $query = "SELECT ".$tablename[2]."_id_seq.CURRVAL FROM DUAL"; + $temp_q_id = @OCIParse($this->db_connect_id, $query); +@@ -465,4 +465,4 @@ + + } // if ... define + +-?> +\ No newline at end of file ++?> +Index: scuttle/includes/db/db2.php +=================================================================== +--- scuttle.orig/includes/db/db2.php 2010-03-12 11:02:40.000000000 -0300 ++++ scuttle/includes/db/db2.php 2010-03-12 11:04:43.000000000 -0300 +@@ -100,9 +100,9 @@ + { + $this->num_queries++; + +- if(!eregi("^INSERT ",$query)) ++ if(!preg_mach("/^INSERT /i",$query)) + { +- if(eregi("LIMIT", $query)) ++ if(preg_match("/LIMIT/i", $query)) + { + preg_match("/^(.*)LIMIT ([0-9]+)[, ]*([0-9]+)*/s", $query, $limits); + +@@ -134,7 +134,7 @@ + } + + $result_id = $this->query_result; +- if($this->query_result && eregi("^SELECT", $query)) ++ if($this->query_result && preg_match("/^SELECT/i", $query)) + { + + for($i = 1; $i < odbc_num_fields($result_id)+1; $i++) +@@ -166,7 +166,7 @@ + } + else + { +- if(eregi("^(INSERT|UPDATE) ", $query)) ++ if(preg_match("/^(INSERT|UPDATE) /i", $query)) + { + $query = preg_replace("/\\\'/s", "''", $query); + } +@@ -414,4 +414,4 @@ + + } // if ... define + +-?> +\ No newline at end of file ++?> +Index: scuttle/includes/db/mssql-odbc.php +=================================================================== +--- scuttle.orig/includes/db/mssql-odbc.php 2010-03-12 11:02:40.000000000 -0300 ++++ scuttle/includes/db/mssql-odbc.php 2010-03-12 11:04:43.000000000 -0300 +@@ -221,7 +221,7 @@ + $this->num_rows[$result] = sizeof($this->result_rowset[$result]); + } + } +- else if (eregi("^INSERT ", $query)) ++ else if (preg_match("/^INSERT /i", $query)) + { + $result = @odbc_exec($this->db_connect_id, $query); + +@@ -573,4 +573,4 @@ + + } // if ... define + +-?> +\ No newline at end of file ++?> +Index: scuttle/importNetscape.php +=================================================================== +--- scuttle.orig/importNetscape.php 2010-03-12 11:02:40.000000000 -0300 ++++ scuttle/importNetscape.php 2010-03-12 11:05:30.000000000 -0300 +@@ -48,7 +48,7 @@ + foreach ($attributes as $attribute) { + $att = preg_split('/\s*=\s*/s', $attribute, 2); + $attrTitle = $att[0]; +- $attrVal = eregi_replace('"', '"', preg_replace('/([\'"]?)(.*)\1/', '$2', $att[1])); ++ $attrVal = preg_replace('/"/i', '"', preg_replace('/([\'"]?)(.*)\1/', '$2', $att[1])); + switch ($attrTitle) { + case "HREF": + $bAddress = $attrVal; +@@ -58,7 +58,8 @@ + break; + } + } +- $bTitle = eregi_replace('"', '"', trim($titles[$i])); ++ $bTitle = preg_replace('/"/i', '"', trim($titles[$i])); ++ + + if ($bookmarkservice->bookmarkExists($bAddress, $userservice->getCurrentUserId())) { + $tplVars['error'] = T_('You have already submitted this bookmark.'); --- scuttle-0.7.4.orig/debian/patches/deprecated_return_value_of_new_by_reference.patch +++ scuttle-0.7.4/debian/patches/deprecated_return_value_of_new_by_reference.patch @@ -0,0 +1,65 @@ +--- scuttle.orig/services/bookmarkservice.php 2010-03-05 18:40:03.000000000 -0300 ++++ scuttle/services/bookmarkservice.php 2010-03-05 21:21:58.000000000 -0300 +@@ -5,7 +5,7 @@ + function & getInstance(& $db) { + static $instance; + if (!isset ($instance)) +- $instance = & new BookmarkService($db); ++ $instance = new BookmarkService($db); + return $instance; + } + +--- scuttle.orig/services/cacheservice.php 2010-03-05 18:44:17.000000000 -0300 ++++ scuttle/services/cacheservice.php 2010-03-05 21:19:35.000000000 -0300 +@@ -7,7 +7,7 @@ + static $instance; + + if (!isset($instance)) +- $instance =& new CacheService(); ++ $instance = new CacheService(); + + return $instance; + } + +--- scuttle.orig/services/templateservice.php 2010-03-05 18:44:17.000000000 -0300 ++++ scuttle/services/templateservice.php 2010-03-05 21:21:21.000000000 -0300 +@@ -5,7 +5,7 @@ + function &getInstance() { + static $instance; + if (!isset($instance)) +- $instance =& new TemplateService(); ++ $instance = new TemplateService(); + return $instance; + } + +@@ -16,7 +16,7 @@ + function loadTemplate($template, $vars = NULL) { + if (substr($template, -4) != '.php') + $template .= '.php'; +- $tpl =& new Template($this->basedir .'/'. $template, $vars, $this); ++ $tpl = new Template($this->basedir .'/'. $template, $vars, $this); + $tpl->parse(); + return $tpl; + } + +--- scuttle.orig/services/userservice.php 2010-03-05 18:42:55.000000000 -0300 ++++ scuttle/services/userservice.php 2010-03-05 21:20:32.000000000 -0300 +@@ -5,7 +5,7 @@ + function &getInstance(&$db) { + static $instance; + if (!isset($instance)) +- $instance =& new UserService($db); ++ $instance = new UserService($db); + return $instance; + } + +--- scuttle.orig/services/tagservice.php 2009-09-13 11:30:00.000000000 -0300 ++++ scuttle/services/tagservice.php 2010-03-05 21:58:24.000000000 -0300 +@@ -6,7 +6,7 @@ + function &getInstance(&$db) { + static $instance; + if (!isset($instance)) +- $instance =& new TagService($db); ++ $instance = new TagService($db); + return $instance; + } --- scuttle-0.7.4.orig/debian/patches/deprecated_split.patch +++ scuttle-0.7.4/debian/patches/deprecated_split.patch @@ -0,0 +1,42 @@ +Index: scuttle/includes/db/postgres.php +=================================================================== +--- scuttle.orig/includes/db/postgres.php 2010-03-12 11:15:56.000000000 -0300 ++++ scuttle/includes/db/postgres.php 2010-03-12 11:16:06.000000000 -0300 +@@ -49,7 +49,7 @@ + { + if (ereg(":", $sqlserver)) + { +- list($sqlserver, $sqlport) = split(":", $sqlserver); ++ list($sqlserver, $sqlport) = explode(":", $sqlserver); + $this->connect_string .= "host=$sqlserver port=$sqlport "; + } + else +@@ -594,4 +594,4 @@ + + } // if ... defined + +-?> +\ No newline at end of file ++?> +Index: scuttle/services/userservice.php +=================================================================== +--- scuttle.orig/services/userservice.php 2010-03-12 11:14:59.000000000 -0300 ++++ scuttle/services/userservice.php 2010-03-12 11:17:16.000000000 -0300 +@@ -122,7 +122,7 @@ + if (isset($_SESSION[$this->getSessionKey()])) { + return $_SESSION[$this->getSessionKey()]; + } else if (isset($_COOKIE[$this->getCookieKey()])) { +- $cook = split(':', $_COOKIE[$this->getCookieKey()]); ++ $cook = explode(':', $_COOKIE[$this->getCookieKey()]); + //cookie looks like this: 'id:md5(username+password)' + $query = 'SELECT * FROM '. $this->getTableName() . + ' WHERE MD5(CONCAT('.$this->getFieldName('username') . +@@ -334,7 +334,7 @@ + + function isValidEmail($email) { + if (preg_match("/^((?:(?:(?:\w[\.\-\+_]?)*)\w)+)\@((?:(?:(?:\w[\.\-_]?){0,62})\w)+)\.(\w{2,6})$/i", $email) > 0) { +- list($emailUser, $emailDomain) = split("@", $email); ++ list($emailUser, $emailDomain) = explode("@", $email); + + // Check if the email domain has a DNS record + if ($this->_checkdns($emailDomain)) { --- scuttle-0.7.4.orig/debian/patches/dont_override_errorreporting.patch +++ scuttle-0.7.4/debian/patches/dont_override_errorreporting.patch @@ -0,0 +1,19 @@ +Description: Disable overriding of PHP's error_reporting and display_errors + settings inside scuttle. We leave it up to the administrator to configure + these correctly through php.ini. +Bug-Debian: http://bugs.debian.org/704300 + +diff -ur scuttle-0.7.4.orig/header.inc.php scuttle-0.7.4/header.inc.php +--- scuttle-0.7.4.orig/header.inc.php 2008-07-16 18:48:39.000000000 +0200 ++++ scuttle-0.7.4/header.inc.php 2013-04-01 10:08:29.000000000 +0200 +@@ -1,8 +1,8 @@ + , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: scuttle\n" +"Report-Msgid-Bugs-To: scuttle@packages.debian.org\n" +"POT-Creation-Date: 2008-01-03 19:59-0200\n" +"PO-Revision-Date: 2007-08-10 10:46+0200\n" +"Last-Translator: Miroslav Kure \n" +"Language-Team: Czech \n" +"Language: cs\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Preferred locale:" +msgstr "Preferované locale:" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Select the locale that you desire to use with scuttle." +msgstr "Vyberte locale, které chcete ve scuttle používat." + +#. Type: boolean +#. Description +#: ../scuttle.templates:2001 +msgid "Do you want to configure apache2?" +msgstr "Přejete si nastavit apache2?" --- scuttle-0.7.4.orig/debian/po/da.po +++ scuttle-0.7.4/debian/po/da.po @@ -0,0 +1,35 @@ +# Danish translation scuttle. +# Copyright (C) scuttle & nedenstående oversættere. +# This file is distributed under the same license as the scuttle package. +# Joe Hansen (joedalton2@yahoo.dk), 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: scuttle\n" +"Report-Msgid-Bugs-To: scuttle@packages.debian.org\n" +"POT-Creation-Date: 2008-01-03 19:59-0200\n" +"PO-Revision-Date: 2011-05-28 18:30+01:00\n" +"Last-Translator: Joe Hansen \n" +"Language-Team: Danish \n" +"Language: da\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Preferred locale:" +msgstr "Foretrukket sprog:" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Select the locale that you desire to use with scuttle." +msgstr "Vælg det sprog som du ønsker at bruge med scuttle." + +#. Type: boolean +#. Description +#: ../scuttle.templates:2001 +msgid "Do you want to configure apache2?" +msgstr "Ønsker du at konfigurere apache2?" --- scuttle-0.7.4.orig/debian/po/de.po +++ scuttle-0.7.4/debian/po/de.po @@ -0,0 +1,36 @@ +# German translation of scuttle templates +# Helge Kreutzmann , 2007. +# This file is distributed under the same license as the scuttle package. +# +msgid "" +msgstr "" +"Project-Id-Version: scuttle 0.7.2-2\n" +"Report-Msgid-Bugs-To: scuttle@packages.debian.org\n" +"POT-Creation-Date: 2008-01-03 19:59-0200\n" +"PO-Revision-Date: 2007-08-18 13:25+0200\n" +"Last-Translator: Helge Kreutzmann \n" +"Language-Team: German \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Preferred locale:" +msgstr "Bevorzugte Standorteinstellung:" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Select the locale that you desire to use with scuttle." +msgstr "" +"Wählen Sie Standorteinstellung (»locale«), die Sie mit Scuttle verwenden " +"möchten." + +#. Type: boolean +#. Description +#: ../scuttle.templates:2001 +msgid "Do you want to configure apache2?" +msgstr "Möchten Sie Apache2 konfigurieren?" --- scuttle-0.7.4.orig/debian/po/es.po +++ scuttle-0.7.4/debian/po/es.po @@ -0,0 +1,57 @@ +# Spanish translation of scuttle. +# Copyright (C) 2008 THE scuttle'S COPYRIGHT HOLDER +# This file is distributed under the same license as the scuttle package. +# Changes: +# - Initial translation +# Maria Germana Oliveira , 2007. +# +# Traductores, si no conoce el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traducción al español, por favor lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/coordinacion +# especialmente las notas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# +msgid "" +msgstr "" +"Project-Id-Version: scuttle 0.7.2-6\n" +"Report-Msgid-Bugs-To: scuttle@packages.debian.org\n" +"POT-Creation-Date: 2008-01-03 19:59-0200\n" +"PO-Revision-Date: 2008-01-07 17:42-0430\n" +"Last-Translator: Maria Germana Oliveira Blazetic \n" +"Language-Team: Spanish \n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Preferred locale:" +msgstr "Configuración regional preferente:" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Select the locale that you desire to use with scuttle." +msgstr "Seleccione la configuración regional que desee usar con scuttle." + +#. Type: boolean +#. Description +#: ../scuttle.templates:2001 +msgid "Do you want to configure apache2?" +msgstr "¿Desea configurar apache2?" --- scuttle-0.7.4.orig/debian/po/fi.po +++ scuttle-0.7.4/debian/po/fi.po @@ -0,0 +1,32 @@ +msgid "" +msgstr "" +"Project-Id-Version: scuttle_0.7.2-6\n" +"Report-Msgid-Bugs-To: scuttle@packages.debian.org\n" +"POT-Creation-Date: 2008-01-03 19:59-0200\n" +"PO-Revision-Date: 2007-12-22 12:29+0200\n" +"Last-Translator: Esko Arajärvi \n" +"Language-Team: Finnish \n" +"Language: fi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Finnish\n" +"X-Poedit-Country: Finland\n" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Preferred locale:" +msgstr "Käytettävä maa-asetus:" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Select the locale that you desire to use with scuttle." +msgstr "Valitse maa-asetus, jota haluat käyttää scuttlen kanssa." + +#. Type: boolean +#. Description +#: ../scuttle.templates:2001 +msgid "Do you want to configure apache2?" +msgstr "Haluatko tehdä apache2:n asetukset?" --- scuttle-0.7.4.orig/debian/po/fr.po +++ scuttle-0.7.4/debian/po/fr.po @@ -0,0 +1,38 @@ +# Translation of scuttle debconf templates to French +# Copyright (C) 2007 Christian Perrier +# This file is distributed under the same license as the scuttle package. +# +# Christian Perrier , 2007. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: scuttle@packages.debian.org\n" +"POT-Creation-Date: 2008-01-03 19:59-0200\n" +"PO-Revision-Date: 2007-09-02 07:51+0200\n" +"Last-Translator: Christian Perrier \n" +"Language-Team: French \n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Preferred locale:" +msgstr "Paramètres régionaux :" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Select the locale that you desire to use with scuttle." +msgstr "" +"Veuillez choisir les paramètres régionaux (« locale ») à utiliser avec " +"scuttle." + +#. Type: boolean +#. Description +#: ../scuttle.templates:2001 +msgid "Do you want to configure apache2?" +msgstr "Voulez-vous configurer Apache 2 ?" --- scuttle-0.7.4.orig/debian/po/gl.po +++ scuttle-0.7.4/debian/po/gl.po @@ -0,0 +1,34 @@ +# Galician translation of scuttle's debconf templates +# This file is distributed under the same license as the scuttle package. +# Jacobo Tarrio , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: scuttle\n" +"Report-Msgid-Bugs-To: scuttle@packages.debian.org\n" +"POT-Creation-Date: 2008-01-03 19:59-0200\n" +"PO-Revision-Date: 2007-09-30 18:53+0100\n" +"Last-Translator: Jacobo Tarrio \n" +"Language-Team: Galician \n" +"Language: gl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Preferred locale:" +msgstr "Configuración local preferida:" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Select the locale that you desire to use with scuttle." +msgstr "Escolla a configuración local que quere empregar con scuttle." + +#. Type: boolean +#. Description +#: ../scuttle.templates:2001 +msgid "Do you want to configure apache2?" +msgstr "¿Quere configurar apache2?" --- scuttle-0.7.4.orig/debian/po/it.po +++ scuttle-0.7.4/debian/po/it.po @@ -0,0 +1,36 @@ +# Italian translation of scuttle debconf messages. +# Copyright (C) 2012, scuttle package copyright holder +# This file is distributed under the same license as the scuttle package. +# Beatrice Torracca , 2012. +msgid "" +msgstr "" +"Project-Id-Version: scuttle\n" +"Report-Msgid-Bugs-To: scuttle@packages.debian.org\n" +"POT-Creation-Date: 2008-01-03 19:59-0200\n" +"PO-Revision-Date: 2012-03-14 12:05+0200\n" +"Last-Translator: Beatrice Torracca \n" +"Language-Team: Italian \n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.7.1\n" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Preferred locale:" +msgstr "Localizzazione preferita:" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Select the locale that you desire to use with scuttle." +msgstr "Selezionare la localizzazione che si desidera usare con scuttle." + +#. Type: boolean +#. Description +#: ../scuttle.templates:2001 +msgid "Do you want to configure apache2?" +msgstr "Configurare apache2?" --- scuttle-0.7.4.orig/debian/po/ja.po +++ scuttle-0.7.4/debian/po/ja.po @@ -0,0 +1,34 @@ +# Copyright (C) 2009 Marcelo Jorge Vieira (metal) +# This file is distributed under the same license as scuttle package. +# Hideki Yamane (Debian-JP) , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: scuttle 0.7.4-2\n" +"Report-Msgid-Bugs-To: scuttle@packages.debian.org\n" +"POT-Creation-Date: 2008-01-03 19:59-0200\n" +"PO-Revision-Date: 2009-01-06 06:26+0900\n" +"Last-Translator: Hideki Yamane (Debian-JP) \n" +"Language-Team: Japanese \n" +"Language: ja\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Preferred locale:" +msgstr "優先するロケール:" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Select the locale that you desire to use with scuttle." +msgstr "scuttle で使いたいロケールを選択してください。" + +#. Type: boolean +#. Description +#: ../scuttle.templates:2001 +msgid "Do you want to configure apache2?" +msgstr "apache2 を設定しますか?" --- scuttle-0.7.4.orig/debian/po/nl.po +++ scuttle-0.7.4/debian/po/nl.po @@ -0,0 +1,36 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE 'S COPYRIGHT HOLDER +# This file is distributed under the same license as the package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: scuttle\n" +"Report-Msgid-Bugs-To: scuttle@packages.debian.org\n" +"POT-Creation-Date: 2008-01-03 19:59-0200\n" +"PO-Revision-Date: 2007-10-26 13:31+0100\n" +"Last-Translator: Bart Cornelis \n" +"Language-Team: debian-l10n-dutch \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Dutch\n" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Preferred locale:" +msgstr "Gewenste lokalisatie:" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Select the locale that you desire to use with scuttle." +msgstr "Welke lokalisatie wilt u gebruiken voor scuttle?" + +#. Type: boolean +#. Description +#: ../scuttle.templates:2001 +msgid "Do you want to configure apache2?" +msgstr "Wilt u apache2 instellen?" --- scuttle-0.7.4.orig/debian/po/pl.po +++ scuttle-0.7.4/debian/po/pl.po @@ -0,0 +1,38 @@ +# Translation of scuttle debconf templates to Polish. +# Copyright (C) 2008 +# This file is distributed under the same license as the scuttle package. +# +# Michał Kułach , 2012. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: scuttle@packages.debian.org\n" +"POT-Creation-Date: 2008-01-03 19:59-0200\n" +"PO-Revision-Date: 2012-03-15 12:25+0100\n" +"Last-Translator: Michał Kułach \n" +"Language-Team: Polish \n" +"Language: pl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.2\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Preferred locale:" +msgstr "Preferowane ustawienia lokalne:" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Select the locale that you desire to use with scuttle." +msgstr "Proszę wybrać ustawienia językowe, które zostaną użyte przez scuttle." + +#. Type: boolean +#. Description +#: ../scuttle.templates:2001 +msgid "Do you want to configure apache2?" +msgstr "Skonfigurować apache2?" --- scuttle-0.7.4.orig/debian/po/pt.po +++ scuttle-0.7.4/debian/po/pt.po @@ -0,0 +1,36 @@ +# Portuguese translations for scuttle package. +# Copyright (C) 2007 Miguel Figueiredo +# This file is distributed under the same license as the scuttle package. +# Miguel Figueiredo , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: scuttle\n" +"Report-Msgid-Bugs-To: scuttle@packages.debian.org\n" +"POT-Creation-Date: 2008-01-03 19:59-0200\n" +"PO-Revision-Date: 2007-08-06 12:25+0100\n" +"Last-Translator: Miguel Figueiredo \n" +"Language-Team: Portuguese\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Preferred locale:" +msgstr "'Locale' preferido:" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Select the locale that you desire to use with scuttle." +msgstr "Escolha o 'locale' que deseja para utilizar com o scuttle." + +#. Type: boolean +#. Description +#: ../scuttle.templates:2001 +msgid "Do you want to configure apache2?" +msgstr "Deseja configurar o apache2?" --- scuttle-0.7.4.orig/debian/po/pt_BR.po +++ scuttle-0.7.4/debian/po/pt_BR.po @@ -0,0 +1,36 @@ +# Brazilian Portuguese Translation for scuttle. +# Copyright (C) 2007 +# This file is distributed under the same license as the scuttle package. +# Marcelo Jorge Vieira (metal) , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: 0.7.2\n" +"Report-Msgid-Bugs-To: scuttle@packages.debian.org\n" +"POT-Creation-Date: 2008-01-03 19:59-0200\n" +"PO-Revision-Date: 2007-04-09 03:11-0300\n" +"Last-Translator: Marcelo Jorge Vieira (metal) \n" +"Language-Team: Brazilian Portuguese \n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Preferred locale:" +msgstr "Escolha o idioma:" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Select the locale that you desire to use with scuttle." +msgstr "Selecione o idioma que você deseja usar no scuttle." + +#. Type: boolean +#. Description +#: ../scuttle.templates:2001 +msgid "Do you want to configure apache2?" +msgstr "Você deseja configurar o apache2?" --- scuttle-0.7.4.orig/debian/po/ru.po +++ scuttle-0.7.4/debian/po/ru.po @@ -0,0 +1,38 @@ +# translation of templates.po to Russian +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Yuri Kozlov , 2007. +msgid "" +msgstr "" +"Project-Id-Version: 0.7.2-2\n" +"Report-Msgid-Bugs-To: scuttle@packages.debian.org\n" +"POT-Creation-Date: 2008-01-03 19:59-0200\n" +"PO-Revision-Date: 2007-08-05 09:45+0400\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Preferred locale:" +msgstr "Предпочтительная локаль:" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Select the locale that you desire to use with scuttle." +msgstr "Выберите локаль, которую вы хотите использовать с scuttle." + +#. Type: boolean +#. Description +#: ../scuttle.templates:2001 +msgid "Do you want to configure apache2?" +msgstr "Настроить apache2?" --- scuttle-0.7.4.orig/debian/po/sv.po +++ scuttle-0.7.4/debian/po/sv.po @@ -0,0 +1,35 @@ +# Swedish translation for scuttle debconf. +# Copyright (C) 2007 Free Software Foundation, Inc. +# This file is distributed under the same license as the scuttle package. +# Daniel Nylander , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: scuttle\n" +"Report-Msgid-Bugs-To: scuttle@packages.debian.org\n" +"POT-Creation-Date: 2008-01-03 19:59-0200\n" +"PO-Revision-Date: 2007-08-04 11:10+0100\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"Language: sv\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Preferred locale:" +msgstr "Föredragen lokal:" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Select the locale that you desire to use with scuttle." +msgstr "Välj den lokalanpassning som du vill använda med scuttle." + +#. Type: boolean +#. Description +#: ../scuttle.templates:2001 +msgid "Do you want to configure apache2?" +msgstr "Vill du konfigurera apache2?" --- scuttle-0.7.4.orig/debian/po/templates.pot +++ scuttle-0.7.4/debian/po/templates.pot @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: scuttle@packages.debian.org\n" +"POT-Creation-Date: 2008-01-03 19:59-0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Preferred locale:" +msgstr "" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Select the locale that you desire to use with scuttle." +msgstr "" + +#. Type: boolean +#. Description +#: ../scuttle.templates:2001 +msgid "Do you want to configure apache2?" +msgstr "" --- scuttle-0.7.4.orig/debian/po/vi.po +++ scuttle-0.7.4/debian/po/vi.po @@ -0,0 +1,36 @@ +# Vietnamese translation for Scuttle. +# Copyright © 2007 Free Software Foundation, Inc. +# Clytie Siddall , 2007 +# +msgid "" +msgstr "" +"Project-Id-Version: scuttle\n" +"Report-Msgid-Bugs-To: scuttle@packages.debian.org\n" +"POT-Creation-Date: 2008-01-03 19:59-0200\n" +"PO-Revision-Date: 2007-08-05 18:57+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"Language: vi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: LocFactoryEditor 1.7b1\n" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Preferred locale:" +msgstr "Miền địa phương đã muốn:" + +#. Type: select +#. Description +#: ../scuttle.templates:1001 +msgid "Select the locale that you desire to use with scuttle." +msgstr "Hãy chọn miền địa phương bạn muốn sử dụng với phần mềm scuttle." + +#. Type: boolean +#. Description +#: ../scuttle.templates:2001 +msgid "Do you want to configure apache2?" +msgstr "Bạn có muốn cấu hình trình phục vụ HTTP apache2 không?" --- scuttle-0.7.4.orig/debian/rules +++ scuttle-0.7.4/debian/rules @@ -0,0 +1,33 @@ +#!/usr/bin/make -f + +include /usr/share/quilt/quilt.make + +clean: unpatch + dh clean + +build: build-arch build-indep + +build-arch: + +build-indep: $(QUILT_STAMPFN) + dh build + +install: + +binary: binary-arch binary-indep + +binary-arch: build-arch + +binary-indep: build-indep + dh binary-indep --before dh_install + dh_install + # extra license files + rm -f debian/scuttle/usr/share/scuttle/www/includes/player/license.txt + # dbconfig-common - mysql database + mv debian/scuttle/usr/share/dbconfig-common/data/scuttle/install/tables.sql debian/scuttle/usr/share/dbconfig-common/data/scuttle/install/mysql + # patch - scuttle config file + cp debian/scuttle/usr/share/doc/scuttle/config.inc.php.example debian/scuttle/etc/scuttle/config.inc.php + patch debian/scuttle/etc/scuttle/config.inc.php < debian/config.inc.php.diff + dh binary-indep --remaining + +.PHONY: clean build install binary binary-arch binary-indep --- scuttle-0.7.4.orig/debian/scuttle.config +++ scuttle-0.7.4/debian/scuttle.config @@ -0,0 +1,36 @@ +#!/bin/sh + +set -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +# language +CHOICES="" +DIR="/usr/share/scuttle/www/locales/" + +if [ -d $DIR ]; then + for LOCALE in $(ls $DIR); do + if [ -d $DIR$LOCALE ]; then + CHOICES="$CHOICES$LOCALE, "; + fi + done +fi + +# cut comma and space of the end of string +CHOICES=${CHOICES%, } + +db_subst scuttle/locale choices $CHOICES +# LANG is a environment variable +#db_set scuttle/locale $(echo $LANG) || true +db_input medium scuttle/locale || true +db_go || true + +# restart webserver +db_input medium scuttle/webserver || true +db_go || true + +# dbconfig-common +. /usr/share/dbconfig-common/dpkg/config.mysql +dbc_first_version="0.7.2" +dbc_go scuttle $@ --- scuttle-0.7.4.orig/debian/scuttle.install +++ scuttle-0.7.4/debian/scuttle.install @@ -0,0 +1,22 @@ +.htaccess usr/share/scuttle/www/ + +*.php usr/share/scuttle/www/ +*.png usr/share/scuttle/www/ +*.gif usr/share/scuttle/www/ +*.css usr/share/scuttle/www/ + +api usr/share/scuttle/www/ +includes/db usr/share/scuttle/www/includes/ +includes/utf8.php usr/share/scuttle/www/includes/ +locales usr/share/scuttle/www/ +services usr/share/scuttle/www/ +templates usr/share/scuttle/www/ + +tables.sql usr/share/dbconfig-common/data/scuttle/install/ + +readme.txt usr/share/doc/scuttle/ +config.inc.php.example usr/share/doc/scuttle/ + +debian/apache.conf etc/scuttle/ + +debian/config_debconf.inc.php usr/share/scuttle/ --- scuttle-0.7.4.orig/debian/scuttle.postinst +++ scuttle-0.7.4/debian/scuttle.postinst @@ -0,0 +1,85 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +case "$1" in + configure) + + # source debconf stuff + . /usr/share/debconf/confmodule + + # permissions + mkdir -p /var/cache/scuttle + + CACHE_DIR=" /var/cache/scuttle" + CACHE_AUX=$(dpkg-statoverride --list | grep $CACHE_DIR) || true + if [ -z "$CACHE_AUX" ]; then + dpkg-statoverride --update --add root www-data 0774 $CACHE_DIR + fi + + # config file debconf + CONFIG_TEMPLATE="/usr/share/scuttle/config_debconf.inc.php" + CONFIG_FILE="/etc/scuttle/config_debconf.inc.php" + CONFIG_TMP="/etc/scuttle/config_debconf.inc.php.dpkg-new" + + # set admin email in config file + ADMIN_EMAIL="\$_SERVER['SERVER_ADMIN']"; + if [ -n "$ADMIN_EMAIL" ] ; then + sed -e "s/adminemail[^;]*/adminemail = $ADMIN_EMAIL/" $CONFIG_TEMPLATE > $CONFIG_TMP + fi + + # debconf messages + db_get scuttle/locale || true + LOCALE="$RET"; + + # set locale in config file + if [ -n "$LOCALE" ] ; then + sed -e "s/locale[^;]*/locale = '$LOCALE'/" $CONFIG_TEMPLATE > $CONFIG_TMP + fi + + ucf --debconf-ok $CONFIG_TMP $CONFIG_FILE && rm -f $CONFIG_TMP + + CONFIG_AUX=$(dpkg-statoverride --list | grep $CONFIG_FILE) || true + if [ -z "$CONFIG_AUX" ]; then + dpkg-statoverride --update --add root www-data 0640 $CONFIG_FILE + fi + + # source dbconfig-common stuff + . /usr/share/dbconfig-common/dpkg/postinst.mysql + dbc_first_version="0.7.2" + dbc_generate_include="php:/etc/scuttle/database.php" + dbc_generate_include_owner="root:www-data" + dbc_generate_include_perms="0640" + dbc_generate_include_args="--dbserver=dbhost" + dbc_go scuttle $@ + + # debconf messages + db_get scuttle/webserver || true + WEBSERVER="$RET"; + + # webserver configuration + if $WEBSERVER; then + if [ ! -d /etc/apache2/conf.d/ ]; then + install -d -m755 /etc/apache2/conf.d/ + fi + + if [ ! -e /etc/apache2/conf.d/scuttle.conf ]; then + ln -s /etc/scuttle/apache.conf \ + /etc/apache2/conf.d/scuttle.conf + restart="apache2" + fi + + servers="apache2" + . /usr/share/wwwconfig-common/restart.sh + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + ;; +esac --- scuttle-0.7.4.orig/debian/scuttle.postrm +++ scuttle-0.7.4/debian/scuttle.postrm @@ -0,0 +1,61 @@ +#!/bin/sh + +set -e + +# dbconfig-common files +if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule +fi + +if [ -f /usr/share/dbconfig-common/dpkg/postrm.mysql ]; then + . /usr/share/dbconfig-common/dpkg/postrm.mysql + dbc_go scuttle $@ +fi + +# Un-configure and restart webservers +db_get scuttle/webserver || true +WEBSERVER="$RET"; +if $WEBSERVER; then + if [ -L /etc/apache2/conf.d/scuttle.conf ]; then + rm -f /etc/apache2/conf.d/scuttle.conf + restart="apache2" + fi +fi + +if [ -e /usr/share/wwwconfig-common/restart.sh ] +then + servers="apache2" + . /usr/share/wwwconfig-common/restart.sh +fi + +if [ "$1" = "purge" ]; then + # remove database config + rm -f /etc/scuttle/database.php + if which ucf >/dev/null 2>&1; then + ucf --purge /etc/scuttle/database.php + fi + + # permissions - cache + CACHE_DIR=" /var/cache/scuttle" + CACHE_AUX=$(dpkg-statoverride --list | grep $CACHE_DIR) || true + if [ -z "$CACHE_AUX" ]; then + dpkg-statoverride --remove $CACHE_DIR + fi + + # permissions - config file + CONFIG_FILE="/etc/scuttle/config_debconf.inc.php" + CONFIG_AUX=$(dpkg-statoverride --list | grep $CONFIG_FILE) || true + if [ -z "$CONFIG_AUX" ]; then + dpkg-statoverride --remove $CONFIG_FILE + fi + + rm -f $CONFIG_FILE + if which ucf >/dev/null 2>&1; then + ucf --purge $CONFIG_FILE + fi + + # remove scuttle cache dir + rm -rf /var/cache/scuttle +fi + +#DEBHELPER# --- scuttle-0.7.4.orig/debian/scuttle.prerm +++ scuttle-0.7.4/debian/scuttle.prerm @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +. /usr/share/debconf/confmodule +. /usr/share/dbconfig-common/dpkg/prerm.mysql +dbc_go scuttle $@ + +#DEBHELPER# --- scuttle-0.7.4.orig/debian/scuttle.templates +++ scuttle-0.7.4/debian/scuttle.templates @@ -0,0 +1,10 @@ +Template: scuttle/locale +Type: select +Choices: ${choices} +Default: en_GB +_Description: Preferred locale: + Select the locale that you desire to use with scuttle. + +Template: scuttle/webserver +Type: boolean +_Description: Do you want to configure apache2? --- scuttle-0.7.4.orig/debian/watch +++ scuttle-0.7.4/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/scuttle/scuttle\.(.*)\.zip debian uupdate