[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. debian/0.9.5.9+git20110512-1-2-gd53ef05

[Rico Rommel]

The following commit has been merged in the debian branch:
commit d53ef0536014f6f07f6312a7f29a29fecf5d3463
Author: Rico Rommel <rico at bierrommel.de>
Date:   Sun Oct 16 11:47:12 2011 +0200

    include missing config files, move to debhelper

diff --git a/.gbp.conf b/.gbp.conf
deleted file mode 100644
index b4683a2..0000000
--- a/.gbp.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-upstream-branch = master
-debian-branch = debian
-pristine-tar = True
-builder = debuild -i\.\(git\|gbp.conf\) -I.git
diff --git a/debian/changelog b/debian/changelog
index d601998..90bf546 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 fso-frameworkd (0.9.5.9+git20110512-1.1) unstable; urgency=low
 
   * fso-frameworkd-gta0X should conflict each other 
+  * include missing configuration files
+  * use debhelper
 
- -- Rico Rommel <rico at bierrommel.de>  Wed, 28 Sep 2011 17:37:22 +0200
+ -- Rico Rommel <rico at bierrommel.de>  Sun, 16 Oct 2011 10:16:48 +0200
 
 fso-frameworkd (0.9.5.9+git20110512-1) unstable; urgency=low
 
diff --git a/debian/fso-frameworkd-gta01.dirs b/debian/fso-frameworkd-gta01.dirs
new file mode 100644
index 0000000..f66c4f1
--- /dev/null
+++ b/debian/fso-frameworkd-gta01.dirs
@@ -0,0 +1 @@
+/etc/freesmartphone/oevents
\ No newline at end of file
diff --git a/debian/fso-frameworkd-gta02.dirs b/debian/fso-frameworkd-gta02.dirs
new file mode 100644
index 0000000..f66c4f1
--- /dev/null
+++ b/debian/fso-frameworkd-gta02.dirs
@@ -0,0 +1 @@
+/etc/freesmartphone/oevents
\ No newline at end of file
diff --git a/debian/fso-frameworkd.dirs b/debian/fso-frameworkd.dirs
index deda6b0..39a599f 100644
--- a/debian/fso-frameworkd.dirs
+++ b/debian/fso-frameworkd.dirs
@@ -1 +1 @@
-/var/lib/freesmartphone/
+/var/lib/freesmartphone/
\ No newline at end of file
diff --git a/debian/fso-frameworkd.install b/debian/fso-frameworkd.install
index 4e93b14..5cfa312 100644
--- a/debian/fso-frameworkd.install
+++ b/debian/fso-frameworkd.install
@@ -1,6 +1,5 @@
 usr/bin
 usr/lib
 etc/dbus-1
-etc/freesmartphone/opreferences/schema
 etc/freesmartphone/opim
-
+etc/freesmartphone/opreferences
diff --git a/debian/rules b/debian/rules
index 7286ab5..ec9a78e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,12 @@
 #!/usr/bin/make -f
-DEB_PYTHON_SYSTEM=pysupport
+%:
+	dh $@ --with quilt --with python2
+
+override_dh_install:
+	dh_install
+	install etc/freesmartphone/oevents/om-gta01/rules.yaml debian/fso-frameworkd-gta01/etc/freesmartphone/oevents
+	install etc/freesmartphone/oevents/om-gta02/rules.yaml debian/fso-frameworkd-gta02/etc/freesmartphone/oevents
+
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-DEB_DESTDIR = $(CURDIR)/debian/tmp
 
-get-orig-source::
-	sh debian/get-orig-source.sh

-- 
FSO frameworkd Debian packaging