Upgrading to GitLab 11.10.0. Expect errors and see debian-infrastructure-announce@lists.debian.org for further information.

Imported Debian patch 1.6.2-3

parent f3674f0e
jdupes (1.6.2-3) unstable; urgency=medium
* debian/rules: added a condition to select when jdupes-btrfs will
be built or not, fixing a FTBFS in Hurd/kFreeBSD-*. Thanks a lot
to Aaron M. Ucko <ucko@debian.org>. (Closes: #848244)
-- Joao Eriberto Mota Filho <eriberto@debian.org> Thu, 15 Dec 2016 14:05:21 -0200
jdupes (1.6.2-2) unstable; urgency=medium
* Created a new binary: jdupes-btrfs. See debian/README.source in source code
......
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
......@@ -16,8 +16,10 @@ 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
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