[pkg-fso-commits] [SCM] gsm/gps-data logger for the openBmap project using the FSO stack branch, master, updated. debian/0.4.0-3-15-gb7abc35

[Sebastian Reichel]

The following commit has been merged in the master branch:
commit 8fe64850d5126189016407fe35df139b42d72ddc
Author: Sebastian Reichel <sre at ring0.de>
Date:   Thu Dec 15 01:23:09 2011 +0100

    cdbs2debhelper

diff --git a/debian/changelog b/debian/changelog
index e9f7fa5..f8d2c23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,8 @@ openbmap-logger (0.4.0-6) UNRELEASED; urgency=low
   * add VCS fields (Closes: #593901)
   * Add README.Debian (Closes: #623603)
   * Switch to DebSrc 3.0
-  * Remove DM-Upload-Allowed: yes 
+  * Remove DM-Upload-Allowed: yes
+  * Switch from CDBS to debhelper with dh_python2
 
  -- Sebastian Reichel <sre at debian.org>  Thu, 15 Dec 2011 01:16:52 +0100
 
diff --git a/debian/control b/debian/control
index 8d5626f..41af48b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,8 @@ Section: misc
 Priority: optional
 Maintainer: Debian freesmartphone.org Team <pkg-fso-maint at lists.alioth.debian.org>
 Uploaders: Sebastian Reichel <sre at debian.org>
-Build-Depends: cdbs (>= 0.4.49),
-               debhelper (>= 8),
-               python-all (>= 2.5),
-               python-support (>= 0.5.3)
+Build-Depends: debhelper (>= 8),
+               python-all (>= 2.6.6-3~)
 Standards-Version: 3.9.2
 Homepage: http://www.openbmap.org
 Vcs-Git: git://git.debian.org/git/pkg-fso/openbmap-logger.git
diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index b3dc41e..0000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.5-
diff --git a/debian/rules b/debian/rules
index 2dcb0ff..cedd5a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,3 @@
 #!/usr/bin/make -f
-DEB_PYTHON_SYSTEM=pysupport
-DEB_PYTHON_DESTDIR = $(CURDIR)/debian/tmp
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+%:
+	dh --with python2

-- 
gsm/gps-data logger for the openBmap project using the FSO stack