[SCM] stk/master: Properly split 01 and 02 patches

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Fri Sep 12 02:17:43 UTC 2014


The following commit has been merged in the master branch:
commit 3ea68c3da559b0297db37017d91401bf38de83d4
Author: Felipe Sateler <fsateler at debian.org>
Date:   Tue Jun 10 10:36:57 2014 -0400

    Properly split 01 and 02 patches

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index 2acb37c..395de14 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -44,17 +44,6 @@ Forwarded: no
 -	$(RM) Makefile
 \ No newline at end of file
 +	$(RM) Makefile
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -6,7 +6,7 @@ REALTIME = @realtime@
- 
- all :
- 	cd src && $(MAKE)
--	cd projects/demo && $(MAKE) libdemo
-+	cd projects/demo && $(MAKE) demo
- ifeq ($(REALTIME),yes)
- 	cd projects/effects && $(MAKE) libeffects
- 	cd projects/ragamatic && $(MAKE) libragamat
 --- a/configure
 +++ b/configure
 @@ -4495,9 +4495,9 @@ case $host_os in *\ *) host_os=`echo "$h
diff --git a/debian/patches/02-stk-demo.patch b/debian/patches/02-stk-demo.patch
index d308331..6843927 100644
--- a/debian/patches/02-stk-demo.patch
+++ b/debian/patches/02-stk-demo.patch
@@ -4,7 +4,7 @@
  
  all :
  	cd src && $(MAKE)
--	cd projects/demo && $(MAKE) demo
+-	cd projects/demo && $(MAKE) libdemo
 +	cd projects/demo && $(MAKE) stk-demo
  ifeq ($(REALTIME),yes)
  	cd projects/effects && $(MAKE) libeffects

-- 
stk packaging



More information about the pkg-multimedia-commits mailing list