[Pkg-voip-commits] r4955 - in /kphone/trunk/debian: changelog patches/DESTDIR.patch

msp at alioth.debian.org msp at alioth.debian.org
Sat Dec 1 10:46:38 UTC 2007 

Author: msp
Date: Sat Dec  1 10:46:38 2007
New Revision: 4955

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4955
Log:
  - For those who wish to utilise the original kphone it is recommended
  they use the package from etch
  - new version upstream (moved!) (Closes: #397349)
* Add DESTDIR.patch to install in correct location

Added:
    kphone/trunk/debian/patches/DESTDIR.patch
Modified:
    kphone/trunk/debian/changelog

Modified: kphone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kphone/trunk/debian/changelog?rev=4955&op=diff
==============================================================================
--- kphone/trunk/debian/changelog (original)
+++ kphone/trunk/debian/changelog Sat Dec  1 10:46:38 2007
@@ -3,13 +3,15 @@
   [ Mark Purcell ]
   * New Upstream Release
     - Switch to upstream kphoneSI package
-    - if users still wish to utilise kphone then I can recommend the kphone
-    package from etch.
+    - For those who wish to utilise the original kphone it is recommended
+    they use the package from etch
+    - new version upstream (moved!) (Closes: #397349)
   * Cleanup get-orig-source target
   * debian/patches included upstream; bug_342555_message_5.diff
     gcc4.1.diff umask.diff dspoutoss.cpp.diff udpmessagesocket.diff
   * Run autoconf before packaged; add debian/patches/run-autoconf.patch
   * Add start comment missing from kaudio/dspaudioout.cpp
+  * Add DESTDIR.patch to install in correct location
 
   [ Kilian Krause ]
   * Update menu to "Applications" rather than "Apps"

Added: kphone/trunk/debian/patches/DESTDIR.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kphone/trunk/debian/patches/DESTDIR.patch?rev=4955&op=file
==============================================================================
--- kphone/trunk/debian/patches/DESTDIR.patch (added)
+++ kphone/trunk/debian/patches/DESTDIR.patch Sat Dec  1 10:46:38 2007
@@ -1,0 +1,106 @@
+diff -Nur kphone-1.1/icons/Makefile.in kphone-1.1.new/icons/Makefile.in
+--- kphone-1.1/icons/Makefile.in	2007-02-06 21:20:18.000000000 +0100
++++ kphone-1.1.new/icons/Makefile.in	2007-12-01 11:38:40.000000000 +0100
+@@ -4,9 +4,9 @@
+ ICON_DIR=$(SHAREDIR)/icons
+ 
+ install:
+-	install --mode=0755 --directory $(ICON_DIR)
++	install --mode=0755 --directory $(DESTDIR)$(ICON_DIR)
+ 	for T in *.png; do \
+-		install --mode=0644 $$T $(ICON_DIR); \
++		install --mode=0644 $$T $(DESTDIR)$(ICON_DIR); \
+ 	done
+ 
+ uninstall:
+diff -Nur kphone-1.1/kdial/Makefile.in kphone-1.1.new/kdial/Makefile.in
+--- kphone-1.1/kdial/Makefile.in	2006-06-22 20:32:11.000000000 +0200
++++ kphone-1.1.new/kdial/Makefile.in	2007-12-01 11:40:48.000000000 +0100
+@@ -16,11 +16,11 @@
+ all:	kpsidial
+ 
+ install:	all
+-	install --mode=0755 --directory $(BIN_DIR)
+-	install --strip kpsidial $(BIN_DIR)
++	install --mode=0755 --directory $(DESTDIR)$(BIN_DIR)
++	install --strip kpsidial $(DESTDIR)$(BIN_DIR)
+ 
+ uninstall:
+-	rm -f $(BIN_DIR)/kpsidial
++	rm -f $(DESTDIR)$(BIN_DIR)/kpsidial
+ 
+ clean:
+ 	rm -f kpsidial *.o  *~  *.bak core
+diff -Nur kphone-1.1/kphone/Makefile.in kphone-1.1.new/kphone/Makefile.in
+--- kphone-1.1/kphone/Makefile.in	2007-09-01 07:33:11.000000000 +0200
++++ kphone-1.1.new/kphone/Makefile.in	2007-12-01 11:39:14.000000000 +0100
+@@ -80,14 +80,14 @@
+ all:	kpsi
+ 
+ install:	all
+-	install --mode=0755 --directory $(BIN_DIR)
+-	install --strip kpsi $(BIN_DIR)
+-	install -D --mode=0644 kphone.1 $(MAN_DIR)/kphone.1
+-	install -D --mode=0644 kpsi.1 $(MAN_DIR)/kpsi.1
++	install --mode=0755 --directory $(DESTDIR)$(BIN_DIR)
++	install --strip kpsi $(DESTDIR)$(BIN_DIR)
++	install -D --mode=0644 kphone.1 $(DESTDIR)$(MAN_DIR)/kphone.1
++	install -D --mode=0644 kpsi.1 $(DESTDIR)$(MAN_DIR)/kpsi.1
+ uninstall:
+-	rm -f $(BIN_DIR)/kphone 
+-	rm -f $(MAN_DIR)/kphone.1 
+-	rm -f $(MAN_DIR)/kpsi.1
++	rm -f $(DESTDIR)$(BIN_DIR)/kphone 
++	rm -f $(DESTDIR)$(MAN_DIR)/kphone.1 
++	rm -f $(DESTDIR)$(MAN_DIR)/kpsi.1
+ clean:
+ 	rm -f kpsi *.o *.a *~ *.moc.cpp *.bak core
+ 
+diff -Nur kphone-1.1/po/Makefile.in kphone-1.1.new/po/Makefile.in
+--- kphone-1.1/po/Makefile.in	2007-02-06 21:20:23.000000000 +0100
++++ kphone-1.1.new/po/Makefile.in	2007-12-01 11:41:31.000000000 +0100
+@@ -18,13 +18,13 @@
+ install: $(QM)
+ 
+ 
+-	install --mode=0755 --directory $(PO_DIR)
++	install --mode=0755 --directory $(DESTDIR)$(PO_DIR)
+ 	for T in *.qm; do \
+-		install --mode=0644 $$T $(PO_DIR); \
++		install --mode=0644 $$T $(DESTDIR)$(PO_DIR); \
+ 	done
+ 
+ uninstall:
+-	rm -rf $(PO_DIR)
++	rm -rf $(DESTDIR)$(PO_DIR)
+ 
+ clean:
+ 	-rm -f *~ *.qm
+diff -Nur kphone-1.1/ringing/Makefile.in kphone-1.1.new/ringing/Makefile.in
+--- kphone-1.1/ringing/Makefile.in	2007-02-06 21:20:23.000000000 +0100
++++ kphone-1.1.new/ringing/Makefile.in	2007-12-01 11:39:54.000000000 +0100
+@@ -16,16 +16,16 @@
+ all:	kphonering
+ 
+ install:	all
+-	install --mode=0755 --directory $(BIN_DIR)
+-	install --strip kphonering $(BIN_DIR)
+-	install kphoneringsh $(BIN_DIR)
+-	install --mode=0755 --directory $(SHARE_DIR)
+-	install --mode=0644 ring.wav $(SHARE_DIR)
++	install --mode=0755 --directory $(DESTDIR)$(BIN_DIR)
++	install --strip kphonering $(DESTDIR)$(BIN_DIR)
++	install kphoneringsh $(DESTDIR)$(BIN_DIR)
++	install --mode=0755 --directory $(DESTDIR)$(SHARE_DIR)
++	install --mode=0644 ring.wav $(DESTDIR)$(SHARE_DIR)
+ 
+ uninstall:
+-	rm -f $(BIN_DIR)/kphonering
+-	rm -f $(BIN_DIR)/kphoneringsh
+-	rm -r $(SHARE_DIR)
++	rm -f $(DESTDIR)$(BIN_DIR)/kphonering
++	rm -f $(DESTDIR)$(BIN_DIR)/kphoneringsh
++	rm -r $(DESTDIR)$(SHARE_DIR)
+ 
+ clean:
+ 	rm -f kphonering *.o  *~  *.bak core

More information about the Pkg-voip-commits mailing list