summaryrefslogtreecommitdiff
path: root/libbrand/debian/patches
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2012-11-03 23:49:45 +0400
committerIgor Pashev <pashev.igor@gmail.com>2012-11-03 23:49:45 +0400
commit296eb3acb557cc592527aad4bb1d4890c35a6c6e (patch)
tree5268ab10dd9778705d4b0b9047708d9932129012 /libbrand/debian/patches
parent55c57b69271af5e4c09edd18ef7580e6ebee347f (diff)
downloadillumos-packaging-296eb3acb557cc592527aad4bb1d4890c35a6c6e.tar.gz
libbrand
Diffstat (limited to 'libbrand/debian/patches')
-rw-r--r--libbrand/debian/patches/libbrand-dtd-location.patch20
-rw-r--r--libbrand/debian/patches/libbrand-zoneconfig.patch14
-rw-r--r--libbrand/debian/patches/series2
3 files changed, 36 insertions, 0 deletions
diff --git a/libbrand/debian/patches/libbrand-dtd-location.patch b/libbrand/debian/patches/libbrand-dtd-location.patch
new file mode 100644
index 0000000..ead5a6d
--- /dev/null
+++ b/libbrand/debian/patches/libbrand-dtd-location.patch
@@ -0,0 +1,20 @@
+Description: Debian XML policy
+Index: libbrand/usr/src/lib/libbrand/Makefile
+===================================================================
+--- libbrand.orig/usr/src/lib/libbrand/Makefile 2012-10-08 04:25:38.000000000 +0400
++++ libbrand/usr/src/lib/libbrand/Makefile 2012-11-03 23:15:44.204480929 +0400
+@@ -42,11 +42,11 @@
+ BRANDDIR= brand
+ ROOTBRANDDIR= $(ROOTLIBDIR)/$(BRANDDIR)
+
+-DTDS = dtd/brand.dtd.1 dtd/zone_platform.dtd.1
+-DTDDIR = $(ROOT)/usr/share/lib/xml
++DTDS = brand.dtd.1 zone_platform.dtd.1
++DTDDIR = $(ROOT)/usr/share/xml/schema/brandz
+ ROOTDTDS= $(DTDS:%=$(DTDDIR)/%)
+
+-$(DTDDIR)/%: %
++$(DTDDIR)/%: dtd/%
+ $(INS.file)
+
+ .KEEP_STATE:
diff --git a/libbrand/debian/patches/libbrand-zoneconfig.patch b/libbrand/debian/patches/libbrand-zoneconfig.patch
new file mode 100644
index 0000000..bf240df
--- /dev/null
+++ b/libbrand/debian/patches/libbrand-zoneconfig.patch
@@ -0,0 +1,14 @@
+Description: Debian FHS
+Index: libbrand/usr/src/lib/libbrand/common/libbrand_impl.h
+===================================================================
+--- libbrand.orig/usr/src/lib/libbrand/common/libbrand_impl.h 2012-10-08 04:25:38.000000000 +0400
++++ libbrand/usr/src/lib/libbrand/common/libbrand_impl.h 2012-11-03 23:28:55.437576163 +0400
+@@ -42,7 +42,7 @@
+ xmlDocPtr bh_platform;
+ };
+
+-#define BRAND_DIR "/usr/lib/brand"
++#define BRAND_DIR "/usr/share/brandz"
+ #define BRAND_CONFIG "config.xml"
+ #define BRAND_PLATFORM "platform.xml"
+
diff --git a/libbrand/debian/patches/series b/libbrand/debian/patches/series
new file mode 100644
index 0000000..95e426b
--- /dev/null
+++ b/libbrand/debian/patches/series
@@ -0,0 +1,2 @@
+libbrand-dtd-location.patch
+libbrand-zoneconfig.patch