Hi, I updated your package. Unfortunately I can't push into your git repository, so I will append a patch to this mail. The changelog: * Prepared for new upstream release (1.4.1) * Changed upstream domain (tt-rss.org) * New Debian Standards Version (3.8.4) * Add lighttpd support * Merge MySQL/PostgreSQL packages * Switch to DebSrc 3.0 * Add init script for the update daemon I installed the updated package on my server and it works fine. -- Sebastian
From 9e1df54e794073cd77ee915bcf69adb15db088a4 Mon Sep 17 00:00:00 2001
From: Sebastian Reichel <sre@ring0.de>
Date: Thu, 27 May 2010 03:05:52 +0200
Subject: [PATCH] big update :)
---
debian/README.Debian | 6 -
debian/apache.conf | 1 -
debian/changelog | 25 ++---
debian/conf/apache.conf | 3 +
debian/conf/avahi.service | 10 ++
debian/conf/lighttpd.conf | 5 +
debian/config | 16 +++
debian/config.php-dist-tt-rss-mysql.diff | 22 -----
debian/config.php-dist-tt-rss-pgsql.diff | 22 -----
debian/control | 66 +++++++-------
debian/copyright | 92 +++++++------------
debian/dirs | 1 +
debian/files | 1 +
debian/install | 28 ++++++
debian/links | 8 ++
debian/lintian-overrides | 1 +
debian/patches/config.php-dist.patch | 51 ++++++++++
debian/patches/functions.php.diff | 30 ------
debian/patches/ttrss_schema_pgsql.patch | 63 +++++++++++++
debian/patches/ttrss_schema_pgsql.sql.diff | 48 ----------
debian/po/POTFILES.in | 1 -
debian/po/pt_BR.po | 22 -----
debian/po/templates.pot | 24 -----
debian/postinst | 75 +++++++++++++++
debian/postrm | 60 ++++++++++++
debian/prerm | 15 +++
debian/rules | 53 +++--------
debian/source/format | 1 +
debian/templates | 6 +
debian/tt-rss-mysql.config | 18 ----
debian/tt-rss-mysql.install | 21 ----
debian/tt-rss-mysql.links | 2 -
debian/tt-rss-mysql.postinst | 59 ------------
debian/tt-rss-mysql.postrm | 41 --------
debian/tt-rss-mysql.prerm | 12 ---
debian/tt-rss-mysql.templates | 3 -
debian/tt-rss-pgsql.config | 20 ----
debian/tt-rss-pgsql.install | 21 ----
debian/tt-rss-pgsql.links | 2 -
debian/tt-rss-pgsql.postinst | 60 ------------
debian/tt-rss-pgsql.postrm | 41 --------
debian/tt-rss-pgsql.prerm | 10 --
debian/tt-rss-pgsql.templates | 3 -
debian/tt-rss.debhelper.log | 35 -------
debian/tt-rss.default | 9 ++
debian/tt-rss.init | 138 ++++++++++++++++++++++++++++
debian/watch | 2 +-
47 files changed, 582 insertions(+), 671 deletions(-)
delete mode 100644 debian/README.Debian
delete mode 100644 debian/apache.conf
create mode 100644 debian/conf/apache.conf
create mode 100644 debian/conf/avahi.service
create mode 100644 debian/conf/lighttpd.conf
create mode 100644 debian/config
delete mode 100644 debian/config.php-dist-tt-rss-mysql.diff
delete mode 100644 debian/config.php-dist-tt-rss-pgsql.diff
create mode 100644 debian/dirs
create mode 100644 debian/files
create mode 100644 debian/install
create mode 100644 debian/links
create mode 100644 debian/lintian-overrides
create mode 100644 debian/patches/config.php-dist.patch
delete mode 100644 debian/patches/functions.php.diff
create mode 100644 debian/patches/ttrss_schema_pgsql.patch
delete mode 100644 debian/patches/ttrss_schema_pgsql.sql.diff
delete mode 100644 debian/po/POTFILES.in
delete mode 100644 debian/po/pt_BR.po
delete mode 100644 debian/po/templates.pot
create mode 100644 debian/postinst
create mode 100644 debian/postrm
create mode 100644 debian/prerm
create mode 100644 debian/source/format
create mode 100644 debian/templates
delete mode 100644 debian/tt-rss-mysql.config
delete mode 100644 debian/tt-rss-mysql.install
delete mode 100644 debian/tt-rss-mysql.links
delete mode 100644 debian/tt-rss-mysql.postinst
delete mode 100644 debian/tt-rss-mysql.postrm
delete mode 100644 debian/tt-rss-mysql.prerm
delete mode 100644 debian/tt-rss-mysql.templates
delete mode 100644 debian/tt-rss-pgsql.config
delete mode 100644 debian/tt-rss-pgsql.install
delete mode 100644 debian/tt-rss-pgsql.links
delete mode 100644 debian/tt-rss-pgsql.postinst
delete mode 100644 debian/tt-rss-pgsql.postrm
delete mode 100644 debian/tt-rss-pgsql.prerm
delete mode 100644 debian/tt-rss-pgsql.templates
delete mode 100644 debian/tt-rss.debhelper.log
create mode 100644 debian/tt-rss.default
create mode 100644 debian/tt-rss.init
diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index 75f8b8f..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,6 +0,0 @@
-tt-rss for Debian
------------------
-
-<possible notes regarding this package - if none, delete this file>
-
- -- Marcelo Jorge Vieira (metal) <metal@alucinados.com> Sat, 26 Apr 2008 17:21:08 -0300
diff --git a/debian/apache.conf b/debian/apache.conf
deleted file mode 100644
index 840fdd9..0000000
--- a/debian/apache.conf
+++ /dev/null
@@ -1 +0,0 @@
-Alias /tt-rss /usr/share/tt-rss/www
diff --git a/debian/changelog b/debian/changelog
index fca6d0c..0444d50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,15 @@
-tt-rss (1.2.28-1) UNRELEASED; urgency=low
+tt-rss (1.4.1-0.1) UNRELEASED; urgency=low
+ * Non-maintainer upload.
* New upstream release
-
- -- Marcelo Jorge Vieira (metal) <metal@speedhorse> Tue, 21 Oct 2008 14:13:25 -0200
-
-tt-rss (1.2.25-1) UNRELEASED; urgency=low
-
- * New upstream release
-
- -- Marcelo Jorge Vieira (metal) <metal@alucinados.com> Thu, 31 Jul 2008 18:21:55 -0300
-
-tt-rss (1.2.24-1) UNRELEASED; urgency=low
-
- * New upstream release
-
- -- Marcelo Jorge Vieira (metal) <metal@alucinados.com> Mon, 07 Jul 2008 19:36:57 -0300
+ * New upstream domain
+ * New Debian Standards Version (3.8.4)
+ * Add lighttpd support
+ * Merge MySQL/PostgreSQL packages
+ * Switch to DebSrc 3.0
+ * Add init script for the update daemon
+
+ -- Sebastian Reichel <elektranox@gmail.com> Wed, 26 May 2010 18:19:31 +0200
tt-rss (1.2.22-1) UNRELEASED; urgency=low
diff --git a/debian/conf/apache.conf b/debian/conf/apache.conf
new file mode 100644
index 0000000..53ed61a
--- /dev/null
+++ b/debian/conf/apache.conf
@@ -0,0 +1,3 @@
+# tt-rss default Apache configuration
+
+Alias /tt-rss /usr/share/tt-rss/www
diff --git a/debian/conf/avahi.service b/debian/conf/avahi.service
new file mode 100644
index 0000000..da641bd
--- /dev/null
+++ b/debian/conf/avahi.service
@@ -0,0 +1,10 @@
+<?xml version="1.0" standalone='no'?>
+<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
+<service-group>
+ <name replace-wildcards="yes">Tiny Tiny RSS on %h</name>
+ <service>
+ <type>_http._tcp</type>
+ <port>80</port>
+ <txt-record>path=/tt-rss/</txt-record>
+ </service>
+</service-group>
diff --git a/debian/conf/lighttpd.conf b/debian/conf/lighttpd.conf
new file mode 100644
index 0000000..55ab1e6
--- /dev/null
+++ b/debian/conf/lighttpd.conf
@@ -0,0 +1,5 @@
+# tt-rss default lighttpd configuration
+
+alias.url += (
+ "/tt-rss" => "/usr/share/tt-rss/www",
+)
diff --git a/debian/config b/debian/config
new file mode 100644
index 0000000..75d99aa
--- /dev/null
+++ b/debian/config
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+# source debconf
+. /usr/share/debconf/confmodule
+
+# dbconfig-common
+if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
+ dbc_dbtypes="mysql, pgsql"
+ . /usr/share/dbconfig-common/dpkg/config
+ dbc_go tt-rss $@
+fi
+
+# restart webserver
+db_input high tt-rss/reconfigure-webserver || true
+db_go
diff --git a/debian/config.php-dist-tt-rss-mysql.diff b/debian/config.php-dist-tt-rss-mysql.diff
deleted file mode 100644
index 4effb5a..0000000
--- a/debian/config.php-dist-tt-rss-mysql.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- config.php-dist 2007-11-20 06:39:59.000000000 -0200
-+++ config.php.new 2007-12-20 20:14:13.000000000 -0200
-@@ -2,12 +2,13 @@
- // Your RDBMS must be configured to accept connections
- // via TCP/IP and authentified by password.
-
-- define('DB_TYPE', "pgsql"); // or mysql
-- define('DB_HOST', "localhost");
-- define('DB_USER', "fox");
-- define('DB_NAME', "fox");
-- define('DB_PASS', "XXXXXX");
-- //define('DB_PORT', '5432'); // when neeeded, PG-only
-+ // dbconfig-common
-+ include_once('/etc/tt-rss-mysql/database.php');
-+ define('DB_TYPE', $dbtype);
-+ define('DB_HOST', $dbserver);
-+ define('DB_USER', $dbuser);
-+ define('DB_NAME', $dbname);
-+ define('DB_PASS', $dbpass);
-
- define('MAGPIE_FETCH_TIME_OUT', 60);
- // Magpie's default timeout is 5 seconds. Some RSS feeds,
diff --git a/debian/config.php-dist-tt-rss-pgsql.diff b/debian/config.php-dist-tt-rss-pgsql.diff
deleted file mode 100644
index b152fb2..0000000
--- a/debian/config.php-dist-tt-rss-pgsql.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- config.php-dist 2007-11-20 06:39:59.000000000 -0200
-+++ config.php.new 2007-12-20 20:14:13.000000000 -0200
-@@ -2,12 +2,13 @@
- // Your RDBMS must be configured to accept connections
- // via TCP/IP and authentified by password.
-
-- define('DB_TYPE', "pgsql"); // or mysql
-- define('DB_HOST', "localhost");
-- define('DB_USER', "fox");
-- define('DB_NAME', "fox");
-- define('DB_PASS', "XXXXXX");
-- //define('DB_PORT', '5432'); // when neeeded, PG-only
-+ // dbconfig-common
-+ include_once('/etc/tt-rss-pgsql/database.php');
-+ define('DB_TYPE', $dbtype);
-+ define('DB_HOST', $dbserver);
-+ define('DB_USER', $dbuser);
-+ define('DB_NAME', $dbname);
-+ define('DB_PASS', $dbpass);
-
- define('MAGPIE_FETCH_TIME_OUT', 60);
- // Magpie's default timeout is 5 seconds. Some RSS feeds,
diff --git a/debian/control b/debian/control
index 21dd076..44604c4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,40 +2,40 @@ Source: tt-rss
Section: web
Priority: optional
Maintainer: Marcelo Jorge Vieira (metal) <metal@alucinados.com>
-Build-Depends: cdbs, debhelper (>= 5)
-Standards-Version: 3.8.0
-Homepage: http://tt-rss.spb.ru
+Build-Depends: cdbs,
+ debhelper (>= 5)
+Standards-Version: 3.8.4
+Homepage: http://tt-rss.org
-Package: tt-rss-mysql
+Package: tt-rss
Architecture: all
-Depends: php5, php5-mysql, apache2, php-gettext, magpierss, po-debconf, wwwconfig-common, dbconfig-common, mysql-client, libphp-phpmailer, libphp-simplepie, libjs-scriptaculous, libjs-prototype
-Conflicts: tt-rss-pgsql
-Recommends: mysql-server
-Description: Tiny Tiny RSS is a web-based news feed (RSS/Atom) aggregator
- designed to allow you to read news from any location, while feeling as close
- to a real desktop application as possible.
+Depends: ${misc:Depends},
+ dbconfig-common,
+ libjs-scriptaculous,
+ libjs-prototype,
+ libphp-magpierss,
+ libphp-phpmailer,
+ libphp-simplepie,
+ php-gettext,
+ php-htmlpurifier,
+ php5,
+ php5-cli,
+ php5-mysql | php5-pgsql,
+ po-debconf
+Recommends: apache2 | lighttpd | httpd
+Suggests: mysql-server | postgresql,
+ mysql-client | postgresql-client
+Description: web-based news feed (RSS/Atom) aggregator
+ Tiny Tiny RSS is designed to allow you to read news from any location, while
+ feeling as close to a real desktop application as possible.
.
- Features list:
+ Feature list:
.
- * Server-side application, user only needs a web browser
- * Supports RSS, RDF, Atom feeds using Magpie or SimplePie library
- * Supports OPML import/export
- * Easy setup and configuration
- * Streamlined interface using XmlHttpRequest (or AJAX for laypeople)
-
-Package: tt-rss-pgsql
-Architecture: all
-Depends: php5, php5-pgsql, apache2, php-gettext, magpierss, po-debconf, wwwconfig-common, dbconfig-common, postgresql-client, libphp-phpmailer, libphp-simplepie, libjs-scriptaculous, libjs-prototype
-Conflicts: tt-rss-mysql
-Recommends: postgresql
-Description: Tiny Tiny RSS is a web-based news feed (RSS/Atom) aggregator
- designed to allow you to read news from any location, while feeling as close
- to a real desktop application as possible.
- .
- Features list:
- .
- * Server-side application, user only needs a web browser
- * Supports RSS, RDF, Atom feeds using Magpie or SimplePie library
- * Supports OPML import/export
- * Easy setup and configuration
- * Streamlined interface using XmlHttpRequest (or AJAX for laypeople)
+ - Server-side application, user only needs a web browser
+ - Support for RSS, RDF, Atom feeds
+ - Streamlined interface using AJAX
+ - Authentication for reading protected feeds
+ - OPML import/export
+ - Feed Aggregation
+ - Keyboard Shortcuts
+ - Content Filtering
diff --git a/debian/copyright b/debian/copyright
index b13de62..2bcc227 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,61 +1,36 @@
Files: *
-Copyright: (c) 2005-2007, Andrew Dolgov <cthulhoo@gmail.com>
-Download: http://http://tt-rss.spb.ru/download
+Copyright: (c) 2005-2010, Andrew Dolgov <cthulhoo@gmail.com>
+Download: http://http://tt-rss.org/download
License: GPLv2
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'
Files: debian/*
-Copyright: (C) 2008 Marcelo Jorge Vieira (metal) <metal@alucinados.com>
+Copyright:
+ (c) 2008 Marcelo Jorge Vieira (metal) <metal@alucinados.com>
+ (c) 2010 Sebastian Reichel <elektranox@gmail.com>
License: GPLv2
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'
-File: scriptaculous/dragdrop.js
+File: lib/scriptaculous/*.js
License: MIT-style
The complete text of the MIT License can be found at
`http://wiki.script.aculo.us/scriptaculous/show/License'
Copyright:
(c) 2005, 2006 Thomas Fuchs
(c) 2005, 2006 Sammi Williams <sammi@oriontransfer.co.nz>
-
-File: scriptaculous/controls.js
-License: MIT-style
- The complete text of the MIT License can be found at
- `http://wiki.script.aculo.us/scriptaculous/show/License'
-Copyright:
- (c) 2005, 2006 Thomas Fuchs
(c) 2005, 2006 Ivan Krstic
(c) 2005, 2006 Jon Tirsen
-Contributors:
- Richard Livsey
- Rahul Bhargava
- Rob Wills
-File: scriptaculous/effects.js
-License: MIT-style
- The complete text of the MIT License can be found at
- `http://wiki.script.aculo.us/scriptaculous/show/License'
-Copyright: (c) 2005, 2006 Thomas Fuchs
-Contributors:
- Justin Palmer
- Mark Pilgrim
- Martin Bialasinki
-
-File: scriptaculous/scriptaculous.js
-License: MIT-style
- The complete text of the MIT License can be found at
- `http://wiki.script.aculo.us/scriptaculous/show/License'
-Copyright: (c) 2005, 2006 Thomas Fuchs
-
-Files: prototype.js
+Files: lib/prototype.js
Download: http://www.prototypejs.org/
Copyright: (C) 2005-2008 Sam Stephenson <sam@conio.net>
License: MIT
The complete text of the MIT License can be found at
`http://dev.rubyonrails.org/browser/spinoffs/prototype/trunk/LICENSE'
-File: pngfix.js
+File: lib/pngfix.js
Download: http://Download.ntlworld.com/bobosola/index.htm
License: GPLv2
Copyrigth: (c) 2005-2007, Bob Osola <bobosola@gmail.com>
@@ -69,63 +44,60 @@ License: GPL
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'
-File: xsl_mop-up.js
+File: lib/xsl_mop-up.js
Copyright: Copyright (c) 2006, Sean M. Burke <sburke@cpan.org>
Download: http://fadshop.net/xsl_mop-up.js
License: public domain
-File: gettext/gettext.inc
-Download: http://savannah.nongnu.org/projects/php-gettext/
-Copyright: (c) 2005 Steven Armstrong <sa@c-area.ch>
-License: GPLv2 (or any later version)
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'
-
-File: gettext/gettext.php
+File: lib/gettext/*
Download: http://savannah.nongnu.org/projects/php-gettext/
Copyright:
- (c) 2003 Danilo Segan <danilo@kvota.net>
+ (c) 2005 Steven Armstrong <sa@c-area.ch>
+ (c) 2003,2005 Danilo Segan <danilo@kvota.net>
(c) 2005 Nico Kaiser <nico@siriux.net>
License: GPLv2 (or any later version)
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'
-File: gettext/streams.php
-Download: http://savannah.nongnu.org/projects/php-gettext/
-Copyright: (c) 2003, 2005 Danilo Segan <danilo@kvota.net>
-License: GPLv2 (or any later version)
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'
-
-File: simplepie/simplepie.inc
+File: lib/simplepie/*
Copyrigt: (c) 2004-2007, Ryan Parman and Geoffrey Sneddon
Download: http://simplepie.org/
License: BSD
On Debian GNU/Linux systems, the complete text of the BSD License
can be found in `/usr/share/common-licenses/BSD'
-Files: magpierss/*
+Files: lib/magpierss/*
Download: http://magpierss.sourceforge.net
Copyright: (c) Kellan Elliott-McCrea <kellan@protest.net>
License: GPL
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'
-File: magpierss/extlib/Snoopy.class.inc
+File: lib/magpierss/extlib/Snoopy.class.inc
Download: http://snoopy.sourceforge.com
Copyright: Copyright (C) Monte Ohrt <monte@ispi.net>
License: LGPL
On Debian GNU/Linux systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL'
-File: phpmailer/class.phpmailer.php
-Copyright: (c) 2001-2003 Brent R. Matzelle
+File: lib/phpmailer/*
+Copyright:
+ (c) 2001-2003 Brent R. Matzelle
+ (c) Chris Ryan
License: LGPL
On Debian GNU/Linux systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL'
-File: phpmailer/class.smtp.php
-Copyright: (c) Chris Ryan
-License: LGPL
- On Debian GNU/Linux systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL'
+File: lib/iui/*
+Copyright:
+ (c) 2007-2009, iUI Project Members
+License: BSD
+ On Debian GNU/Linux systems, the complete text of the BSD License
+ can be found in `/usr/share/common-licenses/BSD'
+
+File: extras/button/*
+Copyright:
+ (c) 2005, Fabricio Zuardi
+License: BSD
+ On Debian GNU/Linux systems, the complete text of the BSD License
+ can be found in `/usr/share/common-licenses/BSD'
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..7f71a63
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+var/lib/tt-rss
diff --git a/debian/files b/debian/files
new file mode 100644
index 0000000..4d27e9e
--- /dev/null
+++ b/debian/files
@@ -0,0 +1 @@
+tt-rss_1.4.1-0.1_all.deb web optional
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..882c89e
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,28 @@
+*.php usr/share/tt-rss/www/
+*.css usr/share/tt-rss/www/
+*.js usr/share/tt-rss/www/
+*.xsl usr/share/tt-rss/www/
+
+api usr/share/tt-rss/www/
+extras usr/share/tt-rss/www/
+help usr/share/tt-rss/www/
+images usr/share/tt-rss/www/
+locale usr/share/tt-rss/www/
+mobile usr/share/tt-rss/www/
+modules usr/share/tt-rss/www/
+schema usr/share/tt-rss/
+templates usr/share/tt-rss/www/
+themes usr/share/tt-rss/www/
+
+utils/stats.php usr/share/tt-rss/www/utils/
+utils/xml-export.php usr/share/tt-rss/www/utils/
+utils/xml-import.php usr/share/tt-rss/www/utils/
+utils/mysql_convert_unicode.php usr/share/tt-rss/www/utils/
+
+lib/accept-to-gettext.php usr/share/tt-rss/www/lib/
+lib/iui usr/share/tt-rss/www/lib/
+lib/MiniTemplator.class.php usr/share/tt-rss/www/lib/
+lib/pngfix.js usr/share/tt-rss/www/lib/
+lib/xsl_mop-up.js usr/share/tt-rss/www/lib/
+
+debian/conf/* etc/tt-rss/
diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..7b60c0b
--- /dev/null
+++ b/debian/links
@@ -0,0 +1,8 @@
+/usr/share/javascript/scriptaculous /usr/share/tt-rss/www/lib/scriptaculous
+/usr/share/javascript/prototype/prototype.js /usr/share/tt-rss/www/lib/prototype.js
+/usr/share/php/php-gettext /usr/share/tt-rss/www/lib/gettext
+/usr/share/php/simplepie /usr/share/tt-rss/www/lib/simplepie
+/usr/share/php/magpierss /usr/share/tt-rss/www/lib/magpierss
+/usr/share/php/libphp-phpmailer /usr/share/tt-rss/www/lib/phpmailer
+/usr/share/php-htmlpurifier /usr/share/tt-rss/www/lib/htmlpurifier
+/etc/tt-rss/config.php /usr/share/tt-rss/www/config.php
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
new file mode 100644
index 0000000..cd01032
--- /dev/null
+++ b/debian/lintian-overrides
@@ -0,0 +1 @@
+description-contains-duplicated-word Tiny Tiny
diff --git a/debian/patches/config.php-dist.patch b/debian/patches/config.php-dist.patch
new file mode 100644
index 0000000..3c33ade
--- /dev/null
+++ b/debian/patches/config.php-dist.patch
@@ -0,0 +1,51 @@
+diff -Nur -x '*.orig' -x '*~' tt-rss-1.4.1//config.php-dist tt-rss-1.4.1.new//config.php-dist
+--- tt-rss-1.4.1//config.php-dist 2010-05-27 01:52:42.000000000 +0200
++++ tt-rss-1.4.1.new//config.php-dist 2010-05-27 01:56:23.000000000 +0200
+@@ -2,12 +2,14 @@
+ // Your RDBMS must be configured to accept connections
+ // via TCP/IP and authentified by password.
+
+- define('DB_TYPE', "pgsql"); // or mysql
+- define('DB_HOST', "localhost");
+- define('DB_USER', "fox");
+- define('DB_NAME', "fox");
+- define('DB_PASS', "XXXXXX");
+- //define('DB_PORT', '5432'); // when neeeded, PG-only
++ // dbconfig-common
++ include_once('/etc/tt-rss/database.php');
++ define('DB_TYPE', $dbtype);
++ define('DB_HOST', $dbserver);
++ define('DB_PORT', $dbport);
++ define('DB_USER', $dbuser);
++ define('DB_NAME', $dbname);
++ define('DB_PASS', $dbpass);
+
+ define('MAGPIE_FETCH_TIME_OUT', 60);
+ // Magpie's default timeout is 5 seconds. Some RSS feeds,
+@@ -43,7 +45,7 @@
+ define('TMP_DIRECTORY', '/tmp');
+ // Directory for temporary files
+
+- define('FEEDS_FRAME_REFRESH', 600);
++ define('FEEDS_FRAME_REFRESH', 60);
+ // Auto refresh interval for feeds frame (in seconds)
+
+ define('MAX_UPDATE_TIME', 0);
+@@ -55,7 +57,7 @@
+ // It is also recommended to set FEEDS_FRAME_REFRESH to a lower value if using
+ // this option.
+
+- define('ENABLE_UPDATE_DAEMON', false);
++ define('ENABLE_UPDATE_DAEMON', true);
+ // This enables different mechanism for user-triggered updates designed
+ // for update daemon running in background on the server.
+ // This option suggests FEEDS_FRAME_REFRESH set to a small value
+@@ -159,7 +161,7 @@
+ // option can be used to integrate tt-rss with Apache's external
+ // authentication modules.
+
+- define('LOCK_DIRECTORY', '.');
++ define('LOCK_DIRECTORY', '/var/lib/tt-rss');
+ // Directory for lockfiles, must be writable to the user you run
+ // daemon process or cronjobs under.
+
diff --git a/debian/patches/functions.php.diff b/debian/patches/functions.php.diff
deleted file mode 100644
index 7c5a15e..0000000
--- a/debian/patches/functions.php.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- functions.php 2008-04-23 04:41:26.000000000 -0300
-+++ functions.php.new 2008-04-26 17:35:44.000000000 -0300
-@@ -36,7 +36,7 @@
-
- if (ENABLE_TRANSLATIONS == true) { // If translations are enabled.
- require_once "accept-to-gettext.php";
-- require_once "gettext/gettext.inc";
-+ require_once "/usr/share/php/php-gettext/gettext.inc";
-
- function startup_gettext() {
-
-@@ -82,14 +82,14 @@
- require_once 'errors.php';
- require_once 'version.php';
-
-- require_once 'phpmailer/class.phpmailer.php';
-+ require_once '/usr/share/php/libphp-phpmailer/class.phpmailer.php';
-
- define('MAGPIE_USER_AGENT_EXT', ' (Tiny Tiny RSS/' . VERSION . ')');
- define('MAGPIE_OUTPUT_ENCODING', 'UTF-8');
-
-- require_once "simplepie/simplepie.inc";
-- require_once "magpierss/rss_fetch.inc";
-- require_once 'magpierss/rss_utils.inc';
-+ require_once "/usr/share/php/simplepie/simplepie.inc";
-+ require_once "/usr/share/php/magpierss/rss_fetch.inc";
-+ require_once '/usr/share/php/magpierss/rss_utils.inc';
-
- /**
- * Print a timestamped debug message.
diff --git a/debian/patches/ttrss_schema_pgsql.patch b/debian/patches/ttrss_schema_pgsql.patch
new file mode 100644
index 0000000..b347472
--- /dev/null
+++ b/debian/patches/ttrss_schema_pgsql.patch
@@ -0,0 +1,63 @@
+diff -Nur -x '*.orig' -x '*~' tt-rss-1.4.1//schema/ttrss_schema_pgsql.sql tt-rss-1.4.1.new//schema/ttrss_schema_pgsql.sql
+--- tt-rss-1.4.1//schema/ttrss_schema_pgsql.sql 2010-05-26 22:12:50.000000000 +0200
++++ tt-rss-1.4.1.new//schema/ttrss_schema_pgsql.sql 2010-05-26 22:27:15.000000000 +0200
+@@ -1,31 +1,31 @@
+-drop table ttrss_user_labels2;
+-drop table ttrss_labels2;
+-drop table ttrss_feedbrowser_cache;
+-drop table ttrss_version;
+-drop table ttrss_labels;
+-drop table ttrss_filters;
+-drop table ttrss_filter_types;
+-drop table ttrss_filter_actions;
+-drop table ttrss_user_prefs;
+-drop table ttrss_prefs;
+-drop table ttrss_prefs_types;
+-drop table ttrss_prefs_sections;
+-drop table ttrss_tags;
+-drop table ttrss_enclosures;
+-drop table ttrss_settings_profiles;
+-drop table ttrss_entry_comments;
+-drop table ttrss_user_entries;
+-drop table ttrss_entries;
+-drop table ttrss_scheduled_updates;
+-drop table ttrss_counters_cache;
+-drop table ttrss_cat_counters_cache;
+-drop table ttrss_archived_feeds;
+-drop table ttrss_feeds;
+-drop table ttrss_feed_categories;
+-drop table ttrss_users;
+-drop table ttrss_themes;
+-drop table ttrss_sessions;
+-drop function SUBSTRING_FOR_DATE(timestamp, int, int);
++drop table if exists ttrss_user_labels2;
++drop table if exists ttrss_labels2;
++drop table if exists ttrss_feedbrowser_cache;
++drop table if exists ttrss_version;
++drop table if exists ttrss_labels;
++drop table if exists ttrss_filters;
++drop table if exists ttrss_filter_types;
++drop table if exists ttrss_filter_actions;
++drop table if exists ttrss_user_prefs;
++drop table if exists ttrss_prefs;
++drop table if exists ttrss_prefs_types;
++drop table if exists ttrss_prefs_sections;
++drop table if exists ttrss_tags;
++drop table if exists ttrss_enclosures;
++drop table if exists ttrss_settings_profiles;
++drop table if exists ttrss_entry_comments;
++drop table if exists ttrss_user_entries;
++drop table if exists ttrss_entries;
++drop table if exists ttrss_scheduled_updates;
++drop table if exists ttrss_counters_cache;
++drop table if exists ttrss_cat_counters_cache;
++drop table if exists ttrss_archived_feeds;
++drop table if exists ttrss_feeds;
++drop table if exists ttrss_feed_categories;
++drop table if exists ttrss_users;
++drop table if exists ttrss_themes;
++drop table if exists ttrss_sessions;
++drop function if exists SUBSTRING_FOR_DATE(timestamp, int, int);
+
+ begin;
+
diff --git a/debian/patches/ttrss_schema_pgsql.sql.diff b/debian/patches/ttrss_schema_pgsql.sql.diff
deleted file mode 100644
index bc061ec..0000000
--- a/debian/patches/ttrss_schema_pgsql.sql.diff
+++ /dev/null
@@ -1,48 +0,0 @@
---- schema/ttrss_schema_pgsql.sql 2008-04-23 04:41:27.000000000 -0300
-+++ schema/ttrss_schema_pgsql.sql.new 2008-04-26 17:32:32.000000000 -0300
-@@ -1,24 +1,24 @@
--drop table ttrss_version;
--drop table ttrss_labels;
--drop table ttrss_filters;
--drop table ttrss_filter_types;
--drop table ttrss_filter_actions;
--drop table ttrss_user_prefs;
--drop table ttrss_prefs;
--drop table ttrss_prefs_types;
--drop table ttrss_prefs_sections;
--drop table ttrss_tags;
--drop table ttrss_enclosures;
--drop table ttrss_entry_comments;
--drop table ttrss_user_entries;
--drop table ttrss_entries;
--drop table ttrss_scheduled_updates;
--drop table ttrss_feeds;
--drop table ttrss_feed_categories;
--drop table ttrss_users;
--drop table ttrss_themes;
--drop table ttrss_sessions;
--drop function SUBSTRING_FOR_DATE(timestamp, int, int);
-+drop table if exists ttrss_version;
-+drop table if exists ttrss_labels;
-+drop table if exists ttrss_filters;
-+drop table if exists ttrss_filter_types;
-+drop table if exists ttrss_filter_actions;
-+drop table if exists ttrss_user_prefs;
-+drop table if exists ttrss_prefs;
-+drop table if exists ttrss_prefs_types;
-+drop table if exists ttrss_prefs_sections;
-+drop table if exists ttrss_tags;
-+drop table if exists ttrss_enclosures;
-+drop table if exists ttrss_entry_comments;
-+drop table if exists ttrss_user_entries;
-+drop table if exists ttrss_entries;
-+drop table if exists ttrss_scheduled_updates;
-+drop table if exists ttrss_feeds;
-+drop table if exists ttrss_feed_categories;
-+drop table if exists ttrss_users;
-+drop table if exists ttrss_themes;
-+drop table if exists ttrss_sessions;
-+drop function if exists SUBSTRING_FOR_DATE(timestamp, int, int);
-
- begin;
-
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
deleted file mode 100644
index 4e30287..0000000
--- a/debian/po/POTFILES.in
+++ /dev/null
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] tt-rss-mysql.templates
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
deleted file mode 100644
index a1c5794..0000000
--- a/debian/po/pt_BR.po
+++ /dev/null
@@ -1,22 +0,0 @@
-# Brazilian Portuguese Translation for tt-rss.
-# Copyright (C) 2007 Marcelo Jorge Vieira (metal) <metal@alucinados.com>
-# This file is distributed under the same license as the tt-rss package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: metal@alucinados.com\n"
-"POT-Creation-Date: 2007-10-03 23:33-0300\n"
-"PO-Revision-Date: 2007-10-04 00:43-0300\n"
-"Last-Translator: Marcelo Jorge Vieira (metal) <metal@alucinados.com>\n"
-"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: boolean
-#. Description
-#: ../tt-rss.templates:1001 ../tt-rss-mysql.templates:1001
-#: ../tt-rss-pgsql.templates:1001
-msgid "Do you want to configure apache2?"
-msgstr "Você deseja configurar o apache2?"
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
deleted file mode 100644
index bc4c490..0000000
--- a/debian/po/templates.pot
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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 <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: metal@alucinados.com\n"
-"POT-Creation-Date: 2007-10-03 23:33-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: boolean
-#. Description
-#: ../tt-rss.templates:1001 ../tt-rss-mysql.templates:1001
-#: ../tt-rss-pgsql.templates:1001
-msgid "Do you want to configure apache2?"
-msgstr ""
diff --git a/debian/postinst b/debian/postinst
new file mode 100644
index 0000000..c7370d1
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,75 @@
+#!/bin/sh
+set -e
+
+avahi_install() {
+ if [ -d /etc/avahi/services/ -a ! -e /etc/avahi/services/tt-rss.service -a ! -L /etc/avahi/services/tt-rss.service ] ; then
+ ln -s ../../tt-rss/avahi.service /etc/avahi/services/tt-rss.service
+ fi
+}
+
+lighttpd_install() {
+ if [ ! -f /etc/lighttpd/conf-available/50-tt-rss.conf ] ; then
+ if which lighty-enable-mod >/dev/null 2>&1 ; then
+ ln -s ../../tt-rss/lighttpd.conf /etc/lighttpd/conf-available/50-tt-rss.conf
+ lighty-enable-mod tt-rss fastcgi
+ avahi_install
+ else
+ echo "Lighttpd not installed, skipping"
+ fi
+ fi
+}
+
+apache2_install() {
+ if [ -d /etc/apache2/conf.d ] && [ ! -e /etc/apache2/conf.d/tt-rss.conf ]; then
+ ln -s ../../tt-rss/apache.conf /etc/apache2/conf.d/tt-rss.conf
+ avahi_install
+ fi
+}
+
+if [ "$1" = "configure" ]; then
+ # tt-rss will write lock files into this directory
+ chown www-data:www-data /var/lib/tt-rss
+
+ # source debconf stuff
+ if [ -f /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+ fi
+
+ # dbconfig-common
+ if [ -f /usr/share/dbconfig-common/dpkg/postinst ]; then
+ . /usr/share/dbconfig-common/dpkg/postinst
+ dbc_generate_include="php:/etc/tt-rss/database.php"
+ dbc_generate_include_owner="root:www-data"
+ dbc_generate_include_perms="0640"
+
+ if ! dbc_go tt-rss $@ ; then
+ echo 'Automatic configuration using dbconfig-common failed!'
+ fi
+ fi
+
+ # webserver configuration
+ db_get tt-rss/reconfigure-webserver
+ webservers="$RET"
+
+ for webserver in $webservers; do
+ webserver=${webserver%,}
+ if [ "$webserver" = "lighttpd" ]; then
+ lighttpd_install
+ elif [ "$webserver" = "apache2" ]; then
+ apache_install
+ fi
+
+ # Reload webserver in any case, configuration might have changed
+ # Redirection of 3 is needed because Debconf uses it and it might
+ # be inherited by webserver. See bug #446324.
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d $webserver reload 3>/dev/null || true
+ else
+ /etc/init.d/$webserver reload 3>/dev/null || true
+ fi
+ done
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/postrm b/debian/postrm
new file mode 100644
index 0000000..607bae9
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,60 @@
+#!/bin/sh
+set -e
+
+lighttpd_remove() {
+ if [ -f /etc/lighttpd/conf-available/50-tt-rss.conf ] ; then
+ if which lighty-enable-mod >/dev/null 2>&1 ; then
+ lighty-disable-mod tt-rss || true
+ else
+ echo "Lighttpd not installed, skipping"
+ fi
+ rm -f /etc/lighttpd/conf-available/50-tt-rss.conf
+ fi
+}
+
+apache_remove() {
+ if [ -d /etc/apache2/conf.d ] && [ -L /etc/apache2/conf.d/tt-rss.conf ]; then
+ rm -f /etc/apache2/conf.d/tt-rss.conf
+ fi
+}
+
+if [ -f /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+fi
+
+if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
+ . /usr/share/dbconfig-common/dpkg/postrm
+ dbc_go tt-rss $@
+fi
+
+if [ "$1" = "purge" ]; then
+ rm -rf /etc/tt-rss
+fi
+
+if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
+ if [ -f /usr/share/debconf/confmodule ]; then
+ db_get tt-rss/reconfigure-webserver || true
+ webservers="$RET"
+
+ for webserver in $webservers; do
+ webserver=${webserver%,}
+ if [ "$webserver" = "lighttpd" ]; then
+ lighttpd_remove
+ elif [ "$webserver" = "apache2" ]; then
+ apache_remove
+ fi
+
+ # Redirection of 3 is needed because Debconf uses it and it might
+ # be inherited by webserver. See bug #446324.
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d $webserver reload 3>/dev/null || true
+ else
+ /etc/init.d/$webserver reload 3>/dev/null || true
+ fi
+ done
+ fi
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/prerm b/debian/prerm
new file mode 100644
index 0000000..ddab468
--- /dev/null
+++ b/debian/prerm
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -e
+
+if [ -f /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+fi
+
+if [ -f /usr/share/dbconfig-common/dpkg/prerm ]; then
+ . /usr/share/dbconfig-common/dpkg/prerm
+ dbc_go tt-rss $@
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
index eedfc60..a6e88c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,41 +3,18 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-PACKAGE_MYSQL=tt-rss-mysql
-PACKAGE_PGSQL=tt-rss-pgsql
-
-define install_rule
- # This file starts with the #! sequence that marks interpreted scripts,
- # but it is not executable.
- rm -f debian/$1/usr/share/$1/www/update_feeds.php
- rm -f debian/$1/usr/share/$1/www/update_daemon.php
- # config file
- rm -f debian/$1/usr/share/$1/config.php-dist
- cp debian/$1/usr/share/doc/$1/config.php-dist debian/$1/etc/$1/config.php
- ln -sf /etc/$1/config.php debian/$1/usr/share/$1/www/
- patch debian/$1/etc/$1/config.php < debian/config.php-dist-$1.diff
- # macos-resource-fork-file-in-package
- rm -f debian/$1/usr/share/$1/www/themes/graphite/images/._footer.png
- rm -f debian/$1/usr/share/$1/www/themes/graphite/images/._prefs-content.png
- rm -f debian/$1/usr/share/$1/www/themes/graphite/images/._toolbar.png
- # package-contains-empty-directory
- rm -rf debian/$1/usr/share/$1/www/themes/threecolumns/images/
- rm -rf debian/$1/usr/share/$1/www/icons/
- # xmlrpc dependence
- rm -rf debian/$1/usr/share/$1/www/xml-rpc.php
-endef
-
-binary-install/tt-rss-mysql::
- $(call install_rule,$(PACKAGE_MYSQL))
- # database
- #mv debian/$(PACKAGE_MYSQL)/usr/share/dbconfig-common/data/$(PACKAGE_MYSQL)/install/ttrss_schema_mysql.sql debian/$(PACKAGE_MYSQL)/usr/share/dbconfig-common/data/$(PACKAGE_MYSQL)/install/mysql
- mkdir -p debian/$(PACKAGE_MYSQL)/usr/share/dbconfig-common/data/$(PACKAGE_MYSQL)/install
- cp debian/$(PACKAGE_MYSQL)/usr/share/$(PACKAGE_MYSQL)/schema/ttrss_schema_mysql.sql debian/$(PACKAGE_MYSQL)/usr/share/dbconfig-common/data/$(PACKAGE_MYSQL)/install/mysql
-
-binary-install/tt-rss-pgsql::
- $(call install_rule,$(PACKAGE_PGSQL))
- # database
- #mv debian/$(PACKAGE_PGSQL)/usr/share/dbconfig-common/data/$(PACKAGE_PGSQL)/install/ttrss_schema_pgsql.sql debian/$(PACKAGE_PGSQL)/usr/share/dbconfig-common/data/$(PACKAGE_PGSQL)/install/pgsql
- mkdir -p debian/$(PACKAGE_PGSQL)/usr/share/dbconfig-common/data/$(PACKAGE_PGSQL)/install
- cp debian/$(PACKAGE_PGSQL)/usr/share/$(PACKAGE_PGSQL)/schema/ttrss_schema_pgsql.sql debian/$(PACKAGE_PGSQL)/usr/share/dbconfig-common/data/$(PACKAGE_PGSQL)/install/pgsql
-
+binary-install/tt-rss::
+ # install configuration file
+ mkdir -p debian/tt-rss/etc/tt-rss
+ cp config.php-dist debian/tt-rss/etc/tt-rss/config.php
+ # install dbconfig-common files
+ mkdir -p debian/tt-rss/usr/share/dbconfig-common/data/tt-rss/install/
+ cp schema/ttrss_schema_mysql.sql debian/tt-rss/usr/share/dbconfig-common/data/tt-rss/install/mysql
+ cp schema/ttrss_schema_pgsql.sql debian/tt-rss/usr/share/dbconfig-common/data/tt-rss/install/pgsql
+ # remove additional license files
+ rm debian/tt-rss/usr/share/tt-rss/www/lib/iui/LICENSE.txt
+ rm debian/tt-rss/usr/share/tt-rss/www/extras/button/license.txt
+ # file permissions
+ find debian/tt-rss/usr/share/tt-rss -type f -exec chmod 644 '{}' ';'
+ chmod 755 debian/tt-rss/usr/share/tt-rss/www/update_*.php
+ chmod 644 debian/tt-rss/etc/tt-rss/*
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/templates b/debian/templates
new file mode 100644
index 0000000..57d2a55
--- /dev/null
+++ b/debian/templates
@@ -0,0 +1,6 @@
+Template: tt-rss/reconfigure-webserver
+Type: multiselect
+Choices: apache2, lighttpd
+Description: Web server to reconfigure automatically:
+ Please choose the web server that should be automatically configured
+ to run Tiny Tiny RSS.
diff --git a/debian/tt-rss-mysql.config b/debian/tt-rss-mysql.config
deleted file mode 100644
index 4ebe8a9..0000000
--- a/debian/tt-rss-mysql.config
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-set -e
-
-. /usr/share/debconf/confmodule
-
-PACKAGE=tt-rss-mysql
-
-# restart webserver
-db_input medium $PACKAGE/webserver || true
-db_go || true
-
-# dbconfig-common
-if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then
- . /usr/share/dbconfig-common/dpkg/config.mysql
- dbc_first_version="1.2.17"
- dbc_go $PACKAGE $@
-fi
-
diff --git a/debian/tt-rss-mysql.install b/debian/tt-rss-mysql.install
deleted file mode 100644
index aa37b71..0000000
--- a/debian/tt-rss-mysql.install
+++ /dev/null
@@ -1,21 +0,0 @@
-*.php usr/share/tt-rss-mysql/www/
-*.css usr/share/tt-rss-mysql/www/
-*.js usr/share/tt-rss-mysql/www/
-*.xsl usr/share/tt-rss-mysql/www/
-
-help usr/share/tt-rss-mysql/www/
-images usr/share/tt-rss-mysql/www/
-locale usr/share/tt-rss-mysql/www/
-mobile usr/share/tt-rss-mysql/www/
-modules usr/share/tt-rss-mysql/www/
-themes usr/share/tt-rss-mysql/www/
-utils usr/share/tt-rss-mysql/www/
-xmlrpc usr/share/tt-rss-mysql/www/
-
-debian/apache.conf etc/tt-rss-mysql/
-
-config.php-dist usr/share/doc/tt-rss-mysql/
-
-#schema/ttrss_schema_mysql.sql usr/share/dbconfig-common/data/tt-rss-mysql/install/
-
-schema usr/share/tt-rss-mysql/
diff --git a/debian/tt-rss-mysql.links b/debian/tt-rss-mysql.links
deleted file mode 100644
index d119ca4..0000000
--- a/debian/tt-rss-mysql.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/javascript/scriptaculous /usr/share/tt-rss-mysql/www/scriptaculous
-/usr/share/javascript/prototype/prototype.js /usr/share/tt-rss-mysql/www/prototype.js
diff --git a/debian/tt-rss-mysql.postinst b/debian/tt-rss-mysql.postinst
deleted file mode 100644
index 9d7858f..0000000
--- a/debian/tt-rss-mysql.postinst
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-set -e
-
-PACKAGE=tt-rss-mysql
-
-case "$1" in
- configure)
-
- # source debconf stuff
- if [ -f /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
- fi
-
- # debconf messages
- db_get $PACKAGE/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/$PACKAGE.conf ]; then
- ln -s /etc/$PACKAGE/apache.conf \
- /etc/apache2/conf.d/$PACKAGE.conf
- restart="apache2"
-
- sed -e "s#tt-rss/www#$PACKAGE/www#" -i /etc/$PACKAGE/apache.conf
- fi
-
- servers="apache2"
- . /usr/share/wwwconfig-common/restart.sh
- fi
-
- # dbconfig-common
- . /usr/share/dbconfig-common/dpkg/postinst.mysql
- dbc_first_version="1.2.17"
- dbc_generate_include="php:/etc/$PACKAGE/database.php"
- dbc_generate_include_owner="root:www-data"
- dbc_generate_include_perms="0640"
- dbc_go $PACKAGE $@
-
- # create icons folder
- #mkdir -p /usr/share/$PACKAGE/www/icons
-
-
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/tt-rss-mysql.postrm b/debian/tt-rss-mysql.postrm
deleted file mode 100644
index 2c203b6..0000000
--- a/debian/tt-rss-mysql.postrm
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-set -e
-
-PACKAGE=tt-rss-mysql
-
-# source debconf stuff
-if [ -f /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
-fi
-
-# Un-configure and restart webservers
-db_get $PACKAGE/webserver || true
-WEBSERVER="$RET";
-if $WEBSERVER; then
- if [ -L /etc/apache2/conf.d/$PACKAGE.conf ]; then
- rm -f /etc/apache2/conf.d/$PACKAGE.conf
- restart="apache2"
- fi
-fi
-
-servers="apache2"
-. /usr/share/wwwconfig-common/restart.sh
-
-# dbconfig-common
-if [ -f /usr/share/dbconfig-common/dpkg/postrm.mysql ]; then
- . /usr/share/dbconfig-common/dpkg/postrm.mysql
- dbc_go $PACKAGE $@
-fi
-
-# remove icons folder
-#rm -r /usr/share/$PACKAGE/www/icons
-
-if [ "$1" = "purge" ]; then
- # remove database config
- rm -f /etc/$PACKAGE/database.php
- if which ucf >/dev/null 2>&1; then
- ucf --purge /etc/$PACKAGE/database.php
- fi
-fi
-
-#DEBHELPER#
diff --git a/debian/tt-rss-mysql.prerm b/debian/tt-rss-mysql.prerm
deleted file mode 100644
index cd414fc..0000000
--- a/debian/tt-rss-mysql.prerm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -e
-
-PACKAGE=tt-rss-mysql
-
-# source debconf stuff
-. /usr/share/debconf/confmodule
-
-. /usr/share/dbconfig-common/dpkg/prerm
-dbc_go $PACKAGE $@
-
-#DEBHELPER#
diff --git a/debian/tt-rss-mysql.templates b/debian/tt-rss-mysql.templates
deleted file mode 100644
index b580704..0000000
--- a/debian/tt-rss-mysql.templates
+++ /dev/null
@@ -1,3 +0,0 @@
-Template: tt-rss-mysql/webserver
-Type: boolean
-_Description: Do you want to configure apache2?
diff --git a/debian/tt-rss-pgsql.config b/debian/tt-rss-pgsql.config
deleted file mode 100644
index f3d328d..0000000
--- a/debian/tt-rss-pgsql.config
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-set -e
-
-PACKAGE=tt-rss-pgsql
-
-# source debconf
-if [ -f /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
-fi
-
-# restart webserver
-db_input medium $PACKAGE/webserver || true
-db_go || true
-
-# dbconfig-common
-if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
- . /usr/share/dbconfig-common/dpkg/config.pgsql
- dbc_first_version="1.2.17"
- dbc_go $PACKAGE $@
-fi
diff --git a/debian/tt-rss-pgsql.install b/debian/tt-rss-pgsql.install
deleted file mode 100644
index 2dddaae..0000000
--- a/debian/tt-rss-pgsql.install
+++ /dev/null
@@ -1,21 +0,0 @@
-*.php usr/share/tt-rss-pgsql/www/
-*.css usr/share/tt-rss-pgsql/www/
-*.js usr/share/tt-rss-pgsql/www/
-*.xsl usr/share/tt-rss-mysql/www/
-
-help usr/share/tt-rss-pgsql/www/
-images usr/share/tt-rss-pgsql/www/
-locale usr/share/tt-rss-pgsql/www/
-mobile usr/share/tt-rss-pgsql/www/
-modules usr/share/tt-rss-pgsql/www/
-themes usr/share/tt-rss-pgsql/www/
-utils usr/share/tt-rss-pgsql/www/
-xmlrpc usr/share/tt-rss-pgsql/www/
-
-debian/apache.conf etc/tt-rss-pgsql/
-
-config.php-dist usr/share/doc/tt-rss-pgsql/
-
-#schema/ttrss_schema_pgsql.sql usr/share/dbconfig-common/data/tt-rss-pgsql/install/
-
-schema usr/share/tt-rss-pgsql/
diff --git a/debian/tt-rss-pgsql.links b/debian/tt-rss-pgsql.links
deleted file mode 100644
index bd0e935..0000000
--- a/debian/tt-rss-pgsql.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/javascript/scriptaculous /usr/share/tt-rss-pgsql/www/scriptaculous
-/usr/share/javascript/prototype/prototype.js /usr/share/tt-rss-pgsql/www/prototype.js
diff --git a/debian/tt-rss-pgsql.postinst b/debian/tt-rss-pgsql.postinst
deleted file mode 100644
index e694c64..0000000
--- a/debian/tt-rss-pgsql.postinst
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-set -e
-
-PACKAGE=tt-rss-pgsql
-
-case "$1" in
- configure)
-
- # source debconf
- if [ -f /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
- fi
-
- # debconf messages
- db_get $PACKAGE/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/$PACKAGE.conf ]; then
- ln -s /etc/$PACKAGE/apache.conf \
- /etc/apache2/conf.d/$PACKAGE.conf
- restart="apache2"
-
- sed -e "s#tt-rss/www#$PACKAGE/www#" -i /etc/$PACKAGE/apache.conf
- fi
-
- servers="apache2"
- . /usr/share/wwwconfig-common/restart.sh
- fi
-
- # dbconfig-common
- . /usr/share/dbconfig-common/dpkg/postinst.pgsql
- dbc_pgsql_createdb_encoding="UTF8"
- dbc_first_version="1.2.17"
- dbc_generate_include="php:/etc/$PACKAGE/database.php"
- dbc_generate_include_owner="root:www-data"
- dbc_generate_include_perms="0640"
- dbc_go $PACKAGE $@
-
- # create icons folder
- #mkdir -p /usr/share/$PACKAGE/www/icons
-
-
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/tt-rss-pgsql.postrm b/debian/tt-rss-pgsql.postrm
deleted file mode 100644
index acc0287..0000000
--- a/debian/tt-rss-pgsql.postrm
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-set -e
-
-PACKAGE=tt-rss-pgsql
-
-# source debconf
-if [ -f /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
-fi
-
-# Un-configure and restart webservers
-db_get $PACKAGE/webserver || true
-WEBSERVER="$RET";
-if $WEBSERVER; then
- if [ -L /etc/apache2/conf.d/$PACKAGE.conf ]; then
- rm -f /etc/apache2/conf.d/$PACKAGE.conf
- restart="apache2"
- fi
-fi
-
-servers="apache2"
-. /usr/share/wwwconfig-common/restart.sh
-
-# dbconfig-common
-if [ -f /usr/share/dbconfig-common/dpkg/postrm.pgsql ]; then
- . /usr/share/dbconfig-common/dpkg/postrm.pgsql
-fi
-dbc_go $PACKAGE $@
-
-# remove icons folder
-#rm -r /usr/share/$PACKAGE/www/icons
-
-if [ "$1" = "purge" ]; then
- # remove database config
- rm -f /etc/$PACKAGE/database.php
- if which ucf >/dev/null 2>&1; then
- ucf --purge /etc/$PACKAGE/database.php
- fi
-fi
-
-#DEBHELPER#
diff --git a/debian/tt-rss-pgsql.prerm b/debian/tt-rss-pgsql.prerm
deleted file mode 100644
index c404970..0000000
--- a/debian/tt-rss-pgsql.prerm
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-
-PACKAGE=tt-rss-pgsql
-
-. /usr/share/debconf/confmodule
-. /usr/share/dbconfig-common/dpkg/prerm.pgsql
-dbc_go $PACKAGE $@
-
-#DEBHELPER#
diff --git a/debian/tt-rss-pgsql.templates b/debian/tt-rss-pgsql.templates
deleted file mode 100644
index 64033be..0000000
--- a/debian/tt-rss-pgsql.templates
+++ /dev/null
@@ -1,3 +0,0 @@
-Template: tt-rss-pgsql/webserver
-Type: boolean
-_Description: Do you want to configure apache2?
diff --git a/debian/tt-rss.debhelper.log b/debian/tt-rss.debhelper.log
deleted file mode 100644
index e4d8aac..0000000
--- a/debian/tt-rss.debhelper.log
+++ /dev/null
@@ -1,35 +0,0 @@
-dh_listpackages
-dh_listpackages
-dh_listpackages
-dh_listpackages
-dh_installdirs
-dh_installdirs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_installinfo
-dh_installmenu
-dh_installcron
-dh_installinit
-dh_installdebconf
-dh_installemacsen
-dh_installcatalogs
-dh_installpam
-dh_installlogrotate
-dh_installlogcheck
-dh_installchangelogs
-dh_installudev
-dh_lintian
-dh_install
-dh_link
-dh_installmime
-dh_strip
-dh_compress
-dh_fixperms
-dh_makeshlibs
-dh_installdeb
-dh_perl
-dh_shlibdeps
-dh_gencontrol
-dh_md5sums
-dh_builddeb
diff --git a/debian/tt-rss.default b/debian/tt-rss.default
new file mode 100644
index 0000000..b3d4f63
--- /dev/null
+++ b/debian/tt-rss.default
@@ -0,0 +1,9 @@
+## Defaults for Tiny Tiny RSS update daemon init.d script
+
+# Set DISABLED to 1 to prevent the daemon from starting.
+DISABLED=1
+
+# Set FORKING to 1 to use the forking daemon (update_daemon2.php) in stead of
+# the standard one.
+# This option is only available for Tiny Tiny RSS 1.2.20 and over.
+FORKING=0
diff --git a/debian/tt-rss.init b/debian/tt-rss.init
new file mode 100644
index 0000000..37f7845
--- /dev/null
+++ b/debian/tt-rss.init
@@ -0,0 +1,138 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: tt-rss
+# Required-Start: $local_fs $remote_fs
+# Should-Start: mysql postgresql
+# Required-Stop: $local_fs $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Tiny Tiny RSS update daemon
+# Description: Update the Tiny Tiny RSS subscribed syndication feeds.
+### END INIT INFO
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Tiny Tiny RSS update daemon"
+NAME=tt-rss
+DISABLED=0
+FORKING=0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+DAEMON_SCRIPT="update_daemon.php"
+
+if [ "$FORKING" != "0" ]; then
+ DAEMON_SCRIPT="update_daemon2.php"
+fi
+
+DAEMON=/usr/bin/php
+DAEMON_ARGS="/usr/share/tt-rss/www/$DAEMON_SCRIPT"
+DAEMON_DIR="/usr/share/tt-rss/www"
+PIDFILE=/var/run/tt-rss.pid
+SCRIPTNAME=/etc/init.d/tt-rss
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+if [ "$DISABLED" != "0" -a "$1" != "stop" ]; then
+ log_warning_msg "Not starting $DESC - edit /etc/default/tt-rss and change DISABLED to be 0.";
+ exit 0;
+fi
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+ # Return
+ # 0 if daemon has been started
+ # 1 if daemon was already running
+ # 2 if daemon could not be started
+ start-stop-daemon --start --make-pidfile --background --quiet -c "www-data:www-data" --chdir "$DAEMON_DIR" --pidfile "$PIDFILE" --exec "$DAEMON" --test > /dev/null \
+ || return 1
+
+ start-stop-daemon --start --make-pidfile --background --quiet -c "www-data:www-data" --chdir "$DAEMON_DIR" --pidfile "$PIDFILE" --exec "$DAEMON" -- $DAEMON_ARGS \
+ || return 2
+ # Add code here, if necessary, that waits for the process to be ready
+ # to handle requests from services started subsequently which depend
+ # on this one. As a last resort, sleep for some time.
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+ # Return
+ # 0 if daemon has been stopped
+ # 1 if daemon was already stopped
+ # 2 if daemon could not be stopped
+ # other if a failure occurred
+ start-stop-daemon --stop --make-pidfile --quiet --retry=TERM/1/KILL/5 --pidfile $PIDFILE --name $NAME
+ RETVAL="$?"
+ [ "$RETVAL" = 2 ] && return 2
+ # Wait for children to finish too if this is a daemon that forks
+ # and if the daemon is only ever run from this initscript.
+ # If the above conditions are not satisfied then add some other code
+ # that waits for the process to drop all resources that could be
+ # needed by services started subsequently. A last resort is to
+ # sleep for some time.
+ start-stop-daemon --stop --quiet --oknodo --retry=0/1/KILL/5 --exec $DAEMON
+ [ "$?" = 2 ] && return 2
+ # Many daemons don't delete their pidfiles when they exit.
+ rm -f $PIDFILE
+ return "$RETVAL"
+}
+
+case "$1" in
+ start)
+ log_daemon_msg "Starting $DESC" "$NAME"
+ do_start
+ case "$?" in
+ 0|1) log_end_msg 0 ;;
+ 2) log_end_msg 1 ;;
+ esac
+ ;;
+ stop)
+ log_daemon_msg "Stopping $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1) log_end_msg 0 ;;
+ 2) log_end_msg 1 ;;
+ esac
+ ;;
+ restart|force-reload)
+ #
+ # If the "reload" option is implemented then remove the
+ # 'force-reload' alias
+ #
+ log_daemon_msg "Restarting $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1)
+ do_start
+ case "$?" in
+ 0) log_end_msg 0 ;;
+ 1) log_end_msg 1 ;; # Old process is still running
+ *) log_end_msg 1 ;; # Failed to start
+ esac
+ ;;
+ *)
+ # Failed to stop
+ log_end_msg 1
+ ;;
+ esac
+ ;;
+ *)
+ echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+ exit 3
+ ;;
+esac
diff --git a/debian/watch b/debian/watch
index abee071..a91c1f0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://tt-rss.spb.ru/download/tt-rss-(.*)\.tar.gz debian uupdate
+ http://tt-rss.org/download/tt-rss-(.*)\.tar.gz
--
1.7.1
From 2ceb1db0ec9226c760b9a751e34177054d681255 Mon Sep 17 00:00:00 2001
From: Sebastian Reichel <sre@ring0.de>
Date: Thu, 27 May 2010 03:35:08 +0200
Subject: [PATCH] fix icon support
---
debian/dirs | 1 +
debian/links | 1 +
debian/postinst | 2 +-
3 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/debian/dirs b/debian/dirs
index 7f71a63..1975459 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1 +1,2 @@
var/lib/tt-rss
+var/lib/tt-rss/icons
diff --git a/debian/links b/debian/links
index 7b60c0b..b33e050 100644
--- a/debian/links
+++ b/debian/links
@@ -5,4 +5,5 @@
/usr/share/php/magpierss /usr/share/tt-rss/www/lib/magpierss
/usr/share/php/libphp-phpmailer /usr/share/tt-rss/www/lib/phpmailer
/usr/share/php-htmlpurifier /usr/share/tt-rss/www/lib/htmlpurifier
+/var/lib/tt-rss/icons /usr/share/tt-rss/www/icons
/etc/tt-rss/config.php /usr/share/tt-rss/www/config.php
diff --git a/debian/postinst b/debian/postinst
index c7370d1..3d97c71 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -28,7 +28,7 @@ apache2_install() {
if [ "$1" = "configure" ]; then
# tt-rss will write lock files into this directory
- chown www-data:www-data /var/lib/tt-rss
+ chown -R www-data:www-data /var/lib/tt-rss
# source debconf stuff
if [ -f /usr/share/debconf/confmodule ]; then
--
1.7.1
Attachment:
signature.asc
Description: Digital signature