From 15d47b8c66eaf0d7d7225d28123bffc30fa7b809 Mon Sep 17 00:00:00 2001
From: James Duley <jagduley@gmail.com>
Date: Thu, 21 May 2015 15:20:44 +0100
Subject: [PATCH] OP-1879 Remove openpilot hardcoding: make debian package use
 OP name variables

---
 package/Linux.mk                    | 25 ++++++++++++++++---------
 package/linux/debian/changelog      |  2 +-
 package/linux/debian/control        |  4 ++--
 package/linux/debian/openpilot.udev |  1 -
 4 files changed, 19 insertions(+), 13 deletions(-)
 delete mode 120000 package/linux/debian/openpilot.udev

diff --git a/package/Linux.mk b/package/Linux.mk
index d57727b57..7e88aab5b 100644
--- a/package/Linux.mk
+++ b/package/Linux.mk
@@ -16,7 +16,7 @@ DEB_REV              := 1
 ifeq ($(DEB_DIST), trusty)
 DEB_REV              := $(DEB_REV)$(DEB_DIST)1
 endif
-DEB_NAME             := openpilot
+DEB_NAME             := $(OP_SMALL_NAME)
 DEB_ORIG_SRC         := $(PACKAGE_DIR)/$(DEB_NAME)_$(UPSTREAM_VER).orig.tar.gz
 DEB_PACKAGE_DIR      := $(PACKAGE_DIR)/$(DEB_NAME)-$(UPSTREAM_VER)
 DEB_ARCH             := $(shell dpkg --print-architecture)
@@ -24,7 +24,12 @@ DEB_PACKAGE_NAME     := $(DEB_NAME)_$(UPSTREAM_VER)-$(DEB_REV)_$(DEB_ARCH)
 DEB_DIR              := package/linux/debian
 
 SED_DATE_STRG         = $(shell date -R)
-SED_SCRIPT            = s/<VERSION>/$(UPSTREAM_VER)-$(DEB_REV)/;s/<DATE>/$(SED_DATE_STRG)/;s/<DIST>/$(DEB_DIST)/
+SED_SCRIPT            = sed -i -e ' \
+			s/<VERSION>/$(UPSTREAM_VER)-$(DEB_REV)/g; \
+			s/<DATE>/$(SED_DATE_STRG)/g; \
+			s/<DIST>/$(DEB_DIST)/g; \
+			s/<NAME>/$(DEB_NAME)/g; \
+			'
 
 # Ubuntu 14.04 (Trusty Tahr) has different names for the qml-modules
 TRUSTY_DEPS_SED      := s/qml-module-qtquick-controls/qtdeclarative5-controls-plugin/g; \
@@ -51,8 +56,9 @@ package: debian
 .PHONY: debian
 debian: $(DEB_DIR)
 	$(V1) rm -rf debian
-	$(V1) cp -rL $(DEB_DIR) debian
-	$(V1) sed -i -e "$(SED_SCRIPT)" debian/changelog
+	$(V1) cp -r $(DEB_DIR) debian
+	$(V1) cp -T package/linux/45-openpilot-permissions.rules debian/$(DEB_NAME).udev
+	$(V1) $(SED_SCRIPT) debian/changelog debian/control
 ifeq ($(DEB_DIST), trusty)
 	$(V1) sed -i -e "$(TRUSTY_DEPS_SED)" debian/control
 endif
@@ -93,10 +99,11 @@ install:
 	$(V1) $(MKDIR) -p $(DESTDIR)$(datadir)/applications
 	$(V1) $(MKDIR) -p $(DESTDIR)$(datadir)/pixmaps
 	$(V1) $(MKDIR) -p $(DESTDIR)$(udevdir)
-	$(V1) $(INSTALL) $(BUILD_DIR)/openpilotgcs_$(GCS_BUILD_CONF)/bin/openpilotgcs $(DESTDIR)$(bindir)
-	$(V1) $(INSTALL) $(BUILD_DIR)/openpilotgcs_$(GCS_BUILD_CONF)/lib/openpilotgcs $(DESTDIR)$(libdir)
-	$(V1) $(INSTALL) $(BUILD_DIR)/openpilotgcs_$(GCS_BUILD_CONF)/share/openpilotgcs $(DESTDIR)$(datadir)
-	$(V1) $(INSTALL) $(ROOT_DIR)/package/linux/openpilot.desktop $(DESTDIR)$(datadir)/applications
-	$(V1) $(INSTALL) $(ROOT_DIR)/package/linux/openpilot.png $(DESTDIR)$(datadir)/pixmaps
+	$(V1) $(INSTALL) $(BUILD_DIR)/$(GCS_SMALL_NAME)_$(GCS_BUILD_CONF)/bin/$(GCS_SMALL_NAME) $(DESTDIR)$(bindir)
+	$(V1) $(INSTALL) $(BUILD_DIR)/$(GCS_SMALL_NAME)_$(GCS_BUILD_CONF)/lib/$(GCS_SMALL_NAME) $(DESTDIR)$(libdir)
+	$(V1) $(INSTALL) $(BUILD_DIR)/$(GCS_SMALL_NAME)_$(GCS_BUILD_CONF)/share/$(GCS_SMALL_NAME) $(DESTDIR)$(datadir)
+	$(V1) $(INSTALL) -T $(ROOT_DIR)/package/linux/openpilot.desktop $(DESTDIR)$(datadir)/applications/$(OP_SMALL_NAME).desktop
+	$(V1) sed -i -e 's/openpilotgcs/$(GCS_SMALL_NAME)/g;s/OpenPilot GCS/$(GCS_BIG_NAME)/g' $(DESTDIR)$(datadir)/applications/$(OP_SMALL_NAME).desktop
+	$(V1) $(INSTALL) -T $(ROOT_DIR)/package/linux/openpilot.png $(DESTDIR)$(datadir)/pixmaps/$(OP_SMALL_NAME).png
 
 
diff --git a/package/linux/debian/changelog b/package/linux/debian/changelog
index fb139a1f1..4cff7b219 100644
--- a/package/linux/debian/changelog
+++ b/package/linux/debian/changelog
@@ -1,4 +1,4 @@
-openpilot (<VERSION>) <DIST>; urgency=low
+<NAME> (<VERSION>) <DIST>; urgency=low
 
   * Release from upstream Git repository
 
diff --git a/package/linux/debian/control b/package/linux/debian/control
index db02e54a7..34ecfbb4e 100644
--- a/package/linux/debian/control
+++ b/package/linux/debian/control
@@ -1,4 +1,4 @@
-Source: openpilot
+Source: <NAME>
 Section: electronics
 Priority: optional
 Maintainer: James Duley <james@openpilot.org>
@@ -8,7 +8,7 @@ Homepage: http://www.openpilot.org
 Vcs-Git: git://git.openpilot.org/OpenPilot.git
 Vcs-Browser: http://git.openpilot.org/changelog/OpenPilot
 
-Package: openpilot
+Package: <NAME>
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, qml-module-qtquick-controls, qml-module-qtquick-dialogs, qml-module-qtquick-xmllistmodel, qml-module-qtquick-localstorage, qml-module-qtquick-particles2, qml-module-qtquick-window2, qml-module-qtquick2
 Description: OpenPilot GCS
diff --git a/package/linux/debian/openpilot.udev b/package/linux/debian/openpilot.udev
deleted file mode 120000
index 8f7360cfa..000000000
--- a/package/linux/debian/openpilot.udev
+++ /dev/null
@@ -1 +0,0 @@
-../45-openpilot-permissions.rules
\ No newline at end of file