Author: tille Date: 2013-10-24 11:15:15 +0000 (Thu, 24 Oct 2013) New Revision: 14939
Removed: trunk/packages/mencal/trunk/debian/README.Debian Modified: trunk/packages/mencal/trunk/debian/changelog trunk/packages/mencal/trunk/debian/control trunk/packages/mencal/trunk/debian/copyright trunk/packages/mencal/trunk/debian/patches/10_daylightsaving.patch trunk/packages/mencal/trunk/debian/patches/10_mencal.patch Log: DEP5 copyright; new upstream version (adapted patches; delete README.Debian which claims upstream would be dead) Deleted: trunk/packages/mencal/trunk/debian/README.Debian =================================================================== --- trunk/packages/mencal/trunk/debian/README.Debian 2013-10-24 10:57:05 UTC (rev 14938) +++ trunk/packages/mencal/trunk/debian/README.Debian 2013-10-24 11:15:15 UTC (rev 14939) @@ -1,10 +0,0 @@ -mencal for Debian ------------------ - -It turned out that the author has not issued a new version since -2003. There is an extensive patch applied in the Debian package -which was done by former maintainers. If you think this program -is useful and you would like to add some enhancements you should -probably think about becoming upstream maintainer yourself. - - -- Andreas Tille <[email protected]> Mon, 21 Jul 2008 22:27:50 +0200 Modified: trunk/packages/mencal/trunk/debian/changelog =================================================================== --- trunk/packages/mencal/trunk/debian/changelog 2013-10-24 10:57:05 UTC (rev 14938) +++ trunk/packages/mencal/trunk/debian/changelog 2013-10-24 11:15:15 UTC (rev 14939) @@ -1,10 +1,13 @@ -mencal (2.3-10) UNRELEASED; urgency=low +mencal (2.4-1) UNRELEASED; urgency=low + * New upstream version (adapted patches, remove README.Debian + that claims upstream is dead) * debian/control: - cme fix dpkg-control - debhelper 9 - canonical Vcs fields * Source format 3.0 (quilt) + * debian/copyright: DEP5 -- Andreas Tille <[email protected]> Thu, 24 Oct 2013 11:55:56 +0200 Modified: trunk/packages/mencal/trunk/debian/control =================================================================== --- trunk/packages/mencal/trunk/debian/control 2013-10-24 10:57:05 UTC (rev 14938) +++ trunk/packages/mencal/trunk/debian/control 2013-10-24 11:15:15 UTC (rev 14939) @@ -7,7 +7,7 @@ Standards-Version: 3.9.4 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/mencal/trunk/ Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/mencal/trunk/ -Homepage: http://www.kyberdigi.cz/projects/mencal/english.html +Homepage: http://kyberdigi.cz/projects/mencal/ Package: mencal Architecture: all Modified: trunk/packages/mencal/trunk/debian/copyright =================================================================== --- trunk/packages/mencal/trunk/debian/copyright 2013-10-24 10:57:05 UTC (rev 14938) +++ trunk/packages/mencal/trunk/debian/copyright 2013-10-24 11:15:15 UTC (rev 14939) @@ -1,14 +1,19 @@ -This package was debianized by Amaya Rodrigo Sastre <[email protected]> on -Fri, 22 Mar 2002 02:11:02 +0100. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: mencal +Source: http://kyberdigi.cz/projects/mencal/ -It was downloaded from http://mencal.kyberdigi.cz/english.html +Files: * +Copyright: (C) 2001-2012 C. McCohy <[email protected]> +License: GPLv2 -Upstream Author: C. McCohy <[email protected]> +Files: debian/* +Copyright: © 2002-2006 Amaya Rodrigo Sastre <[email protected]> + © 2008-2013 Andreas Tille <[email protected]> +License: GPLv2 -Copyright: (C) 2001-2003 C. McCohy <[email protected]> +License: GPLv2 + This program is free software, under the GPLv2. + . + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in `/usr/share/common-licenses/GPL-2'. -License: -This program is free software, under the GPLv2. - -On Debian systems, the complete text of the GNU General Public License -version 2 can be found in `/usr/share/common-licenses/GPL-2'. Modified: trunk/packages/mencal/trunk/debian/patches/10_daylightsaving.patch =================================================================== --- trunk/packages/mencal/trunk/debian/patches/10_daylightsaving.patch 2013-10-24 10:57:05 UTC (rev 14938) +++ trunk/packages/mencal/trunk/debian/patches/10_daylightsaving.patch 2013-10-24 11:15:15 UTC (rev 14939) @@ -15,9 +15,9 @@ Forwarded: no Author: Scott Barker <[email protected]> ---- mencal-2.3.orig/mencal -+++ mencal-2.3/mencal -@@ -184,7 +184,7 @@ +--- a/mencal ++++ b/mencal +@@ -184,7 +184,7 @@ package Conf; sub markdays { my ($self, $begin, $end, $date, $length) = (shift, shift, shift, shift, shift); Modified: trunk/packages/mencal/trunk/debian/patches/10_mencal.patch =================================================================== --- trunk/packages/mencal/trunk/debian/patches/10_mencal.patch 2013-10-24 10:57:05 UTC (rev 14938) +++ trunk/packages/mencal/trunk/debian/patches/10_mencal.patch 2013-10-24 11:15:15 UTC (rev 14939) @@ -8,9 +8,9 @@ Author: Matthew Wilcox <[email protected]> Forwarded: do not know… ---- mencal-2.3.orig/mencal -+++ mencal-2.3/mencal -@@ -100,22 +100,15 @@ +--- a/mencal ++++ b/mencal +@@ -100,22 +100,15 @@ package Conf; sub new { my $type=shift; @@ -35,7 +35,7 @@ $self->{'color'}=~/^(nocolor|red|green|blue|yellow|violet|cyan|shiny|bold)$/ || ($self->{'color'}='red'); $self->{'length'}=~/^[0-9]+$/ || do { $self->{'length'}=28; }; $self->{'duration'}=~/^[0-9]+$/ || do { $self->{'duration'}=4; }; -@@ -127,10 +120,11 @@ +@@ -127,10 +120,11 @@ package Conf; my $self=shift; (my $filename=shift) || return(0); open(FILE, $filename) || return(0); @@ -48,7 +48,7 @@ /^length ([0-9]+)$/ && do { $self->{'length'}=$1; next; }; /^duration ([0-9]+)$/ && do { $self->{'duration'}=$1; next; }; /^color (nocolor|red|green|blue|yellow|violet|cyan|shiny|bold)$/ && do { $self->{'color'}=$1; next; }; -@@ -147,13 +141,14 @@ +@@ -147,13 +141,14 @@ package Conf; my $self=shift; (my $str=shift) || return(0); my $filename=''; @@ -65,7 +65,7 @@ /^(l|length)=([0-9]+)$/ && do { $self->{'length'}=$2; next; }; /^(d|duration)=([0-9]+)$/ && do { $self->{'duration'}=$2; next; }; /^(c|color)=(nocolor|red|green|blue|yellow|violet|cyan|shiny|bold)$/ && do { $self->{'color'}=$2; next; }; -@@ -165,7 +160,10 @@ +@@ -165,7 +160,10 @@ package Conf; ($self->{'duration'}>=$self->{'length'}) && do { $self->{'duration'}=$self->{'length'}; }; if($filename) { if(open(RC, ">$filename")) { @@ -77,7 +77,7 @@ print RC $key.' '.$self->{$key}."\n"; } close(RC); -@@ -177,27 +175,76 @@ +@@ -177,27 +175,76 @@ package Conf; return(1); } @@ -145,7 +145,7 @@ - - my $month_first=mktime(0, 0, 0, 1, ($month-1), ($year-1900)); - my $month_next=mktime(0, 0, 0, 1, $month, ($year-1900)); -- my $actday=mktime(0, 0, 0, $sd, ($sm-1), ($sy-1900)); +- my $actday=mktime(0, 0, 12, $sd, ($sm-1), ($sy-1900)); - while($actday>=$month_first) { $actday-=24*3600*$self->{'length'}; } - while(($actday+24*3600*$self->{'length'})<$month_first) { $actday+=24*3600*$self->{'length'}; } - $self->{'start'}=strftime("%Y%m%d", localtime($actday)); @@ -174,7 +174,7 @@ } } -@@ -223,12 +270,19 @@ +@@ -223,12 +270,19 @@ package Main; 'topline' => 'Su Mo Tu We Th Fr Sa', 'month_delimiter_h' => " ", 'month_delimiter_v' => "\n", @@ -195,7 +195,7 @@ for(my $i=0; $i<=$#ARGV; $i++) { foreach($ARGV[$i]) { /^(-h|--help)$/ && &Main::usage; -@@ -241,6 +295,7 @@ +@@ -241,6 +295,7 @@ package Main; }; /^(-q|--quiet)$/ && do { $config{'quiet'}=1; last; }; /^(-m|--monday)$/ && do { $config{'monday_first'}=1; last; }; @@ -203,7 +203,7 @@ /^(-n|--nocolor)$/ && do { $config{'nocolor'}=1; last; }; /^(-i|--icolor)$/ && do { (($#ARGV>$i) && ($ARGV[++$i]=~/^(red|green|blue|yellow|violet|cyan|shiny|bold)$/)) || &Main::out("Invalid intersection color, see '-h' for more details"); -@@ -362,6 +417,7 @@ +@@ -362,6 +417,7 @@ package Main; " -3 previous, current and next month\n". " -y [YYYY] all-year calendar (default YYYY is current year)\n". " -q, --quiet no top information will be printed\n". _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
