Imported Debian patch 1.6.2-4

parent 7fee29e1
jdupes for Debian
-----------------
jdupes can be compiled with the -DENABLE_BTRFS to add support to btrfs
filesystem. However, this option uses the file linux/btrfs.h, not available
for hurd-i386 and kfreebsd-*. So, jdupes has support to btrfs in all Linux
based architectures only.
-- Joao Eriberto Mota Filho <eriberto@debian.org> Mon, 02 Jan 2016 23:38:04 -0200
jdupes for Debian
-----------------
jdupes can be compiled with the -DENABLE_BTRFS to add support to btrfs
filesystem. However, this option uses the file linux/btrfs.h, not available
for hurd-i386 and kfreebsd-*.
My intent when packaging jdupes was provide a program to convert duplicate
files in relative symlinks, to help Debian packagers to kill the lintian
'duplicate-files'[1][2].
Considering all facts, I want make jdupes available in all architectures,
which make -DENABLE_BTRFS inviable. The solution for this issue was create
an extra package with an extra executable, called jdupes-btrfs, specific
for linux-any architectures, keeping jdupes (without btrfs) alive in all
architectures.
[1] https://lintian.debian.org/tags/duplicate-files.html
[2] https://wiki.debian.org/dedup.debian.net
-- Joao Eriberto Mota Filho <eriberto@debian.org> Wed, 14 Dec 2016 17:10:04 -0200
jdupes (1.6.2-4) experimental; urgency=medium
* Using a single package again, as suggested by Christoph Anton Mitterer
<calestyo@scientia.net>. It will solve #848360 when uploaded to Sid.
Consequently:
- Changed debian/rules to build with BTRFS when over Linux.
- Removed debian/jdupes.install and debian/jdupes-btrfs.*
- Renamed debian/jdupes.docs to debian/docs.
- Renamed debian/README.source to debian/README.Debian. Updated all
information.
* debian/control:
- Added a Conflicts, Provides and Replaces fields to uninstall any
jdupes-btrfs from the system.
- Improved the description.
- Removed the package jdupes-btrfs.
* debian/copyright: updated the packaging copyright years.
* debian/patches/10_use-program-name-variable.patch.txt: a mistake. Removed.
-- Joao Eriberto Mota Filho <eriberto@debian.org> Mon, 02 Jan 2017 19:52:54 -0200
jdupes (1.6.2-3) unstable; urgency=medium
* debian/rules: added a condition to select when jdupes-btrfs will
......
......@@ -11,7 +11,10 @@ Vcs-Browser: https://anonscm.debian.org/git/collab-maint/jdupes.git
Package: jdupes
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: identify and delete duplicate files
Provides: jdupes-btrfs
Conflicts: jdupes-btrfs
Replaces: jdupes-btrfs
Description: identify and delete or link duplicate files
jdupes is a program based in fdupes. The main goal of jdupes is identify
and taking actions upon duplicate files. In comparison with fdupes, jdupes
is heavily modified from and improved.
......@@ -33,33 +36,6 @@ Description: identify and delete duplicate files
jdupes can convert duplicate files in hardlinks or relative softlinks. It
is useful in several scenarios, as in Debian packaging, to create relative
symlinks to lots of duplicate files (it will substitute rdfind + symlinks
commands, used to same purpose).
Package: jdupes-btrfs
Architecture: linux-any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: identify and delete duplicate files - btrfs support
jdupes is a program based in fdupes. The main goal of jdupes is identify
and taking actions upon duplicate files. In comparison with fdupes, jdupes
is heavily modified from and improved.
.
The biggest reason to use jdupes is raw speed. In testing on various data
sets, jdupes is over 7 times faster than fdupes-1.51 on average.
.
Code in jdupes is written with data loss avoidance as the highest priority.
If a choice must be made between being aggressive or careful, the careful
way is always chosen.
.
jdupes includes features that are not found in fdupes. Examples of such
features include btrfs block-level deduplication and control over which
file is kept when a match set is automatically deleted. jdupes is not
afraid of dropping features of low value; a prime example is the -1 switch
which outputs all matches in a set on one line, a feature which was found
to be useless in real-world tests and therefore thrown out.
.
jdupes can convert duplicate files in hardlinks or relative softlinks. It
is useful in several scenarios, as in Debian packaging, to create relative
symlinks to lots of duplicate files (it will substitute rdfind + symlinks
commands, used to same purpose).
commands, used to same purpose, when solving lintian duplicate-files).
.
This package provides additional support to btrfs filesystem.
Packages build for Linux versions have support to btrfs filesystem.
......@@ -26,7 +26,7 @@ Copyright: 2016 Jody Bruchon <jody@jodybruchon.com>
License: MIT or GPL-2 or GPL-3
Files: debian/*
Copyright: 2016 Joao Eriberto Mota Filho <eriberto@debian.org>
Copyright: 2016-2017 Joao Eriberto Mota Filho <eriberto@debian.org>
License: MIT
License: MIT
......
debian/build-jdupes-btrfs/jdupes-btrfs usr/bin
debian/build-jdupes-btrfs/jdupes-btrfs.1
Description: use PROGRAM_NAME variable instead of jdupes.
Author: Joao Eriberto Mota Filho <eriberto@debian.org>
Last-Update: 2016-12-14
Index: jdupes-1.6.2/Makefile
===================================================================
--- jdupes-1.6.2.orig/Makefile
+++ jdupes-1.6.2/Makefile
@@ -103,15 +103,15 @@ OBJECT_FILES += jdupes.o jody_hash.o jod
all: jdupes
jdupes: $(OBJECT_FILES)
- $(CC) $(CFLAGS) $(LDFLAGS) -o jdupes $(OBJECT_FILES)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROGRAM_NAME) $(OBJECT_FILES)
installdirs:
test -d $(DESTDIR)$(BIN_DIR) || $(MKDIR) $(DESTDIR)$(BIN_DIR)
test -d $(DESTDIR)$(MAN_DIR) || $(MKDIR) $(DESTDIR)$(MAN_DIR)
install: jdupes installdirs
- $(INSTALL_PROGRAM) jdupes $(DESTDIR)$(BIN_DIR)/$(PROGRAM_NAME)
- $(INSTALL_DATA) jdupes.1 $(DESTDIR)$(MAN_DIR)/$(PROGRAM_NAME).$(MAN_EXT)
+ $(INSTALL_PROGRAM) $(PROGRAM_NAME) $(DESTDIR)$(BIN_DIR)/$(PROGRAM_NAME)
+ $(INSTALL_DATA) $(PROGRAM_NAME).1 $(DESTDIR)$(MAN_DIR)/$(PROGRAM_NAME).$(MAN_EXT)
clean:
- $(RM) $(OBJECT_FILES) jdupes jdupes.exe *~ *.gcno *.gcda *.gcov
+ $(RM) $(OBJECT_FILES) $(PROGRAM_NAME) jdupes.exe *~ *.gcno *.gcda *.gcov
......@@ -3,23 +3,12 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export BUILD-BTRFS=debian/build-jdupes-btrfs
ifeq ($(DEB_HOST_ARCH_OS),linux)
export OPTS="ENABLE_BTRFS=1"
endif
%:
dh $@
override_dh_auto_clean:
dh_auto_clean
rm -rf $(BUILD-BTRFS)
override_dh_auto_build:
# Build jdupes
dh_auto_build
ifneq "" "$(filter jdupes-btrfs,$(shell dh_listpackages))"
# Build jdupes-btrfs:
mkdir $(BUILD-BTRFS)
cp *.c *.h Makefile $(BUILD-BTRFS)
cp jdupes.1 $(BUILD-BTRFS)/jdupes-btrfs.1
dh_auto_build --sourcedirectory=$(BUILD-BTRFS) -- PROGRAM_NAME=jdupes-btrfs ENABLE_BTRFS=1
endif
dh_auto_build -- $(OPTS)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment