tags 653680 patch
thanks

Hi,

 I've made a patch for this FTBFS issue, please check it.
 Thanks.

-- 
Regards,

 Hideki Yamane     henrich @ debian.or.jp/org
 http://wiki.debian.org/HidekiYamane
diff -Nru libselinux-2.1.0/debian/changelog libselinux-2.1.0/debian/changelog
--- libselinux-2.1.0/debian/changelog	2011-10-31 11:53:53.000000000 +0900
+++ libselinux-2.1.0/debian/changelog	2012-01-02 18:35:35.000000000 +0900
@@ -1,3 +1,13 @@
+libselinux (2.1.0-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control
+    - remove comment line since it prevents dch execution
+  * debian/patches
+    - add fix_FTBFS.patch to adjust path (Closes: #653680)
+
+ -- Hideki Yamane <henr...@debian.org>  Mon, 02 Jan 2012 18:34:40 +0900
+
 libselinux (2.1.0-4) unstable; urgency=low
 
   * Put /selinux back in libselinux1
diff -Nru libselinux-2.1.0/debian/control libselinux-2.1.0/debian/control
--- libselinux-2.1.0/debian/control	2011-10-28 21:22:59.000000000 +0900
+++ libselinux-2.1.0/debian/control	2012-01-02 18:34:38.000000000 +0900
@@ -90,7 +90,6 @@
  policies, including those based on the concepts of Type Enforcement,
  Role-based Access Control, and Multi-level Security.
 
-## Transitional package
 Package: libselinux-ruby1.8
 Section: oldlibs
 Architecture: all
diff -Nru libselinux-2.1.0/debian/patches/add-includededir libselinux-2.1.0/debian/patches/add-includededir
--- libselinux-2.1.0/debian/patches/add-includededir	2011-10-28 15:55:15.000000000 +0900
+++ libselinux-2.1.0/debian/patches/add-includededir	2012-01-02 18:33:02.000000000 +0900
@@ -15,9 +15,11 @@
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
---- libselinux-2.1.0.orig/src/Makefile
-+++ libselinux-2.1.0/src/Makefile
-@@ -47,7 +47,7 @@ SRCS= $(filter-out $(UNUSED_SRCS), $(fil
+Index: libselinux-2.1.0/src/Makefile
+===================================================================
+--- libselinux-2.1.0.orig/src/Makefile	2012-01-02 18:32:56.000000000 +0900
++++ libselinux-2.1.0/src/Makefile	2012-01-02 18:32:56.000000000 +0900
+@@ -47,7 +47,7 @@
  OBJS= $(patsubst %.c,%.o,$(SRCS))
  LOBJS= $(patsubst %.c,%.lo,$(SRCS))
  CFLAGS ?= -Werror -Wall -W -Wundef -Wshadow -Wmissing-noreturn -Wmissing-format-attribute
diff -Nru libselinux-2.1.0/debian/patches/fix_FTBFS.patch libselinux-2.1.0/debian/patches/fix_FTBFS.patch
--- libselinux-2.1.0/debian/patches/fix_FTBFS.patch	1970-01-01 09:00:00.000000000 +0900
+++ libselinux-2.1.0/debian/patches/fix_FTBFS.patch	2012-01-02 18:34:25.000000000 +0900
@@ -0,0 +1,19 @@
+Index: libselinux-2.1.0/src/Makefile
+===================================================================
+--- libselinux-2.1.0.orig/src/Makefile	2012-01-02 18:32:56.000000000 +0900
++++ libselinux-2.1.0/src/Makefile	2012-01-02 18:34:22.806766798 +0900
+@@ -1,3 +1,5 @@
++DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
++
+ # Installation directories.
+ PREFIX ?= $(DESTDIR)/usr
+ LIBDIR ?= $(PREFIX)/lib
+@@ -99,7 +101,7 @@
+ 	$(CC) $(CFLAGS) -I$(PYINC) -fPIC -DSHARED -c -o $@ $<
+ 
+ $(AUDIT2WHYSO): audit2why.lo
+-	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LIBSEPOLDIR)/libsepol.a -L$(LIBDIR) -Wl,-soname,$@
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LIBSEPOLDIR)/$(DEB_HOST_MULTIARCH)/libsepol.a -L$(LIBDIR) -Wl,-soname,$@
+ 
+ %.o:  %.c policy.h
+ 	$(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $<
diff -Nru libselinux-2.1.0/debian/patches/series libselinux-2.1.0/debian/patches/series
--- libselinux-2.1.0/debian/patches/series	2011-10-28 15:53:51.000000000 +0900
+++ libselinux-2.1.0/debian/patches/series	2012-01-02 18:33:28.000000000 +0900
@@ -3,3 +3,4 @@
 hide-library-destructors.patch -p1
 fix-cross-compile.patch -p1
 add-includededir
+fix_FTBFS.patch

Reply via email to