[med-svn] r4652 - in trunk/packages/mencal/trunk/debian: . patches
Charles Plessy
plessy at alioth.debian.org
Sun Mar 7 15:01:57 UTC 2010
Author: plessy
Date: 2010-03-07 15:01:55 +0000 (Sun, 07 Mar 2010)
New Revision: 4652
Added:
trunk/packages/mencal/trunk/debian/README.source
trunk/packages/mencal/trunk/debian/install
trunk/packages/mencal/trunk/debian/manpages
Removed:
trunk/packages/mencal/trunk/debian/dirs
Modified:
trunk/packages/mencal/trunk/debian/
trunk/packages/mencal/trunk/debian/changelog
trunk/packages/mencal/trunk/debian/compat
trunk/packages/mencal/trunk/debian/control
trunk/packages/mencal/trunk/debian/copyright
trunk/packages/mencal/trunk/debian/mencal.1
trunk/packages/mencal/trunk/debian/patches/10_daylightsaving.patch
trunk/packages/mencal/trunk/debian/patches/10_mencal.patch
trunk/packages/mencal/trunk/debian/rules
trunk/packages/mencal/trunk/debian/watch
Log:
Removed Matthew Wilcox from the uploaders list, and misc. package updates.
* Team upload.
* Removed Matthew Wilcox from the uploaders list (Closes: #572505).
* Added a description to the patches in debian/patches, fa?\195?\167on DEP-3.
* Incremented Standards-Version to reflect conformance with Policy 3.8.4
(debian/control, no changes needed).
* Switched to Debhelper 7: debian/(compat, control, rules, install, manpages)
* Updated homepage in the manpage (debian/mencal.1).
* Point at version 2 of the GPL in debian/copyright.
Property changes on: trunk/packages/mencal/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: trunk/packages/mencal/trunk/debian/README.source
===================================================================
--- trunk/packages/mencal/trunk/debian/README.source (rev 0)
+++ trunk/packages/mencal/trunk/debian/README.source 2010-03-07 15:01:55 UTC (rev 4652)
@@ -0,0 +1 @@
+This package uses a patch system, see /usr/share/doc/quilt/README.source.
Modified: trunk/packages/mencal/trunk/debian/changelog
===================================================================
--- trunk/packages/mencal/trunk/debian/changelog 2010-03-07 11:42:32 UTC (rev 4651)
+++ trunk/packages/mencal/trunk/debian/changelog 2010-03-07 15:01:55 UTC (rev 4652)
@@ -1,3 +1,16 @@
+mencal (2.3-9) unstable; urgency=low
+
+ * Team upload.
+ * Removed Matthew Wilcox from the uploaders list (Closes: #572505).
+ * Added a description to the patches in debian/patches, façon DEP-3.
+ * Incremented Standards-Version to reflect conformance with Policy 3.8.4
+ (debian/control, no changes needed).
+ * Switched to Debhelper 7: debian/(compat, control, rules, install, manpages)
+ * Updated homepage in the manpage (debian/mencal.1).
+ * Point at version 2 of the GPL in debian/copyright.
+
+ -- Charles Plessy <plessy at debian.org> Sun, 07 Mar 2010 23:46:45 +0900
+
mencal (2.3-8) unstable; urgency=low
* New Maintainer Debian-Med Packaging Team
Modified: trunk/packages/mencal/trunk/debian/compat
===================================================================
--- trunk/packages/mencal/trunk/debian/compat 2010-03-07 11:42:32 UTC (rev 4651)
+++ trunk/packages/mencal/trunk/debian/compat 2010-03-07 15:01:55 UTC (rev 4652)
@@ -1 +1 @@
-5
+7
Modified: trunk/packages/mencal/trunk/debian/control
===================================================================
--- trunk/packages/mencal/trunk/debian/control 2010-03-07 11:42:32 UTC (rev 4651)
+++ trunk/packages/mencal/trunk/debian/control 2010-03-07 15:01:55 UTC (rev 4652)
@@ -3,17 +3,16 @@
Priority: optional
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
DM-Upload-Allowed: yes
-Uploaders: Andreas Tille <tille at debian.org>,
- Matthew Wilcox <willy at debian.org>
-Build-Depends: debhelper, quilt
-Standards-Version: 3.8.0
+Uploaders: Andreas Tille <tille at debian.org>
+Build-Depends: debhelper (>= 7), quilt
+Standards-Version: 3.8.4
Homepage: http://www.kyberdigi.cz/projects/mencal/english.html
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mencal/trunk/?rev=0&sc=0
Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/mencal/trunk/
Package: mencal
Architecture: all
-Depends: ${perl:Depends}
+Depends: ${perl:Depends}, ${misc:Depends}
Description: A menstruation calendar
Mencal is a menstruation calendar written in Perl.
.
Modified: trunk/packages/mencal/trunk/debian/copyright
===================================================================
--- trunk/packages/mencal/trunk/debian/copyright 2010-03-07 11:42:32 UTC (rev 4651)
+++ trunk/packages/mencal/trunk/debian/copyright 2010-03-07 15:01:55 UTC (rev 4652)
@@ -9,6 +9,6 @@
License:
This program is free software, under the GPLv2.
-On Debian systems, the complete text of the GNU General Public License can be
-found in `/usr/share/common-licenses/GPL'.
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
Deleted: trunk/packages/mencal/trunk/debian/dirs
===================================================================
--- trunk/packages/mencal/trunk/debian/dirs 2010-03-07 11:42:32 UTC (rev 4651)
+++ trunk/packages/mencal/trunk/debian/dirs 2010-03-07 15:01:55 UTC (rev 4652)
@@ -1 +0,0 @@
-/usr/bin/
Added: trunk/packages/mencal/trunk/debian/install
===================================================================
--- trunk/packages/mencal/trunk/debian/install (rev 0)
+++ trunk/packages/mencal/trunk/debian/install 2010-03-07 15:01:55 UTC (rev 4652)
@@ -0,0 +1 @@
+mencal usr/bin
Added: trunk/packages/mencal/trunk/debian/manpages
===================================================================
--- trunk/packages/mencal/trunk/debian/manpages (rev 0)
+++ trunk/packages/mencal/trunk/debian/manpages 2010-03-07 15:01:55 UTC (rev 4652)
@@ -0,0 +1 @@
+debian/mencal.1
Modified: trunk/packages/mencal/trunk/debian/mencal.1
===================================================================
--- trunk/packages/mencal/trunk/debian/mencal.1 2010-03-07 11:42:32 UTC (rev 4651)
+++ trunk/packages/mencal/trunk/debian/mencal.1 2010-03-07 15:01:55 UTC (rev 4652)
@@ -74,9 +74,9 @@
.SH AUTHOR:
.I (C) 2002 C. McCohy
.br
-e\-mail: <mccohy at kyberdigi.cz
+e\-mail: <mccohy at kyberdigi.cz>
.br
-Word\-Wide\-Web: http://mencal.kyberdigi.cz/
+Word\-Wide\-Web: http://www.kyberdigi.cz/projects/mencal/english
.PP
This manual page was written for the Debian GNU/Linux distribution because the
original program does not have a manual page (but may be used by others).
Modified: trunk/packages/mencal/trunk/debian/patches/10_daylightsaving.patch
===================================================================
--- trunk/packages/mencal/trunk/debian/patches/10_daylightsaving.patch 2010-03-07 11:42:32 UTC (rev 4651)
+++ trunk/packages/mencal/trunk/debian/patches/10_daylightsaving.patch 2010-03-07 15:01:55 UTC (rev 4652)
@@ -1,3 +1,20 @@
+Description: Repairs daylight savings time bug.
+ mencal does not account for daylight savings time when calculating the
+ variable '$day' in the markdays() subroutine, resulting in fractional
+ values for '$day', which breaks mencal if the start date and current
+ date are in different daylight savings time states.
+ .
+ This may actually be due to changed behaviour in POSIX::mktime back in
+ 2007, where mktime now sets isdst=-1 by default, instead of setting
+ isdst=0 by default.
+ .
+ This patch fixes this problem simply by ensuring that '$day' is
+ an integer.
+Origin: vendor, http://bugs.debian.org/489203
+Bug-Debian: http://bugs.debian.org/489203
+Forwarded: no
+Author: Scott Barker <scott at mostlylinux.ca>
+
--- mencal-2.3.orig/mencal
+++ mencal-2.3/mencal
@@ -184,7 +184,7 @@
Modified: trunk/packages/mencal/trunk/debian/patches/10_mencal.patch
===================================================================
--- trunk/packages/mencal/trunk/debian/patches/10_mencal.patch 2010-03-07 11:42:32 UTC (rev 4651)
+++ trunk/packages/mencal/trunk/debian/patches/10_mencal.patch 2010-03-07 15:01:55 UTC (rev 4652)
@@ -1,3 +1,13 @@
+Description: Monolithic patch that combines multiple combinations.
+ Warning: the list below may be incomplete.
+Bug-Debian: http://bugs.debian.org/312452
+Author: Toni Timonen <ttimonen at users.sourceforge.net>
+Bug-Debian: http://bugs.debian.org/194322
+Author: Sam Hocevar <sam at zoy.org>
+Bug-Debian: http://bugs.debian.org/274722 or http://bugs.debian.org/344550
+Author: Matthew Wilcox <matthew at wil.cx>
+Forwarded: do not know…
+
--- mencal-2.3.orig/mencal
+++ mencal-2.3/mencal
@@ -100,22 +100,15 @@
Modified: trunk/packages/mencal/trunk/debian/rules
===================================================================
--- trunk/packages/mencal/trunk/debian/rules 2010-03-07 11:42:32 UTC (rev 4651)
+++ trunk/packages/mencal/trunk/debian/rules 2010-03-07 15:01:55 UTC (rev 4652)
@@ -1,57 +1,3 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/quilt/quilt.make
-
-DESTDIR=$(CURDIR)/debian/mencal
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
-
-clean: unpatch
- dh_testdir
- dh_testroot
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- # Add here commands to install the package into debian/mencal.
- install -p -m755 $(CURDIR)/mencal $(DESTDIR)/usr/bin/
-
-# Build architecture-independent files here.
-binary-indep: build-indep install
- dh_testdir
- dh_testroot
- #dh_installdocs $(CURDIR)/debian/readme.html
- dh_installdocs
- dh_installman debian/mencal.1
- dh_installchangelogs
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# mencal is a simple perl script, it needs no building.
-build: patch build-arch build-indep
-build-arch:
-build-indep:
-
-# Build architecture-dependent files here.
-binary-arch: build-arch
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install configure
+%:
+ dh $@ --with quilt
Modified: trunk/packages/mencal/trunk/debian/watch
===================================================================
--- trunk/packages/mencal/trunk/debian/watch 2010-03-07 11:42:32 UTC (rev 4651)
+++ trunk/packages/mencal/trunk/debian/watch 2010-03-07 15:01:55 UTC (rev 4652)
@@ -2,4 +2,4 @@
http://www.kyberdigi.cz/projects/mencal/english.html mencal-(.*)\.tar\.gz
# Other suggestion by Raphael Geissert <atomo64 at gmail.com> (#449949)
-# http://www.kyberdigi.cz/projects/mencal/mencal-(.*)\.tar\.gz
\ No newline at end of file
+# http://www.kyberdigi.cz/projects/mencal/mencal-(.*)\.tar\.gz
More information about the debian-med-commit
mailing list