[SCM] rem/master: Unfuzz patch 2001.

js at users.alioth.debian.org js at users.alioth.debian.org
Sun May 21 14:11:53 UTC 2017


The following commit has been merged in the master branch:
commit 96325db8477bf794dddb92b593d4e8e06af2bb6b
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun May 21 16:05:05 2017 +0200

    Unfuzz patch 2001.

diff --git a/debian/patches/2001_unhide_build_rules.patch b/debian/patches/2001_unhide_build_rules.patch
index 04f7e64..e8412e1 100644
--- a/debian/patches/2001_unhide_build_rules.patch
+++ b/debian/patches/2001_unhide_build_rules.patch
@@ -8,14 +8,14 @@ Last-Update: 2016-01-16
 --- a/Makefile
 +++ b/Makefile
 @@ -81,15 +81,13 @@
-
-
+ 
+ 
  $(SHARED): $(OBJS)
 -	@echo "  LD      $@"
 -	@$(LD) $(LFLAGS) $(SH_LFLAGS) $^ -L$(LIBRE_SO) -lre $(LIBS) -o $@
 +	$(LD) $(LFLAGS) $(SH_LFLAGS) $^ -L$(LIBRE_SO) -lre $(LIBS) -o $@
-
-
+ 
+ 
  $(STATIC): $(OBJS)
 -	@echo "  AR      $@"
 -	@$(AR) $(AFLAGS) $@ $^
@@ -24,36 +24,36 @@ Last-Update: 2016-01-16
 -	@$(RANLIB) $@
 +	$(RANLIB) $@
  endif
-
+ 
  librem.pc:
 @@ -107,27 +105,25 @@
  	@echo 'Cflags: -I$${includedir}' >> librem.pc
-
+ 
  $(BUILD)/%.o: src/%.c $(BUILD) Makefile $(MK) $(MODMKS)
 -	@echo "  CC      $@"
 -	@$(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
 +	$(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
-
-
+ 
+ 
  $(BUILD)/%.o: src/%.S $(BUILD) Makefile $(MK) $(MODMKS)
 -	@echo "  AS      $@"
 -	@$(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
 +	$(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
-
-
+ 
+ 
  $(BUILD): Makefile $(MK) $(MODMKS)
 -	@mkdir -p $(patsubst %,$(BUILD)/%,$(sort $(dir $(SRCS))))
 -	@touch $@
 +	mkdir -p $(patsubst %,$(BUILD)/%,$(sort $(dir $(SRCS))))
 +	touch $@
-
-
+ 
+ 
  .PHONY: clean
  clean:
 -	@rm -rf $(SHARED) $(STATIC) librem.pc test.d test.o test $(BUILD)
 +	rm -rf $(SHARED) $(STATIC) librem.pc test.d test.o test $(BUILD)
-
-
+ 
+ 
  install: $(SHARED) $(STATIC) librem.pc
 -	@mkdir -p $(DESTDIR)$(LIBDIR) $(DESTDIR)$(LIBDIR)/pkgconfig \
 +	mkdir -p $(DESTDIR)$(LIBDIR) $(DESTDIR)$(LIBDIR)/pkgconfig \
@@ -61,7 +61,7 @@ Last-Update: 2016-01-16
  	$(INSTALL) -m 0644 $(shell find include -name "*.h") \
  		$(DESTDIR)$(INCDIR)
 @@ -137,17 +133,15 @@
-
+ 
  .PHONY: uninstall
  uninstall:
 -	@rm -rf $(DESTDIR)$(INCDIR)
@@ -72,14 +72,14 @@ Last-Update: 2016-01-16
 +	rm -f $(DESTDIR)$(LIBDIR)/$(SHARED)
 +	rm -f $(DESTDIR)$(LIBDIR)/$(STATIC)
 +	rm -f $(DESTDIR)$(LIBDIR)/pkgconfig/librem.pc
-
+ 
  -include test.d
-
+ 
  test.o:	test.c
 -	@echo "  CC      $@"
 -	@$(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
 +	$(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
-
+ 
  test$(BIN_SUFFIX): test.o $(SHARED) $(STATIC)
 -	@echo "  LD      $@"
 -	@$(LD) $(LFLAGS) $< -L. -lrem -lre $(LIBS) -o $@

-- 
rem packaging



More information about the pkg-multimedia-commits mailing list