[SCM] pd-iemnet/master: Removed patches applied upstream

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Thu Sep 3 19:45:44 UTC 2015


The following commit has been merged in the master branch:
commit ad302d055f3cedb2dbd3e380f52aed19e449b226
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Thu Sep 3 15:50:49 2015 +0200

    Removed patches applied upstream

diff --git a/debian/patches/fix_makefile.patch b/debian/patches/fix_makefile.patch
deleted file mode 100644
index 1025809..0000000
--- a/debian/patches/fix_makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: fixes bugy install target in upstream's Makefile
-Author: IOhannes m zmoelnig <zmoelnig at iem.at>
-Forwarded: http://pure-data.svn.sourceforge.net/viewvc/pure-data?view=revision&revision=14239
---- pd-iemnet.orig/Makefile
-+++ pd-iemnet/Makefile
-@@ -187,8 +187,7 @@
- 		$(INSTALL_FILE) $(PDOBJECTS:.pd=-help.pd) \
- 			$(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
- 	$(INSTALL_FILE) README.txt $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/README.txt
--	$(INSTALL_FILE) VERSION.txt $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/VERSION.txt
--	$(INSTALL_FILE) CHANGES.txt $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/CHANGES.txt
-+	$(INSTALL_FILE) ChangeLog $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/CHANGES.txt
- 
- 
- clean:
diff --git a/debian/patches/fix_spelling.patch b/debian/patches/fix_spelling.patch
deleted file mode 100644
index 3a767f6..0000000
--- a/debian/patches/fix_spelling.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: fix spelling/grammar/...
-Author: IOhannes m zmölnig
-Last-Update: 2015-05-21
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- pd-iemnet.orig/ChangeLog
-+++ pd-iemnet/ChangeLog
-@@ -199,7 +199,7 @@
- 
- 2010-08-09 09:22  zmoelnig
- 
--	* iemnet_data.c: allow to resize NULL-floatlists
-+	* iemnet_data.c: allow resizing of NULL-floatlists
- 	  
- 	  trying to resize a NULL-floatlist, will create a new one with the
- 	  required size
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
deleted file mode 100644
index cdcd865..0000000
--- a/debian/patches/hardening.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: IOhannes m zmölnig
-Description: use *FLAGS from outside to enable hardening
-Last-Update: 2012-06-25
---- pd-iemnet.orig/Makefile
-+++ pd-iemnet/Makefile
-@@ -56,8 +56,8 @@
- INSTALL_LIB     = $(INSTALL) -p -m 644 -s
- INSTALL_DIR     = $(INSTALL) -p -m 755 -d
- 
--CFLAGS = -DPD -DLIBRARY_VERSION=\"$(LIBRARY_VERSION)\" -I$(PD_PATH)/src -Wall -W -Wno-unused -g 
--LDFLAGS =  
-+CFLAGS += $(CPPFLAGS) -DPD -DLIBRARY_VERSION=\"$(LIBRARY_VERSION)\" -I$(PD_PATH)/src -Wall -W -Wno-unused -g 
-+LDFLAGS +=  
- LIBS = 
- ALLSOURCES := $(SOURCES) $(SOURCES_android) $(SOURCES_cygwin) $(SOURCES_macosx) \
- 	         $(SOURCES_iphoneos) $(SOURCES_linux) $(SOURCES_windows)
diff --git a/debian/patches/hurd_fixes.patch b/debian/patches/hurd_fixes.patch
deleted file mode 100644
index a656a9f..0000000
--- a/debian/patches/hurd_fixes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: allow for Debian GNU/HURD compilation
-Author: IOhannes m zmölnig
-Applied-Upstream: http://pure-data.svn.sourceforge.net/viewvc/pure-data?revision=14573&view=revision
-
---- pd-iemnet.orig/Makefile
-+++ pd-iemnet/Makefile
-@@ -110,6 +110,20 @@
-   DISTDIR=$(LIBRARY_NAME)-$(LIBRARY_VERSION)
-   DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m)
- endif
-+ifeq ($(UNAME),GNU)
-+  # GNU/Hurd, should work like GNU/Linux for basically all externals
-+  CPU := $(shell uname -m)
-+  SOURCES += $(SOURCES_linux)
-+  EXTENSION = pd_linux
-+  OS = linux
-+  PD_PATH = /usr
-+  OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
-+  CFLAGS += -fPIC
-+  LDFLAGS += -Wl,--export-dynamic  -shared -fPIC
-+  LIBS += -lc
-+  STRIP = strip --strip-unneeded -R .note -R .comment
-+  DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m)
-+endif
- ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
-   SOURCES += $(SOURCES_cygwin)
-   EXTENSION = dll
diff --git a/debian/patches/kfreebsd_fixes.patch b/debian/patches/kfreebsd_fixes.patch
deleted file mode 100644
index f1272c7..0000000
--- a/debian/patches/kfreebsd_fixes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: allow for Debian GNU/kFreeBSD compilation
-Author: IOhannes m zmölnig
-Applied-Upstream: http://pure-data.svn.sourceforge.net/viewvc/pure-data?revision=14573&view=revision
-
---- pd-iemnet.orig/Makefile
-+++ pd-iemnet/Makefile
-@@ -124,6 +124,20 @@
-   STRIP = strip --strip-unneeded -R .note -R .comment
-   DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m)
- endif
-+ifeq ($(UNAME),GNU/kFreeBSD)
-+  # Debian GNU/kFreeBSD, should work like GNU/Linux for basically all externals
-+  CPU := $(shell uname -m)
-+  SOURCES += $(SOURCES_linux)
-+  EXTENSION = pd_linux
-+  OS = linux
-+  PD_PATH = /usr
-+  OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
-+  CFLAGS += -fPIC
-+  LDFLAGS += -Wl,--export-dynamic  -shared -fPIC
-+  LIBS += -lc
-+  STRIP = strip --strip-unneeded -R .note -R .comment
-+  DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m)
-+endif
- ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
-   SOURCES += $(SOURCES_cygwin)
-   EXTENSION = dll
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 963b3b4..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-fix_spelling.patch
-fix_makefile.patch
-hurd_fixes.patch
-kfreebsd_fixes.patch
-hardening.patch

-- 
pd-iemnet packaging



More information about the pkg-multimedia-commits mailing list