[Pkg-sympa-commits] [sympa] 05/14: Remove various patches merged upstream
Emmanuel Bouthenot
kolter at moszumanska.debian.org
Thu Jul 27 10:43:19 UTC 2017
This is an automated email from the git hooks/post-receive script.
kolter pushed a commit to branch master
in repository sympa.
commit c769da8d438270e190235294d9e2754e0e2ee513
Author: Emmanuel Bouthenot <kolter at openics.org>
Date: Tue Jul 25 15:10:28 2017 +0200
Remove various patches merged upstream
---
debian/patches/1001_fix_unexisiting_template | 16 --
debian/patches/1002_fix_various_typos | 335 ----------------------
debian/patches/1003_fix_various_log_severity | 60 ----
debian/patches/1004_make_build_reproducible.patch | 17 --
debian/patches/series | 4 -
5 files changed, 432 deletions(-)
diff --git a/debian/patches/1001_fix_unexisiting_template b/debian/patches/1001_fix_unexisiting_template
deleted file mode 100644
index 2420662..0000000
--- a/debian/patches/1001_fix_unexisiting_template
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Remove reference to a template which no longer exists
-Author: Emmanuel Bouthenot <kolter at debian.org>
-Forwarded: no
-Last-Update: 2016-07-27
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/po/sympa/POTFILES.in
-+++ b/po/sympa/POTFILES.in
-@@ -191,7 +191,6 @@
- default/web_tt2/copy_template.tt2
- default/web_tt2/create_list_request.tt2
- default/web_tt2/create_list.tt2
--default/web_tt2/css_ie.tt2
- default/web_tt2/css.tt2
- default/web_tt2/d_control.tt2
- default/web_tt2/d_editfile.tt2
diff --git a/debian/patches/1002_fix_various_typos b/debian/patches/1002_fix_various_typos
deleted file mode 100644
index bdfc10b..0000000
--- a/debian/patches/1002_fix_various_typos
+++ /dev/null
@@ -1,335 +0,0 @@
-Description: Fix various typos in documentation and manpages
-Author: Emmanuel Bouthenot <kolter at debian.org>
-Forwarded: no
-Last-Update: 2016-07-27
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/doc/sympa_toc.pod
-+++ b/doc/sympa_toc.pod
-@@ -17,7 +17,7 @@
- Sympa is a modern mailing-list manager. It supports a lot of useful
- features.
-
--Below is the list of documentaion of Sympa.
-+Below is the list of documentation of Sympa.
-
- =head2 Reference manual
-
---- a/src/bin/upgrade_sympa_password.pl.in
-+++ b/src/bin/upgrade_sympa_password.pl.in
-@@ -113,7 +113,7 @@
- =head1 DESCRIPTION
-
- Version later than 5.4 uses MD5 hash instead of
--symetric encryption to store password.
-+symmetric encryption to store password.
-
- This require to rewrite paassword in database. This upgrade IS NOT
- REVERSIBLE.
---- a/src/lib/Sympa/Bulk.pm
-+++ b/src/lib/Sympa/Bulk.pm
-@@ -430,7 +430,7 @@
- =item next ( )
-
- I<Instance method>.
--Gets next packet to process, order is controled by message priority, then by
-+Gets next packet to process, order is controlled by message priority, then by
- packet priority, then by delivery date, then by reception date.
- Packets with future delivery date are ignored.
- Packet will be locked to prevent multiple proccessing of a single packet.
---- a/src/lib/Sympa/Spool.pm
-+++ b/src/lib/Sympa/Spool.pm
-@@ -571,7 +571,7 @@
- =item next ( [ no_lock =E<gt> 1 ] )
-
- I<Instance method>.
--Gets next message to process, order is controled by name of spool file and
-+Gets next message to process, order is controlled by name of spool file and
- so on.
- Message will be locked to prevent multiple proccessing of a single message.
-
---- a/src/lib/Sympa/Spool/Archive.pm
-+++ b/src/lib/Sympa/Spool/Archive.pm
-@@ -75,7 +75,7 @@
-
- =item next ( )
-
--Order is controled by delivery date, then by reception date.
-+Order is controlled by delivery date, then by reception date.
-
- =back
-
---- a/src/lib/Sympa/Spool/Auth.pm
-+++ b/src/lib/Sympa/Spool/Auth.pm
-@@ -135,7 +135,7 @@
- If the pairs describing metadatas are specified,
- contents returned by next() are filtered by them.
-
--Order of items returned by next() is controled by time of submission.
-+Order of items returned by next() is controlled by time of submission.
-
- =item quarantine ( )
-
---- a/src/lib/Sympa/Spool/Automatic.pm
-+++ b/src/lib/Sympa/Spool/Automatic.pm
-@@ -68,7 +68,7 @@
- =item next ( )
-
- I<Instance method>.
--Order is controled by modification time of files and delivery date, then
-+Order is controlled by modification time of files and delivery date, then
- messages with possiblly higher priority are chosen.
- Messages with lowest priority (C<z> or C<Z>) are skipped.
-
---- a/src/lib/Sympa/Spool/Bounce.pm
-+++ b/src/lib/Sympa/Spool/Bounce.pm
-@@ -69,7 +69,7 @@
-
- =item next ( )
-
--Order is controled by modification time of files and delivery date.
-+Order is controlled by modification time of files and delivery date.
-
- =item store ( $message, [ original =E<gt> $original ] )
-
---- a/src/lib/Sympa/Spool/Digest.pm
-+++ b/src/lib/Sympa/Spool/Digest.pm
-@@ -143,7 +143,7 @@
-
- =item next ( )
-
--Order is controled by delivery date, then by reception date.
-+Order is controlled by delivery date, then by reception date.
-
- =back
-
---- a/src/lib/Sympa/Spool/Digest/Collection.pm
-+++ b/src/lib/Sympa/Spool/Digest/Collection.pm
-@@ -90,7 +90,7 @@
- =item next ( )
-
- Returns next instance of L<Sympa::Spool::Digest>.
--Order is controled by modification times of spool directories.
-+Order is controlled by modification times of spool directories.
- Spool directory is locked to prevent processing by multiple processes.
-
- =item quarantine ( )
---- a/src/lib/Sympa/Spool/Incoming.pm
-+++ b/src/lib/Sympa/Spool/Incoming.pm
-@@ -110,7 +110,7 @@
-
- =item next ( )
-
--Order is controled by modification time of file and delivery date, then
-+Order is controlled by modification time of file and delivery date, then
- messages with possiblly higher priority are chosen.
- Messages with lowest priority (C<z> or C<Z>) are skipped.
-
---- a/src/lib/Sympa/DatabaseDescription.pm
-+++ b/src/lib/Sympa/DatabaseDescription.pm
-@@ -146,7 +146,7 @@
- 'include_sources_subscriber' => {
- 'struct' => 'varchar(50)',
- 'doc' =>
-- 'comma seperated list of datasource that contain this subscriber',
-+ 'comma separated list of datasource that contain this subscriber',
- 'order' => 19,
- },
- 'custom_attribute_subscriber' => {
-@@ -209,7 +209,7 @@
- },
- 'lang_user' => {
- 'struct' => 'varchar(10)',
-- 'doc' => 'user langage preference',
-+ 'doc' => 'user language preference',
- 'order' => 9,
- },
- 'attributes_user' => {
-@@ -417,7 +417,7 @@
- },
- },
- 'doc' =>
-- 'Exclusion table is used in order to manage unsubscription for subsceriber inclued from an external data source.',
-+ 'Exclusion table is used in order to manage unsubscription for subsceriber included from an external data source.',
- 'order' => 5,
- },
- 'inclusion_table' => {
-@@ -450,7 +450,7 @@
- },
- },
- 'doc' =>
-- 'Inclusion table is used in order to manage lists inclued from / including subscribers of other lists.',
-+ 'Inclusion table is used in order to manage lists included from / including subscribers of other lists.',
- 'order' => 4,
- },
- 'session_table' => {
-@@ -1209,7 +1209,7 @@
-
- =item varchar(I<length>)
-
--Text with length upto I<length>. I<length> must be lower than 2^16 - 2.
-+Text with length up to I<length>. I<length> must be lower than 2^16 - 2.
-
- =item int(1)
-
-@@ -1221,7 +1221,7 @@
-
- =item int(I<cols>)
-
--Integer with columns upto I<cols>, with its value from -2^31 to 2^31 - 1.
-+Integer with columns up to I<cols>, with its value from -2^31 to 2^31 - 1.
-
- =item tinyint
-
-@@ -1241,15 +1241,15 @@
-
- =item enum
-
--Keyword with length upto 20 o.
-+Keyword with length up to 20 o.
-
- =item text
-
--Text with length upto 500 o.
-+Text with length up to 500 o.
-
- =item longtext
-
--Text with length upto 2^32 - 4 o.
-+Text with length up to 2^32 - 4 o.
-
- =item datetime
-
-@@ -1257,7 +1257,7 @@
-
- =item mediumblob
-
--Binary data with length upto 2^24 - 3 o.
-+Binary data with length up to 2^24 - 3 o.
-
- =back
-
---- a/src/lib/Sympa/Message.pm
-+++ b/src/lib/Sympa/Message.pm
-@@ -3360,7 +3360,7 @@
- =item delete_header ( $field, [ $index ] )
-
- I<Instance method>.
--Deletes all occurences of the header field named $field.
-+Deletes all occurrences of the header field named $field.
-
- =item replace_header ( $field, $value, [ $index ] )
-
-@@ -3373,7 +3373,7 @@
- Gets header of the message as L<MIME::Head> instance.
-
- Note that returned value is real reference to internal data structure.
--Even if it was changed, string representaion of message may not be updated.
-+Even if it was changed, string representation of message may not be updated.
- Alternatively, use L</add_header>(), L</delete_header>() or
- L</replace_header>() to modify header.
-
-@@ -3407,7 +3407,7 @@
- Gets message content as MIME entity (L<MIME::Entity> instance).
-
- Note that returned value is real reference to internal data structure.
--Even if it was changed, string representaion of message may not be updated.
-+Even if it was changed, string representation of message may not be updated.
- Below is better way to modify message.
-
- my $entity = $message->as_entity->dup;
---- a/src/lib/Sympa/Message/Plugin.pm
-+++ b/src/lib/Sympa/Message/Plugin.pm
-@@ -136,7 +136,7 @@
- I<Message hook>.
- Message had been archived, however, it has not been distributed to users
- including digest spool; message has not been signed nor encrypted (if
--nessessary).
-+necessary).
-
- =back
-
---- a/src/lib/Sympa/Spindle/ProcessAuth.pm
-+++ b/src/lib/Sympa/Spindle/ProcessAuth.pm
-@@ -142,7 +142,7 @@
-
- =item quiet =E<gt> 1
-
--If this option is set, automatic replys reporting result of processing
-+If this option is set, automatic replies reporting result of processing
- to the user (see L</"confirmed_by">) will not be sent.
-
- =item scenario_context =E<gt> {context...}
---- a/src/lib/Sympa/Spindle/ProcessHeld.pm
-+++ b/src/lib/Sympa/Spindle/ProcessHeld.pm
-@@ -165,7 +165,7 @@
-
- =item quiet =E<gt> 1
-
--If this option is set, automatic replys reporting result of processing
-+If this option is set, automatic replies reporting result of processing
- to the user (see L</"confirmed_by">) will not be sent.
-
- =back
---- a/src/lib/Sympa/Spindle/ProcessModeration.pm
-+++ b/src/lib/Sympa/Spindle/ProcessModeration.pm
-@@ -254,7 +254,7 @@
-
- =item quiet =E<gt> 1
-
--If this option is set, automatic replys reporting result of processing
-+If this option is set, automatic replies reporting result of processing
- to the user (see L</"distributed_by"> and L</"rejected_by">) will not be sent.
-
- =back
---- a/src/lib/Sympa/Spindle/ResendArchive.pm
-+++ b/src/lib/Sympa/Spindle/ResendArchive.pm
-@@ -165,7 +165,7 @@
-
- NOT YET IMPLEMENTED.
-
--If this option is set, automatic replys reporting result of processing
-+If this option is set, automatic replies reporting result of processing
- to the user (see L</"resent_by">) will not be sent.
-
- =back
---- a/src/lib/Sympa/ConfDef.pm
-+++ b/src/lib/Sympa/ConfDef.pm
-@@ -1045,7 +1045,7 @@
- },
- { 'name' => 'db_additional_subscriber_fields',
- 'sample' => 'billing_delay,subscription_expiration',
-- 'gettext_id' => 'Database private extention to subscriber table',
-+ 'gettext_id' => 'Database private extension to subscriber table',
- 'file' => 'sympa.conf',
- 'gettext_comment' =>
- 'You need to extend the database format with these fields',
-@@ -1053,7 +1053,7 @@
- },
- { 'name' => 'db_additional_user_fields',
- 'sample' => 'age,address',
-- 'gettext_id' => 'Database private extention to user table',
-+ 'gettext_id' => 'Database private extension to user table',
- 'file' => 'sympa.conf',
- 'gettext_comment' =>
- 'You need to extend the database format with these fields',
-@@ -1626,7 +1626,7 @@
-
- =item gettext_comment =E<gt> STRING
-
--Additionnal advice concerning the parameter.
-+Additional advice concerning the parameter.
-
- =item sample =E<gt> STRING
-
---- a/src/cgi/sympa_soap_server.fcgi.in
-+++ b/src/cgi/sympa_soap_server.fcgi.in
-@@ -97,7 +97,7 @@
-
- =head1 DESCRIPTION
-
--Sympa SOAP server allows to access Sympa service though SOAP.
-+Sympa SOAP server allows one to access Sympa service though SOAP.
-
- To know details on Sympa SOAP server, see Reference Manual:
- L<https://www.sympa.org/manual/soap>.
diff --git a/debian/patches/1003_fix_various_log_severity b/debian/patches/1003_fix_various_log_severity
deleted file mode 100644
index 6e1fd42..0000000
--- a/debian/patches/1003_fix_various_log_severity
+++ /dev/null
@@ -1,60 +0,0 @@
-Description: Fix log severity in some command line tools used in postinst
-Author: Emmanuel Bouthenot <kolter at debian.org>
-Forwarded: no
-Last-Update: 2016-09-17
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/sbin/sympa.pl.in
-+++ b/src/sbin/sympa.pl.in
-@@ -232,9 +232,8 @@
-
- ## Check that the data structure is uptodate
- unless (Conf::data_structure_uptodate()) {
-- printf STDERR
-+ printf STDOUT
- "Data structure was not updated; you should run sympa.pl --upgrade to run the upgrade process.\n";
-- exit 1;
- }
-
- exit 0;
-@@ -787,7 +786,7 @@
- $main::options{'to'} ||= Sympa::Constants::VERSION;
-
- if ($main::options{'from'} eq $main::options{'to'}) {
-- $log->syslog('err', 'Current version: %s; no upgrade is required',
-+ $log->syslog('notice', 'Current version: %s; no upgrade is required',
- $main::options{'to'});
- exit 0;
- } else {
---- a/src/bin/upgrade_bulk_spool.pl.in
-+++ b/src/bin/upgrade_bulk_spool.pl.in
-@@ -84,6 +84,29 @@
- my $sdm = Sympa::DatabaseManager->instance
- or die 'Can\'t connect to database';
-
-+ # Checking if bulkmailer_table exits
-+ my @tables;
-+ my $list_of_tables;
-+ if ($list_of_tables = $sdm->get_tables()) {
-+ @tables = @{$list_of_tables};
-+ } else {
-+ @tables = ();
-+ }
-+ my $found = 0;
-+ foreach my $t (@tables) {
-+ if ($t eq "bulkmailer_table") {
-+ $found = 1;
-+ last;
-+ }
-+ }
-+ if ($found == 0) {
-+ $log->syslog(
-+ 'notice',
-+ 'bulkmailer table not found in database, bulk spool of your Sympa is probably up-to-date'
-+ );
-+ exit 0;
-+ }
-+
- my $sth = $sdm->do_prepared_query(
- q{SELECT *
- FROM bulkmailer_table
diff --git a/debian/patches/1004_make_build_reproducible.patch b/debian/patches/1004_make_build_reproducible.patch
deleted file mode 100644
index 00448e6..0000000
--- a/debian/patches/1004_make_build_reproducible.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Make the build reproducible
-Author: Chris Lamb <lamby at debian.org>
-Bug-Debian: https://bugs.debian.org/839587
-Last-Update: 2016-10-05
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/lib/Sympa/DatabaseDescription.pm
-+++ b/src/lib/Sympa/DatabaseDescription.pm
-@@ -152,7 +152,7 @@
- 'custom_attribute_subscriber' => {
- 'struct' => 'text',
- 'doc' => 'FIXME',
-- 'order' => 10,
-+ 'order' => 20,
- },
-
- },
diff --git a/debian/patches/series b/debian/patches/series
index 89f9d62..fc4a34e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,2 @@
-1001_fix_unexisiting_template
-1002_fix_various_typos
-1003_fix_various_log_severity
-1004_make_build_reproducible.patch
2001_ca_bundle_check_as_warning.patch
2002_support_jquery3_using_migrate.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/sympa.git
More information about the Pkg-sympa-commits
mailing list