[Pkg-uml-commit] r54 - in trunk/src/uml-utilities/debian: . patches

[Mattia Dongili]

Author: malattia
Date: 2006-04-14 17:50:00 +0000 (Fri, 14 Apr 2006)
New Revision: 54

Added:
   trunk/src/uml-utilities/debian/patches/02_fix_install_directories.dpatch
Removed:
   trunk/src/uml-utilities/debian/patches/02_fix_lib64_install_directory.dpatch
Modified:
   trunk/src/uml-utilities/debian/changelog
   trunk/src/uml-utilities/debian/patches/00list
   trunk/src/uml-utilities/debian/rules
Log:
Unify all directory changes to upstream Makefiles in a single patch.


Modified: trunk/src/uml-utilities/debian/changelog
===================================================================
--- trunk/src/uml-utilities/debian/changelog	2006-04-12 20:32:42 UTC (rev 53)
+++ trunk/src/uml-utilities/debian/changelog	2006-04-14 17:50:00 UTC (rev 54)
@@ -1,6 +1,9 @@
 uml-utilities (20060323-3) unstable; urgency=low
 
+  [Mattia Dongili]:
   * Install port-helper in the correct location (Closes: #362058).
+  * Cleaned up debian/rules and merged all install path stuff in a single
+    patch to upstream sources.
 
  -- Mattia Dongili <malattia at debian.org>  Wed, 12 Apr 2006 22:32:53 +0200
 

Modified: trunk/src/uml-utilities/debian/patches/00list
===================================================================
--- trunk/src/uml-utilities/debian/patches/00list	2006-04-12 20:32:42 UTC (rev 53)
+++ trunk/src/uml-utilities/debian/patches/00list	2006-04-14 17:50:00 UTC (rev 54)
@@ -1,2 +1,2 @@
 01_fix_moo_conflicting_types_for_read_cow_header.dpatch
-02_fix_lib64_install_directory.dpatch
+02_fix_install_directories.dpatch

Added: trunk/src/uml-utilities/debian/patches/02_fix_install_directories.dpatch
===================================================================
--- trunk/src/uml-utilities/debian/patches/02_fix_install_directories.dpatch	2006-04-12 20:32:42 UTC (rev 53)
+++ trunk/src/uml-utilities/debian/patches/02_fix_install_directories.dpatch	2006-04-14 17:50:00 UTC (rev 54)
@@ -0,0 +1,63 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_fix_install_directories - Mattia Dongili <malattia at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use Debian's multiarch directories
+
+ at DPATCH@
+
+# Author: malattia
+# Status: none
+
+--- ./Makefile~clean	2006-04-12 22:27:54.083257719 +0200
++++ ./Makefile	2006-04-12 22:28:04.119884969 +0200
+@@ -6,11 +6,7 @@ UMLVER = $(shell date +%Y%m%d)
+ TARBALL = uml_utilities_$(UMLVER).tar.bz2
+ BIN_DIR = /usr/bin
+ 
+-ifeq ($(shell uname -m),x86_64)
+-LIB_DIR = /usr/lib64/uml
+-else
+ LIB_DIR = /usr/lib/uml
+-endif
+ 
+ CFLAGS = -g -Wall
+ #CFLAGS = -g -O2 -Wall
+--- ./uml_net/Makefile~clean	2006-04-13 20:36:20.910393394 +0200
++++ ./uml_net/Makefile	2006-04-13 20:36:42.763759144 +0200
+@@ -4,8 +4,6 @@ BIN = uml_net
+ CFLAGS ?= -g -Wall
+ override CFLAGS += $(TUNTAP)
+ 
+-BIN_DIR ?= /usr/bin
+-
+ OBJS = ethertap.o host.o output.o slip.o uml_net.o
+ 
+ ifneq ($(TUNTAP),)
+@@ -21,5 +19,5 @@ clean : 
+ 	rm -f $(BIN) $(OBJS) *~
+ 
+ install : $(BIN)
+-	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s -m 04755 $(BIN) $(DESTDIR)$(BIN_DIR)
++	install -d $(DESTDIR)$(LIB_DIR)
++	install -s -m 04755 $(BIN) $(DESTDIR)$(LIB_DIR)
+--- ./tunctl/Makefile~clean	2006-04-13 20:48:45.300914894 +0200
++++ ./tunctl/Makefile	2006-04-13 20:49:08.218347144 +0200
+@@ -2,7 +2,7 @@ OBJS = tunctl.o
+ BIN = tunctl
+ CFLAGS ?= -g -Wall
+ 
+-BIN_DIR ?= /usr/bin
++SBIN_DIR ?= /usr/sbin
+ 
+ all : $(BIN)
+ 
+@@ -13,5 +13,5 @@ clean : 
+ 	rm -f $(BIN) $(OBJS) *~
+ 
+ install : $(BIN)
+-	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install -d $(DESTDIR)$(SBIN_DIR)
++	install -s $(BIN) $(DESTDIR)$(SBIN_DIR)

Deleted: trunk/src/uml-utilities/debian/patches/02_fix_lib64_install_directory.dpatch
===================================================================
--- trunk/src/uml-utilities/debian/patches/02_fix_lib64_install_directory.dpatch	2006-04-12 20:32:42 UTC (rev 53)
+++ trunk/src/uml-utilities/debian/patches/02_fix_lib64_install_directory.dpatch	2006-04-14 17:50:00 UTC (rev 54)
@@ -1,25 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix_lib64_install_directory - Mattia Dongili <malattia at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use Debian's multiarch directories
-
- at DPATCH@
-
-# Author: malattia
-# Status: none
-
---- ./Makefile.clean	2006-04-12 22:27:54.083257719 +0200
-+++ ./Makefile	2006-04-12 22:28:04.119884969 +0200
-@@ -6,11 +6,7 @@ UMLVER = $(shell date +%Y%m%d)
- TARBALL = uml_utilities_$(UMLVER).tar.bz2
- BIN_DIR = /usr/bin
- 
--ifeq ($(shell uname -m),x86_64)
--LIB_DIR = /usr/lib64/uml
--else
- LIB_DIR = /usr/lib/uml
--endif
- 
- CFLAGS = -g -Wall
- #CFLAGS = -g -O2 -Wall

Modified: trunk/src/uml-utilities/debian/rules
===================================================================
--- trunk/src/uml-utilities/debian/rules	2006-04-12 20:32:42 UTC (rev 53)
+++ trunk/src/uml-utilities/debian/rules	2006-04-14 17:50:00 UTC (rev 54)
@@ -59,10 +59,7 @@
 		var/run/uml-utilities
 
 	$(MAKE) install DESTDIR=$(tmp)
-	mv $(tmp)/usr/bin/uml_net $(tmp)/usr/lib/uml
-	mv $(tmp)/usr/bin/tunctl $(tmp)/usr/sbin
 
-	chmod +x debian/uml-utilities.if-*.d
 	install -m 755 debian/uml-utilities.if-up.d $(tmp)/etc/network/if-up.d/uml-utilities
 	install -m 755 debian/uml-utilities.if-pre-up.d $(tmp)/etc/network/if-pre-up.d/uml-utilities