[oe-commits] org.oe.dev conserver: Run sanitize.py over all the files.

[lenehan commit]

conserver: Run sanitize.py over all the files.

Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: 046ba1dd1880cfa890f082578387e771a6183bfb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=046ba1dd1880cfa890f082578387e771a6183bfb
Files:
1
packages/conserver/conserver.inc
packages/conserver/conserver_8.1.14.bb
packages/conserver/conserver_8.1.2.bb
Diffs:

#
# mt diff -rf7b20af1f3d93454449483194690672a01fcbf20 -r046ba1dd1880cfa890f082578387e771a6183bfb
#
# 
# 
# patch "packages/conserver/conserver.inc"
#  from [5d7de502b5eeec37f2de35a37eb26c4c6f477309]
#    to [03805880ab1217136fb3a070246579af3d9d8d38]
# 
# patch "packages/conserver/conserver_8.1.14.bb"
#  from [313db524a432f3aeca958e6c9c0d360022e28ecc]
#    to [f1a14d3a0f29381cd723b109cc23be5810325048]
# 
# patch "packages/conserver/conserver_8.1.2.bb"
#  from [06c9c6e6200887ab63ed929974b27910882593e4]
#    to [f5d6fec0c4aaf6390d14449d130cea4bc22e0ed7]
# 
============================================================
--- packages/conserver/conserver.inc	5d7de502b5eeec37f2de35a37eb26c4c6f477309
+++ packages/conserver/conserver.inc	03805880ab1217136fb3a070246579af3d9d8d38
@@ -5,30 +5,31 @@ SRC_URI = "http://www.conserver.com/cons
 LICENSE = "BSD"
 
 SRC_URI = "http://www.conserver.com/conserver-${PV}.tar.gz \
-	   file://conserver.init \
-	   file://conserver.default"
+           file://conserver.init \
+           file://conserver.default"
 
 inherit autotools update-rc.d
 
-# Settings for the initscript
-INITSCRIPT_NAME    = "conserver"
-INITSCRIPT_PARAMS  = "defaults 98 2"
+# Stop install being called with -s so it doesn't try and run the host strip command
+EXTRA_OEMAKE = " INSTALL_PROGRAM=install"
 
-# Stop install being called with -s so it doesn't try and run the host strip command
-EXTRA_OEMAKE=" INSTALL_PROGRAM=install"
+# Include the init script and default settings in the package
+do_install_append () {
+        install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d
+        install -m 0644 ${WORKDIR}/conserver.default ${D}${sysconfdir}/default/conserver
+        install -m 0755 ${WORKDIR}/conserver.init ${D}${sysconfdir}/init.d/conserver
+}
 
 # Include the examples in the documentation package
 FILES_${PN}-doc += "${datadir}/examples/conserver"
 
+# Make sure .debug files end up in the correct place
+FILES_${PN} = "${sysconfdir} ${bindir}/* ${libdir}/${PN}/* ${sbindir}/*"
+FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libdir}/${PN}/.debug"
+
 # Indicate that the default file is a configuation file
 CONFFILES_${PN} = "${sysconfdir}/default/conserver"
 
+# Settings for the initscript
+INITSCRIPT_NAME = "conserver"
+INITSCRIPT_PARAMS = "defaults 98 2"
-# Include the init script and default settings in the package
-do_install_append () {
-	install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d
-	install -m 0644 ${WORKDIR}/conserver.default ${D}${sysconfdir}/default/conserver
-	install -m 0755 ${WORKDIR}/conserver.init ${D}${sysconfdir}/init.d/conserver
-}
-
-FILES_${PN} = "${sysconfdir} ${bindir}/* ${libdir}/${PN}/* ${sbindir}/*"
-FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libdir}/${PN}/.debug"
============================================================
--- packages/conserver/conserver_8.1.14.bb	313db524a432f3aeca958e6c9c0d360022e28ecc
+++ packages/conserver/conserver_8.1.14.bb	f1a14d3a0f29381cd723b109cc23be5810325048
@@ -1,2 +1,3 @@
-require conserver.inc
 PR = "r3"
+
+require conserver.inc
============================================================
--- packages/conserver/conserver_8.1.2.bb	06c9c6e6200887ab63ed929974b27910882593e4
+++ packages/conserver/conserver_8.1.2.bb	f5d6fec0c4aaf6390d14449d130cea4bc22e0ed7
@@ -1,2 +1,3 @@
-require conserver.inc
 PR = "r4"
+
+require conserver.inc