[SCM] packaging of clive-utils branch, master, updated. 2.1.0-21-ga0a8264

Damyan Ivanov dmn at debian.org
Mon Feb 23 20:28:42 UTC 2009


The following commit has been merged in the master branch:
commit c43184ec1e277abed2c33cabf556effd8aff7e51
Author: Damyan Ivanov <dmn at debian.org>
Date:   Mon Feb 23 21:37:57 2009 +0200

    refresh patches to apply cleanly; drop unneeded parts (CHANGES/INSTALL)

diff --git a/debian/patches/series b/debian/patches/series
index e9f1baf..da1106b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-upstream_drop-Crypt-Salt.patch
 upstream_use-Crypt::Twofish.patch
+upstream_drop-Crypt-Salt.patch
diff --git a/debian/patches/upstream_drop-Crypt-Salt.patch b/debian/patches/upstream_drop-Crypt-Salt.patch
index e692662..f9d3e94 100644
--- a/debian/patches/upstream_drop-Crypt-Salt.patch
+++ b/debian/patches/upstream_drop-Crypt-Salt.patch
@@ -1,36 +1,10 @@
+# Based on the following upstream commit
 commit 6b3f600e89a2e1e78ba6a0c3419b0378c9169809
 Author: legatvs <legatvs at gmail.com>
 Date:   Wed Jan 7 21:31:09 2009 +0200
 
     Removed Crypt::Salt module prereq.
 
-diff --git a/CHANGES b/CHANGES
-index 4b35813..be7226a 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -18,6 +18,7 @@ Version 2.1.1-dev
-     - Be more verbose
-     - Cleaned up code
-   - clivepass
-+  * Removed Crypt::Salt module prereq.
-   * Replaced prereq. module Crypt::Twofish2 with Crypt::Twofish
- 
- 
-diff --git a/INSTALL b/INSTALL
-index f3e1fa7..27ef0f8 100644
---- a/INSTALL
-+++ b/INSTALL
-@@ -39,7 +39,7 @@ clivepass
- ---------
- 
- * Crypt::PasswdMD5/1.3        * Crypt::Twofish/2.12
--* Crypt::Salt/0.01            * Config::Tiny/2.12
-+* Config::Tiny/2.12
- 
- 
- Installation
-diff --git a/clivepass b/clivepass
-index 5319e60..f6fad9c 100755
 --- a/clivepass
 +++ b/clivepass
 @@ -24,7 +24,6 @@ use strict;
@@ -54,7 +28,7 @@ index 5319e60..f6fad9c 100755
  sub create_passwd {
      if ( -e $PASSWDFILE ) {
          print "WARN: $PASSWDFILE exists already.\n"
-@@ -236,7 +241,7 @@ Copyright (c) 2008,2009 Toni Gundogdu.
+@@ -236,7 +241,7 @@ Copyright (c) 2008 Toni Gundogdu.
   * Perl/$perl_v
  Modules:
   * Crypt::PasswdMD5/$Crypt::PasswdMD5::VERSION\t\t* Crypt::Twofish/$Crypt::Twofish::VERSION
diff --git a/debian/patches/upstream_use-Crypt::Twofish.patch b/debian/patches/upstream_use-Crypt::Twofish.patch
index 1c9a161..e06044d 100644
--- a/debian/patches/upstream_use-Crypt::Twofish.patch
+++ b/debian/patches/upstream_use-Crypt::Twofish.patch
@@ -1,37 +1,10 @@
+# Based on the following upstream commit
 commit fe45d60fbc80baf329b5c10ab29bf8d58f41a63f
 Author: legatvs <legatvs at gmail.com>
 Date:   Wed Jan 7 21:20:49 2009 +0200
 
     Replaced prereq. module Crypt::Twofish2 with Crypt::Twofish.
 
-diff --git a/CHANGES b/CHANGES
-index 03caa36..4b35813 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -17,6 +17,8 @@ Version 2.1.1-dev
-   * Tweaked genman script
-     - Be more verbose
-     - Cleaned up code
-+  - clivepass
-+  * Replaced prereq. module Crypt::Twofish2 with Crypt::Twofish
- 
- 
- Version 2.1.0
-diff --git a/INSTALL b/INSTALL
-index 05390dd..f3e1fa7 100644
---- a/INSTALL
-+++ b/INSTALL
-@@ -38,7 +38,7 @@ clivescan
- clivepass
- ---------
- 
--* Crypt::PasswdMD5/1.3        * Crypt::Twofish2/1.01
-+* Crypt::PasswdMD5/1.3        * Crypt::Twofish/2.12
- * Crypt::Salt/0.01            * Config::Tiny/2.12
- 
- 
-diff --git a/clivepass b/clivepass
-index 536b376..5319e60 100755
 --- a/clivepass
 +++ b/clivepass
 @@ -25,7 +25,7 @@ binmode(STDOUT, ":utf8");
@@ -62,7 +35,7 @@ index 536b376..5319e60 100755
  }
  
 @@ -235,7 +235,7 @@ sub print_version {
- Copyright (c) 2008,2009 Toni Gundogdu.
+ Copyright (c) 2008 Toni Gundogdu.
   * Perl/$perl_v
  Modules:
 - * Crypt::PasswdMD5/$Crypt::PasswdMD5::VERSION\t\t* Crypt::Twofish2/$Crypt::Twofish2::VERSION

-- 
packaging of clive-utils



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