r7608 - in /trunk/libdate-manip-perl/debian: changelog patches/00list patches/01_global_conf.dpatch patches/02_manip_omst_tz.dpatch patches/03_today_insensitive.dpatch patches/04_manip_pet_tz.dpatch

dmn at users.alioth.debian.org dmn at users.alioth.debian.org
Sun Sep 16 18:11:50 UTC 2007 

Author: dmn
Date: Sun Sep 16 18:11:50 2007
New Revision: 7608

URL: http://svn.debian.org/wsvn/?sc=1&rev=7608
Log:
* Dropped patches applied upstream
  03_today_insensitive.dpatch
  04_manip_pet_tz.dpatch

Removed:
    trunk/libdate-manip-perl/debian/patches/03_today_insensitive.dpatch
    trunk/libdate-manip-perl/debian/patches/04_manip_pet_tz.dpatch
Modified:
    trunk/libdate-manip-perl/debian/changelog
    trunk/libdate-manip-perl/debian/patches/00list
    trunk/libdate-manip-perl/debian/patches/01_global_conf.dpatch
    trunk/libdate-manip-perl/debian/patches/02_manip_omst_tz.dpatch

Modified: trunk/libdate-manip-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libdate-manip-perl/debian/changelog?rev=7608&op=diff
==============================================================================
--- trunk/libdate-manip-perl/debian/changelog (original)
+++ trunk/libdate-manip-perl/debian/changelog Sun Sep 16 18:11:50 2007
@@ -1,6 +1,4 @@
 libdate-manip-perl (5.46-1) UNRELEASED; urgency=low
-
-  TODO: patches need updating
 
   * New upstream release
     + Lots of fixes
@@ -13,8 +11,11 @@
     + move dh_clean $stamp_files before distclean
     + use $(CWD) instead of `pwd`
   * Added myself to Uploaders
+  * Dropped patches applied upstream
+    03_today_insensitive.dpatch
+    04_manip_pet_tz.dpatch
 
- -- Damyan Ivanov <dmn at debian.org>  Sat, 15 Sep 2007 23:07:18 +0300
+ -- Damyan Ivanov <dmn at debian.org>  Sun, 16 Sep 2007 21:10:21 +0300
 
 libdate-manip-perl (5.44-6) UNRELEASED; urgency=low
 

Modified: trunk/libdate-manip-perl/debian/patches/00list
URL: http://svn.debian.org/wsvn/trunk/libdate-manip-perl/debian/patches/00list?rev=7608&op=diff
==============================================================================
--- trunk/libdate-manip-perl/debian/patches/00list (original)
+++ trunk/libdate-manip-perl/debian/patches/00list Sun Sep 16 18:11:50 2007
@@ -1,4 +1,2 @@
 01_global_conf
 02_manip_omst_tz
-03_today_insensitive
-04_manip_pet_tz

Modified: trunk/libdate-manip-perl/debian/patches/01_global_conf.dpatch
URL: http://svn.debian.org/wsvn/trunk/libdate-manip-perl/debian/patches/01_global_conf.dpatch?rev=7608&op=diff
==============================================================================
--- trunk/libdate-manip-perl/debian/patches/01_global_conf.dpatch (original)
+++ trunk/libdate-manip-perl/debian/patches/01_global_conf.dpatch Sun Sep 16 18:11:50 2007
@@ -8,10 +8,10 @@
 ## DP: See bug#298695 for full details.
 
 @DPATCH@
-diff -urNad libdate-manip-perl-5.44~/Manip.pm libdate-manip-perl-5.44/Manip.pm
---- libdate-manip-perl-5.44~/Manip.pm	2005-06-02 16:47:42.000000000 +0100
-+++ libdate-manip-perl-5.44/Manip.pm	2005-09-28 17:05:51.000000000 +0100
-@@ -46,7 +46,7 @@
+diff -urNad libdate-manip-perl~/Manip.pm libdate-manip-perl/Manip.pm
+--- libdate-manip-perl~/Manip.pm	2007-09-15 22:56:00.000000000 +0300
++++ libdate-manip-perl/Manip.pm	2007-09-16 20:38:38.000000000 +0300
+@@ -48,7 +48,7 @@
  
  # Location of a the global config file.  Tilde (~) expansions are allowed.
  # This should be set in Date_Init arguments.
@@ -20,16 +20,16 @@
  $Cnf{"IgnoreGlobalCnf"}="";
  
  # Name of a personal config file and the path to search for it.  Tilde (~)
-diff -urNad libdate-manip-perl-5.44~/Manip.pod libdate-manip-perl-5.44/Manip.pod
---- libdate-manip-perl-5.44~/Manip.pod	2005-06-02 15:49:22.000000000 +0100
-+++ libdate-manip-perl-5.44/Manip.pod	2005-09-28 17:05:55.000000000 +0100
-@@ -1890,18 +1890,17 @@
+diff -urNad libdate-manip-perl~/Manip.pod libdate-manip-perl/Manip.pod
+--- libdate-manip-perl~/Manip.pod	2007-09-15 22:56:12.000000000 +0300
++++ libdate-manip-perl/Manip.pod	2007-09-16 20:45:51.000000000 +0300
+@@ -1906,18 +1906,17 @@
  At the top of the Manip.pm file, there is a section which contains all
  customization variables.  These provide the default values.
  
 -These can be overridden in a global config file if one is present (this
 -file is optional).  If the GlobalCnf variable is set in the Manip.pm file,
--it contains the full path to a config file.  If the file exists, it's
+-it contains the full path to a config file.  If the file exists, its
 -values will override those set in the Manip.pm file.  A sample config file
 -is included with the Date::Manip distribution.  Modify it as appropriate
 -and copy it to some appropriate directory and set the GlobalCnf variable in

Modified: trunk/libdate-manip-perl/debian/patches/02_manip_omst_tz.dpatch
URL: http://svn.debian.org/wsvn/trunk/libdate-manip-perl/debian/patches/02_manip_omst_tz.dpatch?rev=7608&op=diff
==============================================================================
--- trunk/libdate-manip-perl/debian/patches/02_manip_omst_tz.dpatch (original)
+++ trunk/libdate-manip-perl/debian/patches/02_manip_omst_tz.dpatch Sun Sep 16 18:11:50 2007
@@ -7,12 +7,13 @@
 ## DP: See bug#358086 for full details.
 
 @DPATCH@
---- libdate-manip-perl-5.44~/Manip.pm	2005-09-28 23:08:34.000000000 +0700
-+++ libdate-manip-perl-5.44/Manip.pm	2006-03-21 11:54:31.000000000 +0600
-@@ -622,6 +622,7 @@
+diff -urNad libdate-manip-perl~/Manip.pm libdate-manip-perl/Manip.pm
+--- libdate-manip-perl~/Manip.pm	2007-09-16 20:49:17.000000000 +0300
++++ libdate-manip-perl/Manip.pm	2007-09-16 20:58:36.000000000 +0300
+@@ -626,6 +626,7 @@
        "ist    +0530 ".  # Indian Standard
        "zp6    +0600 ".  # USSR Zone 5
-       "novst  +0600 ".  # Novosibirsk time zone, Russia
+       "novt   +0600 ".  # Novosibirsk winter time zone, Russia
 +      "omst   +0600 ".  # Omsk time zone, Russia
        "nst    +0630 ".  # North Sumatra              nst=Newfoundland Std -0330
        #"sst   +0700 ".  # South Sumatra, USSR Zone 6 sst=Swedish Summer   +0200

More information about the Pkg-perl-cvs-commits mailing list