[Forensics-changes] [recoverjpeg] 15/20: Imported Debian patch 2.0-3

Joao Eriberto Mota Filho eriberto at moszumanska.debian.org
Mon May 18 23:14:47 UTC 2015 

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

eriberto pushed a commit to branch debian
in repository recoverjpeg.

commit 42d080054ee96dbc4deaf5c30964e7415be6d7c8
Author: William Vera <billy at billy.com.mx>
Date:   Mon Mar 5 23:11:31 2012 -0600

    Imported Debian patch 2.0-3
---
 debian/changelog                                   |  8 ++++
 debian/control                                     |  2 +-
 debian/patches/00list                              |  2 -
 .../{01_manpagefix.dpatch => 01_manpagefix.patch}  |  9 +---
 debian/patches/02_fix_recovermov.1.dpatch          | 19 --------
 debian/patches/02_fix_recovermov.1.patch           | 13 +++++
 debian/patches/debian-changes-2.0-2                | 55 ----------------------
 debian/patches/series                              |  3 +-
 debian/rules                                       | 18 +++++--
 9 files changed, 41 insertions(+), 88 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1063a96..80a763c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+recoverjpeg (2.0-3) unstable; urgency=low
+
+  * Change the patches format for quilt and delete 00list on debian/patches.
+     + This fix FTBFS: dpkg-buildpackage: error (Closes: 643274).
+  * Bump Standards-Version to 3.9.3. 
+
+ -- William Vera <billy at billy.com.mx>  Mon, 05 Mar 2012 23:11:31 -0600
+
 recoverjpeg (2.0-2) unstable; urgency=low
 
   * Bump Standards-Version to 3.9.0. 
diff --git a/debian/control b/debian/control
index b0ea1b5..39d97f9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: William Vera <billy at billy.com.mx>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50)
-Standards-Version: 3.9.0
+Standards-Version: 3.9.3
 Homepage: http://www.rfc1149.net/devel/recoverjpeg
 
 Package: recoverjpeg
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e168bfa..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_manpagefix.dpatch
-02_fix_recovermov.1.dpatch
diff --git a/debian/patches/01_manpagefix.dpatch b/debian/patches/01_manpagefix.patch
similarity index 70%
rename from debian/patches/01_manpagefix.dpatch
rename to debian/patches/01_manpagefix.patch
index 96dc100..f761ffe 100755
--- a/debian/patches/01_manpagefix.dpatch
+++ b/debian/patches/01_manpagefix.patch
@@ -1,10 +1,5 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_manpagefix.dpatch by  William Vera <billy at billy.com.mx>
-##
-## DP: Minor fix for manpage syntax.
-
- at DPATCH@
-diff -urNad recoverjpeg-1.1.2~/recoverjpeg.1 recoverjpeg-1.1.2/recoverjpeg.1
+Author: William Vera <billy at billy.com.mx>
+Description: Minor fix for manpage syntax.
 --- recoverjpeg-1.1.2~/recoverjpeg.1	2007-07-21 17:34:20.000000000 -0500
 +++ recoverjpeg-1.1.2/recoverjpeg.1	2008-10-07 20:44:23.000000000 -0500
 @@ -71,12 +71,12 @@
diff --git a/debian/patches/02_fix_recovermov.1.dpatch b/debian/patches/02_fix_recovermov.1.dpatch
deleted file mode 100755
index a2c2c47..0000000
--- a/debian/patches/02_fix_recovermov.1.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix_recovermov.1.dpatch by William Vera <billy at billy.com.mx>
-##
-## DP: Minor fix for manpage syntax.
-
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' recoverjpeg-2.0~/recovermov.1 recoverjpeg-2.0/recovermov.1
---- recoverjpeg-2.0~/recovermov.1	2010-01-16 09:20:55.000000000 -0600
-+++ recoverjpeg-2.0/recovermov.1	2010-03-03 20:23:16.000000000 -0600
-@@ -43,7 +43,7 @@
- (which does not necessarily store files at block boundaries) in
- \fI/dev/hdb1\fP:
- 
--  recovermov -b 1 /dev/hdb1
-+  recovermov \-b 1 /dev/hdb1
- 
- .SH AUTHOR
- .B Recovermov
diff --git a/debian/patches/02_fix_recovermov.1.patch b/debian/patches/02_fix_recovermov.1.patch
new file mode 100755
index 0000000..ca11a92
--- /dev/null
+++ b/debian/patches/02_fix_recovermov.1.patch
@@ -0,0 +1,13 @@
+Author: William Vera <billy at billy.com.mx>
+Description: Minor fix for manpage syntax.
+--- recoverjpeg-2.0~/recovermov.1	2010-01-16 09:20:55.000000000 -0600
++++ recoverjpeg-2.0/recovermov.1	2010-03-03 20:23:16.000000000 -0600
+@@ -43,7 +43,7 @@
+ (which does not necessarily store files at block boundaries) in
+ \fI/dev/hdb1\fP:
+ 
+-  recovermov -b 1 /dev/hdb1
++  recovermov \-b 1 /dev/hdb1
+ 
+ .SH AUTHOR
+ .B Recovermov
diff --git a/debian/patches/debian-changes-2.0-2 b/debian/patches/debian-changes-2.0-2
deleted file mode 100644
index e5b8721..0000000
--- a/debian/patches/debian-changes-2.0-2
+++ /dev/null
@@ -1,55 +0,0 @@
-Description: Upstream changes introduced in version 2.0-2
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- recoverjpeg (2.0-2) unstable; urgency=low
- .
-   * Bump Standards-Version to 3.9.0.
-   * Bump debhelper version to 7.0.50 in the control file.
-   * Switch to dpkg-source 3.0 (quilt) format.
- .
- The person named in the Author field signed this changelog entry.
-Author: William Vera <billy at billy.com.mx>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- recoverjpeg-2.0.orig/recoverjpeg.1
-+++ recoverjpeg-2.0/recoverjpeg.1
-@@ -71,12 +71,12 @@ Recover as many pictures as possible fro
- (which does not necessarily store pictures at block boundaries) in
- \fI/dev/hdb1\fP:
- 
--  recoverjpeg -b 1 /dev/hdb1
-+  recoverjpeg \-b 1 /dev/hdb1
- 
- Do the same thing in a memory constrained environment where no more than
- 16MB of RAM can be used for the operation:
- 
--  recoverjpeg -b 1 -r 16m /dev/hdb1
-+  recoverjpeg \-b 1 \-r 16m /dev/hdb1
- 
- .SH AUTHOR
- .B Recoverjpeg
---- recoverjpeg-2.0.orig/recovermov.1
-+++ recoverjpeg-2.0/recovermov.1
-@@ -43,7 +43,7 @@ Recover as many movies as possible from
- (which does not necessarily store files at block boundaries) in
- \fI/dev/hdb1\fP:
- 
--  recovermov -b 1 /dev/hdb1
-+  recovermov \-b 1 /dev/hdb1
- 
- .SH AUTHOR
- .B Recovermov
diff --git a/debian/patches/series b/debian/patches/series
index 73faf56..3f26943 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-debian-changes-2.0-2
+01_manpagefix.patch  
+02_fix_recovermov.1.patch
diff --git a/debian/rules b/debian/rules
index cb926c8..397d966 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,19 @@
 #!/usr/bin/make -f
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+#export DH_OPTIONS=-v
 
 %:
-	dh ${@}
+	dh  $@
 
-override_dh_auto_install:
-	$(MAKE) install prefix=$(CURDIR)/debian/recoverjpeg/usr
+# Use override_dh_* targets to customize this.
+# ---------------------------------------------------
+# Followings are the old debian/rules
+#
+# #!/usr/bin/make -f
+# 
+# %:
+# 	dh ${@}
+# 
+# override_dh_auto_install:
+# 	$(MAKE) install prefix=$(CURDIR)/debian/recoverjpeg/usr

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/recoverjpeg.git

More information about the forensics-changes mailing list