[SCM] findimagedupes branch, master, updated. debian/2.11-2-4-g485f703
Manuel Prinz
debian at pinguinkiste.de
Sun Jul 20 18:46:17 UTC 2008
The following commit has been merged in the master branch:
commit 53f7d702b1a0ffc4d62f6d7044019108d2fe0889
Author: Manuel Prinz <debian at pinguinkiste.de>
Date: Sun Jul 20 19:17:56 2008 +0200
Replaced patch file by a sed call
diff --git a/debian/changelog b/debian/changelog
index cd20271..44ba170 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+findimagedupes (2.11-3) UNRELEASED; urgency=low
+
+ * Replaced the patch file by a sed call in debian/rules
+
+ -- Manuel Prinz <debian at pinguinkiste.de> Sun, 20 Jul 2008 19:11:52 +0200
+
findimagedupes (2.11-2) unstable; urgency=low
[ Andreas Tille ]
diff --git a/debian/control b/debian/control
index 280f16b..438f0b2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
DM-Upload-Allowed: yes
Uploaders: Andreas Tille <tille at debian.org>, Manuel Prinz <debian at pinguinkiste.de>
-Build-Depends: cdbs (>= 0.4.23-1.1), patchutils (>= 0.2.25), debhelper (>= 5),
- libfile-mimeinfo-perl, libgraphics-magick-perl, libinline-perl
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), libfile-mimeinfo-perl, libgraphics-magick-perl, libinline-perl
Standards-Version: 3.8.0
Vcs-Browser: http://git.debian.org/?p=debian-science/packages/findimagedupes.git
Vcs-Git: git://git.debian.org/git/debian-science/packages/findimagedupes.git
diff --git a/debian/patches/findimagedupes.diff b/debian/patches/findimagedupes.diff
deleted file mode 100644
index c2ea5d8..0000000
--- a/debian/patches/findimagedupes.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- findimagedupes.orig 2006-09-19 17:58:38.000000000 +0200
-+++ findimagedupes 2006-09-19 22:54:22.000000000 +0200
-@@ -37,7 +37,7 @@
- use Inline
- C => 'DATA',
- NAME => 'findimagedupes',
-- DIRECTORY => '/usr/local/lib/findimagedupes';
-+ DIRECTORY => '/usr/lib/findimagedupes';
-
- # ----------------------------------------------------------------------
- #
diff --git a/debian/rules b/debian/rules
index 8a59b29..84ae00b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
pkg:=findimagedupes
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/debhelper.mk
# include /usr/share/cdbs/1/class/perlmodule.mk
@@ -14,6 +13,7 @@ clean::
rm -fr ./$(pkg)_tmp ./tmp findimagedupes.1
build/findimagedupes::
+ sed -i "s?/usr/local/lib/$(pkg)?/usr/lib/$(pkg)?g" $(pkg)
sed "s?/usr/lib/$(pkg)?./tmp?g" $(pkg) > $(pkg)_tmp
mkdir -p ./tmp
chmod 755 $(pkg)_tmp
--
findimagedupes
More information about the debian-science-commits
mailing list