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

[Mattia Dongili]

Author: malattia
Date: 2006-04-12 20:32:42 +0000 (Wed, 12 Apr 2006)
New Revision: 53

Added:
   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
Log:
prepare -3 and fix #362058

Modified: trunk/src/uml-utilities/debian/changelog
===================================================================
--- trunk/src/uml-utilities/debian/changelog	2006-04-10 17:26:30 UTC (rev 52)
+++ trunk/src/uml-utilities/debian/changelog	2006-04-12 20:32:42 UTC (rev 53)
@@ -1,3 +1,9 @@
+uml-utilities (20060323-3) unstable; urgency=low
+
+  * Install port-helper in the correct location (Closes: #362058).
+
+ -- Mattia Dongili <malattia at debian.org>  Wed, 12 Apr 2006 22:32:53 +0200
+
 uml-utilities (20060323-2) unstable; urgency=low
 
   * fix FTBFS on ia64 and alpha (spotted before the bug was delivered).

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

Added: 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-10 17:26:30 UTC (rev 52)
+++ trunk/src/uml-utilities/debian/patches/02_fix_lib64_install_directory.dpatch	2006-04-12 20:32:42 UTC (rev 53)
@@ -0,0 +1,25 @@
+#! /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