From: IOhannes m zmölnig <zmoelnig@umlautQ.umlaeute.mur.at>
Date: Thu, 28 Apr 2016 20:29:45 +0000 (+0200)
Subject: More introjucer -> projucer renaming
X-Git-Tag: archive/raspbian/5.4.5_ds0-1+rpi1~1^2~221
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9a5f7b70bb608b27d7f6e864df3e8d975eeadc44;p=juce.git

More introjucer -> projucer renaming
---

diff --git a/debian/introjucer.install b/debian/introjucer.install
deleted file mode 100644
index c7867d1c..00000000
--- a/debian/introjucer.install
+++ /dev/null
@@ -1,3 +0,0 @@
-extras/Projucer/Builds/LinuxMakefile/build/Projucer	usr/bin
-debian/libbuilder/build/juce.png		usr/share/pixmaps/
-debian/Projucer.desktop 			usr/share/applications/
diff --git a/debian/introjucer.mime b/debian/introjucer.mime
deleted file mode 100644
index 643f3da6..00000000
--- a/debian/introjucer.mime
+++ /dev/null
@@ -1 +0,0 @@
-application/x-juce; Projucer '%s'; edit=Projucer '%s'; test=test "$DISPLAY" != ""; priority=2
diff --git a/debian/introjucer.sharedmimeinfo b/debian/introjucer.sharedmimeinfo
deleted file mode 100644
index 043dfa0b..00000000
--- a/debian/introjucer.sharedmimeinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-juce">
-    <sub-class-of type="text/xml"/>
-    <comment>JUCE project</comment>
-    <glob pattern="*.jucer"/>
-  </mime-type>
-</mime-info>
diff --git a/debian/libbuilder/Makefile b/debian/libbuilder/Makefile
index 2a6d68d1..18cdd0c0 100644
--- a/debian/libbuilder/Makefile
+++ b/debian/libbuilder/Makefile
@@ -14,7 +14,7 @@ empty=
 JUCE_PATH=../..
 MODULES_PATH=$(JUCE_PATH)/modules
 DEMO_PATH       = $(JUCE_PATH)/examples/Demo/Builds/Linux/
-INTROJUCER_PATH = $(JUCE_PATH)/extras/Projucer/Builds/LinuxMakefile/
+PROJUCER_PATH = $(JUCE_PATH)/extras/Projucer/Builds/LinuxMakefile/
 
 SOURCES=juce_audio_basics.cpp \
 	juce_audio_devices.cpp \
@@ -114,9 +114,9 @@ JUCE_LDFLAGS += \
 OBJECTS_RELEASE=$(SOURCES:%.cpp=$(OBJDIR_RELEASE)/%.o)
 OBJECTS_DEBUG=$(SOURCES:%.cpp=$(OBJDIR_DEBUG)/%.o)
 
-.PHONY: all clean install install-lib-release install-lib-debug install-headers install-pkgconfig introjucer
+.PHONY: all clean install install-lib-release install-lib-debug install-headers install-pkgconfig projucer
 
-all: $(TARGET) introjucer
+all: $(TARGET) projucer
 
 $(OBJDIR_RELEASE)/dir_stamp $(OBJDIR_DEBUG)/dir_stamp:
 	@mkdir -p $(dir $@)
@@ -143,7 +143,7 @@ $(OUTDIR)/libjuce_builddate.h:
 clean:
 	@echo Cleaning JUCE
 	rm -rf build
-	$(MAKE) -C $(INTROJUCER_PATH) clean
+	$(MAKE) -C $(PROJUCER_PATH) clean
 
 install-lib-release: $(OUTDIR)/$(TARGET_RELEASE)
 	@echo Installing $(TARGET_RELEASE)
@@ -173,8 +173,8 @@ install: install-headers install-lib-release install-lib-debug install-pkgconfig
 
 -include $(OBJECTS:%.o=%.d)
 
-introjucer: $(OUTDIR)/$(TARGET_RELEASE)
-	$(MAKE) -C $(INTROJUCER_PATH) CONFIG=Release CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+projucer: $(OUTDIR)/$(TARGET_RELEASE)
+	$(MAKE) -C $(PROJUCER_PATH) CONFIG=Release CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 $(OUTDIR)/juce-dbg.pc $(OUTDIR)/juce.pc: juce.pc.in
 	sed \
diff --git a/debian/patches/projucer-makegenerator.patch b/debian/patches/projucer-makegenerator.patch
index a3d13103..93092577 100644
--- a/debian/patches/projucer-makegenerator.patch
+++ b/debian/patches/projucer-makegenerator.patch
@@ -1,7 +1,7 @@
-Description: introjucer fixes
- introjucer creates Linux Makefiles, but they do silent builds and do not allow
+Description: projucer fixes
+ projucer creates Linux Makefiles, but they do silent builds and do not allow
  to override CPP/C/CXXFLAGS.
- this patch changes introjucer to honor the "V" build variable, so "V=1" will
+ this patch changes projucer to honor the "V" build variable, so "V=1" will
  build verbosely.
  it also renames *FLAGS to JUCE_*FLAGS and appends the ordinary *FLAGS to them.
  .
diff --git a/debian/projucer.install b/debian/projucer.install
new file mode 100644
index 00000000..c7867d1c
--- /dev/null
+++ b/debian/projucer.install
@@ -0,0 +1,3 @@
+extras/Projucer/Builds/LinuxMakefile/build/Projucer	usr/bin
+debian/libbuilder/build/juce.png		usr/share/pixmaps/
+debian/Projucer.desktop 			usr/share/applications/
diff --git a/debian/projucer.mime b/debian/projucer.mime
new file mode 100644
index 00000000..643f3da6
--- /dev/null
+++ b/debian/projucer.mime
@@ -0,0 +1 @@
+application/x-juce; Projucer '%s'; edit=Projucer '%s'; test=test "$DISPLAY" != ""; priority=2
diff --git a/debian/projucer.sharedmimeinfo b/debian/projucer.sharedmimeinfo
new file mode 100644
index 00000000..043dfa0b
--- /dev/null
+++ b/debian/projucer.sharedmimeinfo
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-juce">
+    <sub-class-of type="text/xml"/>
+    <comment>JUCE project</comment>
+    <glob pattern="*.jucer"/>
+  </mime-type>
+</mime-info>
diff --git a/debian/scripts/Projucer-help2man b/debian/scripts/Projucer-help2man
index cfce4395..6e955d04 100755
--- a/debian/scripts/Projucer-help2man
+++ b/debian/scripts/Projucer-help2man
@@ -1,5 +1,5 @@
 #!/bin/sh
-INTROJUCER=$(pwd)/extras/Projucer/Builds/Linux/build/Projucer
+PROJUCER=$(pwd)/extras/Projucer/Builds/Linux/build/Projucer
 LIBJUCE_PATH=$(pwd)/debian/libbuilder/build
 
 if [ -d "${LIBJUCE_PATH}" ]; then
@@ -7,11 +7,11 @@ if [ -d "${LIBJUCE_PATH}" ]; then
  export LD_LIBRARY_PATH
 fi
 
-#INTROJUCER=Projucer
+#PROJUCER=Projucer
 
 case "$1" in
   -h|--help)
-    #${INTROJUCER} -h 2>/dev/null | sed -e 's|^ Projucer --| --|'
+    #${PROJUCER} -h 2>/dev/null | sed -e 's|^ Projucer --| --|'
     cat <<EOL
 Usage: Projucer [--help] [options]
 
@@ -27,7 +27,7 @@ Generic Options:
 EOL
     ;;
   -v|-V|--version)
-    #${INTROJUCER} -h
+    #${PROJUCER} -h
 cat <<EOL
 JUCE
 Copyright © ROLI Ltd.