[Forensics-changes] [recoverjpeg] 14/20: Imported Debian patch 2.0-2

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 a0a1f4be89e37a73567cdb5d8ac05139c5fb31b2
Author: William Vera <billy at billy.com.mx>
Date:   Wed Jun 30 13:18:59 2010 -0500

    Imported Debian patch 2.0-2
---
 debian/changelog                          |  8 ++++
 debian/control                            |  4 +-
 debian/patched/01_manpagefix.dpatch       |  1 +
 debian/patched/02_fix_recovermov.1.dpatch |  1 +
 debian/patches/01_manpagefix.dpatch       |  0
 debian/patches/02_fix_recovermov.1.dpatch |  0
 debian/patches/debian-changes-2.0-2       | 55 +++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 debian/rules                              | 63 ++-----------------------------
 debian/source/format                      |  1 +
 10 files changed, 73 insertions(+), 61 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d96086b..1063a96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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.
+
+ -- William Vera <billy at billy.com.mx>  Wed, 30 Jun 2010 13:18:59 -0500
+
 recoverjpeg (2.0-1) unstable; urgency=low
 
   * New upstream release (Closes: #572234).
diff --git a/debian/control b/debian/control
index 5ac5082..b0ea1b5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: graphics
 Priority: optional
 Maintainer: William Vera <billy at billy.com.mx>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.0), dpatch
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.0.50)
+Standards-Version: 3.9.0
 Homepage: http://www.rfc1149.net/devel/recoverjpeg
 
 Package: recoverjpeg
diff --git a/debian/patched/01_manpagefix.dpatch b/debian/patched/01_manpagefix.dpatch
new file mode 100644
index 0000000..1bfb3ba
--- /dev/null
+++ b/debian/patched/01_manpagefix.dpatch
@@ -0,0 +1 @@
+patching file recoverjpeg.1
diff --git a/debian/patched/02_fix_recovermov.1.dpatch b/debian/patched/02_fix_recovermov.1.dpatch
new file mode 100644
index 0000000..79cbb57
--- /dev/null
+++ b/debian/patched/02_fix_recovermov.1.dpatch
@@ -0,0 +1 @@
+patching file recovermov.1
diff --git a/debian/patches/01_manpagefix.dpatch b/debian/patches/01_manpagefix.dpatch
old mode 100644
new mode 100755
diff --git a/debian/patches/02_fix_recovermov.1.dpatch b/debian/patches/02_fix_recovermov.1.dpatch
old mode 100644
new mode 100755
diff --git a/debian/patches/debian-changes-2.0-2 b/debian/patches/debian-changes-2.0-2
new file mode 100644
index 0000000..e5b8721
--- /dev/null
+++ b/debian/patches/debian-changes-2.0-2
@@ -0,0 +1,55 @@
+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
new file mode 100644
index 0000000..73faf56
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debian-changes-2.0-2
diff --git a/debian/rules b/debian/rules
index 5657c76..cb926c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,62 +1,7 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
 
-CFLAGS = -Wall -g
+%:
+	dh ${@}
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp: patch
-	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-build: build-stamp
-build-stamp:  configure-stamp
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean
-patch: patch-stamp
-patch-stamp:
-	dpatch apply-all
-unpatch:
-	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/recoverjpeg
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_auto_install:
+	$(MAKE) install prefix=$(CURDIR)/debian/recoverjpeg/usr
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

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

