[SCM] rem/master: Fix reorder patches.

js at users.alioth.debian.org js at users.alioth.debian.org
Fri Sep 29 23:54:06 UTC 2017


The following commit has been merged in the master branch:
commit 9b5a0a26c3507c862d1ec84633f23b83b0dec62a
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Sep 30 01:46:03 2017 +0200

    Fix reorder patches.

diff --git a/debian/patches/1001_fix_libre_linking.patch b/debian/patches/1001_fix_libre_linking.patch
index e56c0e0..5c3fd3b 100644
--- a/debian/patches/1001_fix_libre_linking.patch
+++ b/debian/patches/1001_fix_libre_linking.patch
@@ -12,12 +12,12 @@ Last-Updated: 2016-03-12
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/Makefile
 +++ b/Makefile
-@@ -81,7 +81,7 @@
- 
+@@ -82,7 +82,7 @@
  
  $(SHARED): $(OBJS)
--	$(LD) $(LFLAGS) $(SH_LFLAGS) $^ -L$(LIBRE_SO) -lre $(LIBS) -o $@
-+	$(LD) $(LFLAGS) $(SH_LFLAGS) $^ -L$(LIBRE_SO) $(LIBS) -lre -o $@
+ 	@echo "  LD      $@"
+-	@$(LD) $(LFLAGS) $(SH_LFLAGS) $^ -L$(LIBRE_SO) -lre $(LIBS) -o $@
++	@$(LD) $(LFLAGS) $(SH_LFLAGS) $^ -L$(LIBRE_SO) $(LIBS) -lre -o $@
  
  
  $(STATIC): $(OBJS)
diff --git a/debian/patches/2001_unhide_build_rules.patch b/debian/patches/2001_unhide_build_rules.patch
index bc5663e..61ddb69 100644
--- a/debian/patches/2001_unhide_build_rules.patch
+++ b/debian/patches/2001_unhide_build_rules.patch
@@ -13,8 +13,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  $(SHARED): $(OBJS)
 -	@echo "  LD      $@"
--	@$(LD) $(LFLAGS) $(SH_LFLAGS) $^ -L$(LIBRE_SO) -lre $(LIBS) -o $@
-+	$(LD) $(LFLAGS) $(SH_LFLAGS) $^ -L$(LIBRE_SO) -lre $(LIBS) -o $@
+-	@$(LD) $(LFLAGS) $(SH_LFLAGS) $^ -L$(LIBRE_SO) $(LIBS) -lre -o $@
++	$(LD) $(LFLAGS) $(SH_LFLAGS) $^ -L$(LIBRE_SO) $(LIBS) -lre -o $@
  
  
  $(STATIC): $(OBJS)
diff --git a/debian/patches/series b/debian/patches/series
index 9e79c7f..5a6d86b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-2001_unhide_build_rules.patch
 1001_fix_libre_linking.patch
+2001_unhide_build_rules.patch

-- 
rem packaging



More information about the pkg-multimedia-commits mailing list