[clive] 02/02: Make clive a transition package to cclive.

Ansgar Burchardt ansgar at alioth.debian.org
Mon Sep 2 19:31:13 UTC 2013 

This is an automated email from the git hooks/post-receive script.

ansgar pushed a commit to branch master
in repository clive.

commit 65781a885dd85026718dd22f0763e81f8b810476
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Mon Sep 2 21:31:05 2013 +0200

    Make clive a transition package to cclive.
---
 clive                 |   11 +++++++++++
 debian/NEWS           |   10 ++++++++++
 debian/changelog      |   12 +++++++-----
 debian/clean          |    1 -
 debian/clive.docs     |    1 -
 debian/clive.examples |    1 -
 debian/clive.install  |    2 +-
 debian/clive.links    |    1 +
 debian/control        |   31 +++++++------------------------
 debian/copyright      |   20 +++-----------------
 debian/rules          |    7 -------
 debian/source/format  |    2 +-
 debian/watch          |    2 --
 13 files changed, 41 insertions(+), 60 deletions(-)

diff --git a/clive b/clive
new file mode 100755
index 0000000..78f0e77
--- /dev/null
+++ b/clive
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+cat >&2 <<EOT
+Warning: Calling cclive instead of clive. This might fail in non-trivial
+cases, see cclive(1) for the current options provided.
+
+Please also consider removing the "clive" package and calling "cclive" directly
+in the future.
+EOT
+
+exec /usr/bin/cclive "$@"
diff --git a/debian/NEWS b/debian/NEWS
index 752c00b..6b7bdb3 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,13 @@
+clive (2.3.3+cclive) unstable; urgency=low
+
+  Please note that "clive" is now an alias for "cclive" and might fail in
+  non-trivial cases, see cclive(1) for the current options provided.
+
+  Please also consider removing the "clive" package and calling "cclive"
+  directly in the future.
+
+ -- Ansgar Burchardt <ansgar at debian.org>  Mon, 02 Sep 2013 21:23:34 +0200
+
 clive (2.2.4-1) unstable; urgency=low
 
   clive added back support for XDG-compliant location of the configuration file
diff --git a/debian/changelog b/debian/changelog
index 20428c4..921b9ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,14 @@
-clive (2.3.3-3) UNRELEASED; urgency=low
-
-  [ gregor herrmann ]
-  * debian/control: update {versioned,alternative} (build) dependencies.
+clive (2.3.3+cclive) unstable; urgency=low
 
   [ Salvatore Bonaccorso ]
   * Change Vcs-Git to canonical URI (git://anonscm.debian.org)
 
- -- gregor herrmann <gregoa at debian.org>  Thu, 05 Jul 2012 12:11:37 -0600
+  [ Ansgar Burchardt ]
+  * Make clive a transition package to cclive.
+  * Make /usr/bin/clive a wrapper script that emits a warning and then calls
+    cclive.
+
+ -- Ansgar Burchardt <ansgar at debian.org>  Mon, 02 Sep 2013 21:23:34 +0200
 
 clive (2.3.3-2) unstable; urgency=low
 
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 7659064..0000000
--- a/debian/clean
+++ /dev/null
@@ -1 +0,0 @@
-debian/cliverc
diff --git a/debian/clive.docs b/debian/clive.docs
deleted file mode 100644
index edc0071..0000000
--- a/debian/clive.docs
+++ /dev/null
@@ -1 +0,0 @@
-NEWS
diff --git a/debian/clive.examples b/debian/clive.examples
deleted file mode 100644
index e39721e..0000000
--- a/debian/clive.examples
+++ /dev/null
@@ -1 +0,0 @@
-examples/*
diff --git a/debian/clive.install b/debian/clive.install
index 2cdcda3..b387b37 100644
--- a/debian/clive.install
+++ b/debian/clive.install
@@ -1 +1 @@
-debian/cliverc usr/share/clive
+clive usr/bin
diff --git a/debian/clive.links b/debian/clive.links
new file mode 100644
index 0000000..92bb662
--- /dev/null
+++ b/debian/clive.links
@@ -0,0 +1 @@
+usr/share/man/man1/cclive.1.gz usr/share/man/man1/clive.1.gz
diff --git a/debian/control b/debian/control
index 9a4f97c..8ed913a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,33 +4,16 @@ Uploaders: Damyan Ivanov <dmn at debian.org>,
            Ryan Niebur <ryanryan52 at gmail.com>,
            Ansgar Burchardt <ansgar at debian.org>,
            Salvatore Bonaccorso <carnil at debian.org>
-Section: utils
-Priority: optional
-Build-Depends: debhelper (>= 7.0.50~)
-Build-Depends-Indep: perl,
-                     libgetopt-argvfile-perl,
-                     libjson-xs-perl (>= 2.300),
-                     libtest-pod-perl
+Section: oldlibs
+Priority: extra
+Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.3
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/clive.git
 Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/clive.git
-Homepage: http://clive.sourceforge.net/
 
 Package: clive
 Architecture: all
-Depends: ${perl:Depends},
-         ${misc:Depends},
-         curl,
-         libgetopt-argvfile-perl,
-         libjson-xs-perl (>= 2.300),
-         quvi (>= 0.4)
-Suggests: ffmpeg
-Pre-Depends: dpkg
-Description: video extraction utility for YouTube, Google Video and others
- clive is a command line utility for extracting videos from Youtube and other
- video sharing Web sites. It was originally written to bypass the Adobe Flash
- requirement needed to view the hosted videos. It is non-interactive, meaning
- it can work in the background while the user is not logged on. This allows the
- user to start an extraction and disconnect from the system, letting clive
- finish the work.
-
+Depends: ${misc:Depends}, cclive
+Description: transitional for cclive
+ This is a transitional package to ease upgrades to cclive. It can be safely
+ removed.
diff --git a/debian/copyright b/debian/copyright
index 8e28948..1af0013 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,25 +1,11 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Contact: Toni Gundogdu <legatvs at gmail.com>
-Source: http://code.google.com/p/clive/downloads/list
-Upstream-Name: clive
 
 Files: *
-Copyright: 2007-2011, Toni Gundogdu
-License: GPL-3+
-
-Files: debian/*
-Copyright: 2009, Damyan Ivanov <dmn at debian.org>
+Copyright:
+ 2009,      Damyan Ivanov <dmn at debian.org>
+ 2010-2013, Ansgar Burchardt <ansgar at debian.org>
 License: GPL-3
 
-License: GPL-3+
- clive is free software: you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your option)
- any later version.
- .
- On Debian systems, the complete text of version 3 of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-3'.
-
 License: GPL-3
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/debian/rules b/debian/rules
index 9c902c3..b8796e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,3 @@
 
 %:
 	dh $@
-
-override_dh_auto_build:
-	dh_auto_build
-	sed -e s,/usr/bin/,, <examples/cliverc >debian/cliverc
-
-override_dh_builddeb:
-	dh_builddeb -- -Zxz
diff --git a/debian/source/format b/debian/source/format
index 163aaf8..89ae9db 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 206e3c2..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/clive/clive-([\d.]+)\.tar\.(?:bz2|gz|xz)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/clive.git

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