[SCM] Video extraction utility for YouTube, Google Video and other video sites (Debian packaging) branch, master, updated. upstream/2.1.7-214-g6762190

[Damyan Ivanov]

The following commit has been merged in the master branch:
commit b799110c767c1790d53e6da43fc5ef646673ac44
Author: Damyan Ivanov <dmn at debian.org>
Date:   Wed Apr 1 17:29:54 2009 +0300

    move clive.1 out of the way when building and restore it on clean

diff --git a/debian/changelog b/debian/changelog
index d354f99..ab46bfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,12 +2,11 @@ clive (2.1.7-1) unstable; urgency=low
 
   * New upstream release
   * add myself to uploaders
-  * rather than removing clive.1 in the .diff.gz, remove/revert it in
-    the clean target
   * standards version 3.8.1
   * remove (build-)dependency on libxml-simple-perl
   * add (build-)dependency on libterm-readkey-perl
 
+  * move clive.1 out of the way when building and restore it on clean
  -- Ryan Niebur <ryanryan52 at gmail.com>  Fri, 20 Mar 2009 20:40:59 -0700
 
 clive (2.1.6-1) unstable; urgency=low
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 3c44d7b..0000000
--- a/debian/clean
+++ /dev/null
@@ -1 +0,0 @@
-clive.1
diff --git a/debian/rules b/debian/rules
index 55960c8..6f787e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,12 +6,14 @@ PERL ?= /usr/bin/perl
 
 build:
 	dh $@
+	# force rebuild of clive.1
+	if [ -e clive.1 ]; then mv -v clive.1 clive.1-ORIG; fi
 	$(PERL) -c clive
 	$(MAKE) man
 
 clean:
 	dh $@
-	[ ! -x /usr/bin/git -o ! -d .git ] || git checkout clive.1
+	if [ -e clive.1-ORIG ]; then mv -v clive.1-ORIG clive.1; fi
 
 install: build
 	dh $@ --before dh_auto_install

-- 
Video extraction utility for YouTube, Google Video and other video sites (Debian packaging)