Switch to new dpkg version, remove unused code.

Makefile.am

@@ -9,11 +9,11 @@ distclean-local:
 	@rm -rf src/zscmd/zscmd || true
 	@rm -rf src/prefplug/ZSRelaySettings_ || true
 	@rm -rf src/prefplug/ZSRelaySettings || true
-	@rm -rf src/prefplug/Demo_ || true
-	@rm -rf src/prefplug/Demo || true
+#	@rm -rf src/prefplug/Demo_ || true
+#	@rm -rf src/prefplug/Demo || true
 	@rm -rf src/*/*.app
 	@rm -rf src/*/*.bundle
-	@rm -rf src/prefplug/plugins
+#	@rm -rf src/prefplug/plugins
 
 fakesign: distclean-local all
 if IPHONE_OS_RELEASE2
@@ -24,7 +24,7 @@ if IPHONE_OS_RELEASE2
 	$(SIGNHELPER) src/zsrelay/zsrelay
 	$(SIGNHELPER) src/zscmd/zscmd
 	$(SIGNHELPER) src/prefplug/ZSRelaySettings
-	$(SIGNHELPER) src/prefplug/Demo
+#	$(SIGNHELPER) src/prefplug/Demo
 endif
 
 app-bundle: fakesign
@@ -39,14 +39,15 @@ pref-bundle: app-bundle
 	@mv -f src/prefplug/ZSrelaySettings.bundle/ZSRelaySettings.plist src/prefplug/
 	@rm -r src/prefplug/ZSRelaySettings.bundle/plugins
 	@cp src/prefplug/ZSRelaySettings src/prefplug/ZSRelaySettings.bundle/
-	@echo "Creating plugin 'Demo.bundle'..."
-	@mkdir -p src/prefplug/plugins/Demo.bundle
-	@cp -r $(srcdir)/misc/Prefs/plugins/Demo/* src/prefplug/plugins/Demo.bundle/
-	@cp src/prefplug/Demo src/prefplug/plugins/Demo.bundle/
+#	@echo "Creating plugin 'Demo.bundle'..."
+#	@mkdir -p src/prefplug/plugins/Demo.bundle
+#	@cp -r $(srcdir)/misc/Prefs/plugins/Demo/* src/prefplug/plugins/Demo.bundle/
+#	@cp src/prefplug/Demo src/prefplug/plugins/Demo.bundle/
 
 dist-deb: pref-bundle
-	@cp -f $(srcdir)/debian/{pre,post}{inst,rm} debian/ || true
-	@cp -f $(srcdir)/debian/dirs                debian/ || false
+	@cp -f $(srcdir)/debian/{pre,post}{inst,rm}      debian/ || true
+	@cp -f $(srcdir)/debian/org.bitspin.zsrelay.dirs debian/ || false
+	@cp -f $(srcdir)/debian/compat                   debian/ || false
 	@mkdir -p doc
 	@mkdir -p tools
 	@mkdir -p misc
@@ -62,6 +63,7 @@ dist-deb: pref-bundle
 			      -not -name 'Makefile' -exec cp -l '{}' misc/ ';'
 	@chmod +x debian/rules
 	@chmod +x tools/*
-	@SRCDIR=srcdir dpkg-buildpackage -nc -uc -us -rfakeroot -d
+#@SRCDIR=srcdir dpkg-buildpackage -nc -uc -us -rfakeroot -d
+	@SRCDIR=srcdir dpkg-buildpackage -nc -uc -us -rsudo -b -d
 endif
 

debian/rules.in

@@ -6,8 +6,10 @@
 
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
-
-DEBDESTDIR=`pwd`/debian/tmp/
+export DH_COMPAT=5
+export DH_OPTIONS=-porg.bitspin.zsrelay
+export DEB_HOST_ARCH=@IPHONE_OS_ARCH@
+DEBDESTDIR=`pwd`/debian/org.bitspin.zsrelay
 #`dh_listpackages`/
 ifndef IPHONE_IP
 IPHONE_IP=192.168.2.1
@@ -37,7 +39,7 @@ install: build
 	dh_testdir
 	dh_testroot
 	dh_prep
-	dh_installdirs
+	dh_installdirs -v --all -p`dh_listpackages`
 
 	# Add here commands to install the package into debian/<packagename>.
 	$(MAKE) prefix=$(DEBDESTDIR)/usr install
@@ -46,28 +48,23 @@ install: build
 	install -m 0755 misc/zswrapper $(DEBDESTDIR)/usr/sbin/zsrelay
 	install -m 0755 src/zsrelay/ZSRelay.app/* $(DEBDESTDIR)/Library/ZSRelay/ZSRelay.app/
 
-	cp -r src/prefplug/ZSRelaySettings.bundle/* $(DEBDESTDIR)/System/Library/PreferenceBundles/ZSRelaySettings.bundle/
-	chmod -R 0644 $(DEBDESTDIR)/System/Library/PreferenceBundles/ZSRelaySettings.bundle/
-	chmod    0755 $(DEBDESTDIR)/System/Library/PreferenceBundles/ZSRelaySettings.bundle/ZSRelaySettings
+	cp -r src/prefplug/ZSRelaySettings.bundle/* $(DEBDESTDIR)/Library/PreferenceBundles/ZSRelaySettings.bundle/
+	chmod -R 0644 $(DEBDESTDIR)/Library/PreferenceBundles/ZSRelaySettings.bundle/
+	chmod    0755 $(DEBDESTDIR)/Library/PreferenceBundles/ZSRelaySettings.bundle/ZSRelaySettings
 
 	mkdir -p $(DEBDESTDIR)/Library/LaunchDaemons/
 	mkdir -p $(DEBDESTDIR)/System/Library/CoreServices/SpringBoard.app/
 	install -m 0755 misc/org.bitspin.zsrelay.plist $(DEBDESTDIR)/Library/LaunchDaemons/
 	install -m 0644 misc/FSO_*.png $(DEBDESTDIR)/System/Library/CoreServices/SpringBoard.app/
 	install -m 0644 misc/Default_*.png $(DEBDESTDIR)/System/Library/CoreServices/SpringBoard.app/
 
-	touch $(DEBDESTDIR)/var/mobile/Library/StatusBridge/org.bitspin.zsrelay.icons.ZSRelay
-	touch $(DEBDESTDIR)/var/mobile/Library/StatusBridge/org.bitspin.zsrelay.icons.ZSRelayNOP
-	touch $(DEBDESTDIR)/var/mobile/Library/StatusBridge/org.bitspin.zsrelay.icons.ZSRelayInsomnia
-	touch $(DEBDESTDIR)/var/mobile/Library/StatusBridge/org.bitspin.zsrelay.icons.ZSRelayInsomniaNOP
-
 	ln -sf /usr/sbin/zscmd $(DEBDESTDIR)/var/mobile/Library/SBSettings/Commands/org.bitspin.zsrelay.start
 	ln -sf /usr/sbin/zscmd $(DEBDESTDIR)/var/mobile/Library/SBSettings/Commands/org.bitspin.zsrelay.stop
 
 # Build architecture-independent files here.
 binary-indep: build install
-	dh_testdir
-	dh_testroot
+#	dh_testdir
+#	dh_testroot
 #	dh_installchangelogs
 #	dh_installdocs
 #	dh_installexamples
@@ -92,8 +89,8 @@ binary-indep: build install
 #	dh_perl
 #	dh_python
 	dh_installdeb
-#	dh_gencontrol
-	./tools/dpkg-gencontrol -a@IPHONE_OS_ARCH@ -p`dh_listpackages`
+	dpkg-gencontrol -P$(DEBDESTDIR)
+#	./tools/dpkg-gencontrol -a@IPHONE_OS_ARCH@ -p`dh_listpackages`
 	dh_md5sums
 	dh_builddeb
 # Build architecture-dependent files here.