Updated debian stuff

diff --git a/packages/lightmediascanner/debian/changelog b/packages/lightmediascanner/debian/changelog
index 891652a..a4fc3fc 100644 (file)
--- a/packages/lightmediascanner/debian/changelog
+++ b/packages/lightmediascanner/debian/changelog
@@ -1,3 +1,9 @@
+lightmediascanner (0.2.0-1ubuntu1) jaunty; urgency=low
+
+  * Ubuntization and other changes that i will decribe later
+
+ -- Rodrigo Belem <rclbelem@gmail.com>  Wed, 15 Apr 2009 10:33:27 -0400
+
 lightmediascanner (0.2.0-maemo1) unstable; urgency=low
 
   * New upstream version.

diff --git a/packages/lightmediascanner/debian/compat b/packages/lightmediascanner/debian/compat
index b8626c4..7f8f011 100644 (file)
--- a/packages/lightmediascanner/debian/compat
+++ b/packages/lightmediascanner/debian/compat
@@ -1 +1 @@
-4
+7

diff --git a/packages/lightmediascanner/debian/control b/packages/lightmediascanner/debian/control
index c8a0996..11a8a96 100644 (file)
--- a/packages/lightmediascanner/debian/control
+++ b/packages/lightmediascanner/debian/control
@@ -1,236 +1,182 @@
 Source: lightmediascanner
+Section: libs
 Priority: optional
 Maintainer: Gustavo Sverzut Barbieri <gustavo.barbieri@openbossa.org>
 Build-Depends: debhelper, cdbs, libsqlite3-dev, libflac-dev, libmp4v2-dev, libvorbisidec-dev
-Standards-Version: 3.6.1
+Standards-Version: 3.8.0
+Homepage: http://lms.garage.maemo.org
 
 Package: liblightmediascanner0
-Section: libs
-Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, libsqlite3-0
-Provides: liblightmediascanner
+Section: libs
+Depends: ${misc:Depends}, ${shlibs:Depends}, libsqlite3-0
 Description: Lightweight library to scan media.
  Light Media Scanner scans media, parsing and storing data in
  a SQLite3 database. Provides safe execution by executing the
  parsers in another process, that will be monitored and killed
  if it takes more time than allowed.
- .
- This package contains the lightmediascanner library.
- .
- Homepage: http://lms.garage.maemo.org
 
-Package: lightmediascanner0-id3
-Section: libs
-Priority: optional
+Package: liblightmediascanner-dev
 Architecture: any
-Conflicts: lightmediascanner0-id3lib
-Replaces: lightmediascanner0-id3lib
-Depends: ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version})
-Provides: lightmediascanner-id3
-Description: Lightweight library to scan media.
+Section: libdevel
+Depends: ${misc:Depends}, ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version}), pkg-config
+Description: Lightmediascanner - development files
  Light Media Scanner scans media, parsing and storing data in
  a SQLite3 database. Provides safe execution by executing the
  parsers in another process, that will be monitored and killed
  if it takes more time than allowed.
  .
- This package contains id3 scanner.
- .
- Homepage: http://lms.garage.maemo.org
+ This package contains the lightmediascanner library.
 
-Package: lightmediascanner0-jpeg
-Section: libs
-Priority: optional
-Architecture: any
-Depends: ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version})
-Provides: lightmediascanner-jpeg
-Description: Lightweight library to scan media.
+Package: lightmediascanner-plugin-all
+Architecture: all
+Depends: ${misc:Depends},
+            lightmediascanner-plugin-id3 (= ${Source-Version}),
+            lightmediascanner-plugin-jpeg (= ${Source-Version}),
+            lightmediascanner-plugin-png (= ${Source-Version}),
+            lightmediascanner-plugin-playlists (= ${Source-Version}),
+            lightmediascanner-plugin-audio-dummy (= ${Source-Version}),
+            lightmediascanner-plugin-video-dummy (= ${Source-Version}),
+            lightmediascanner-plugin-asf (= ${Source-Version}),
+            lightmediascanner-plugin-rm (= ${Source-Version}),
+            lightmediascanner-plugin-flac (= ${Source-Version}),
+            lightmediascanner-plugin-mp4 (= ${Source-Version})
+Description: Lightmediascanner - all plugins
  Light Media Scanner scans media, parsing and storing data in
  a SQLite3 database. Provides safe execution by executing the
  parsers in another process, that will be monitored and killed
  if it takes more time than allowed.
  .
- This package contains the jpeg scanner.
- .
- Homepage: http://lms.garage.maemo.org
+ This is a metapackage for all scanners.
 
-Package: lightmediascanner0-png
-Section: libs
-Priority: optional
+Package: lightmediascanner-plugin-id3
 Architecture: any
-Depends: ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version})
-Provides: lightmediascanner-png
-Description: Lightweight library to scan media.
+Depends: ${misc:Depends}, ${shlibs:Depends}, liblightmediascanner0
+Enhances: liblightmediascanner0
+Description: Lightmediascanner - ID3 plugin
  Light Media Scanner scans media, parsing and storing data in
  a SQLite3 database. Provides safe execution by executing the
  parsers in another process, that will be monitored and killed
  if it takes more time than allowed.
  .
- This package contains the png scanner.
- .
- Homepage: http://lms.garage.maemo.org
+ This package contains id3 scanner.
 
-Package: lightmediascanner0-playlists
-Section: libs
-Priority: optional
+Package: lightmediascanner-plugin-jpeg
 Architecture: any
-Depends: ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version})
-Provides: lightmediascanner-playlists
-Description: Lightweight library to scan media.
+Depends: ${misc:Depends}, ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version})
+Enhances: liblightmediascanner0
+Description: Lightmediascanner - Jpeg plugin
  Light Media Scanner scans media, parsing and storing data in
  a SQLite3 database. Provides safe execution by executing the
  parsers in another process, that will be monitored and killed
  if it takes more time than allowed.
  .
- This package contains the playlists scanners.
- .
- Homepage: http://lms.garage.maemo.org
+ This package contains the jpeg scanner.
 
-Package: lightmediascanner0-audio-dummy
-Section: libs
-Priority: optional
+Package: lightmediascanner-plugin-png
 Architecture: any
-Depends: ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version})
-Provides: lightmediascanner-audio-dummy
-Description: Lightweight library to scan media.
+Depends: ${misc:Depends}, ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version})
+Enhances: liblightmediascanner0
+Description: Lightmediascanner - Png plugin
  Light Media Scanner scans media, parsing and storing data in
  a SQLite3 database. Provides safe execution by executing the
  parsers in another process, that will be monitored and killed
  if it takes more time than allowed.
  .
- This package contains the dummy video scanner.
- .
- Homepage: http://lms.garage.maemo.org
+ This package contains the png scanner.
 
-Package: lightmediascanner0-video-dummy
-Section: libs
-Priority: optional
+Package: lightmediascanner-plugin-playlists
 Architecture: any
-Depends: ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version})
-Provides: lightmediascanner-video-dummy
-Description: Lightweight library to scan media.
+Depends: ${misc:Depends}, ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version})
+Enhances: liblightmediascanner0
+Description: Lightmediascanner - Playlist plugin
  Light Media Scanner scans media, parsing and storing data in
  a SQLite3 database. Provides safe execution by executing the
  parsers in another process, that will be monitored and killed
  if it takes more time than allowed.
  .
- This package contains the dummy video scanner.
- .
- Homepage: http://lms.garage.maemo.org
+ This package contains the playlists scanners.
 
-Package: lightmediascanner0-asf
-Section: libs
-Priority: optional
+Package: lightmediascanner-plugin-audio-dummy
 Architecture: any
-Depends: ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version})
-Provides: lightmediascanner-asf
-Description: Lightweight library to scan media.
+Depends: ${misc:Depends}, ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version})
+Enhances: liblightmediascanner0
+Description: Lightmediascanner - Dummy audio plugin
  Light Media Scanner scans media, parsing and storing data in
  a SQLite3 database. Provides safe execution by executing the
  parsers in another process, that will be monitored and killed
  if it takes more time than allowed.
  .
- This package contains the asf scanner.
- .
- Homepage: http://lms.garage.maemo.org
+ This package contains the dummy audio scanner.
 
-Package: lightmediascanner0-rm
-Section: libs
-Priority: optional
+Package: lightmediascanner-plugin-video-dummy
 Architecture: any
-Depends: ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version})
-Provides: lightmediascanner-rm
-Description: Lightweight library to scan media.
+Depends: ${misc:Depends}, ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version})
+Enhances: liblightmediascanner0
+Description: Lightmediascanner - Dummy video plugin
  Light Media Scanner scans media, parsing and storing data in
  a SQLite3 database. Provides safe execution by executing the
  parsers in another process, that will be monitored and killed
  if it takes more time than allowed.
  .
- This package contains the Real Media scanner.
- .
- Homepage: http://lms.garage.maemo.org
+ This package contains the dummy video scanner.
 
-Package: lightmediascanner0-flac
-Section: libs
-Priority: optional
+Package: lightmediascanner-plugin-asf
 Architecture: any
-Depends: ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version}), libflac8
-Provides: lightmediascanner-flac
-Description: Lightweight library to scan media.
+Depends: ${misc:Depends}, ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version})
+Enhances: liblightmediascanner0
+Description: Lightmediascanner - Asf plugin
  Light Media Scanner scans media, parsing and storing data in
  a SQLite3 database. Provides safe execution by executing the
  parsers in another process, that will be monitored and killed
  if it takes more time than allowed.
  .
- This package contains the flac scanner.
- .
- Homepage: http://lms.garage.maemo.org
+ This package contains the asf scanner.
 
-Package: lightmediascanner0-mp4
-Section: libs
-Priority: optional
+Package: lightmediascanner-plugin-rm
 Architecture: any
-Depends: ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version}), libmp4v2-0
-Provides: lightmediascanner-mp4
-Description: Lightweight library to scan media.
+Depends: ${misc:Depends}, ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version})
+Enhances: liblightmediascanner0
+Description: Lightmediascanner, Real Media plugin
  Light Media Scanner scans media, parsing and storing data in
  a SQLite3 database. Provides safe execution by executing the
  parsers in another process, that will be monitored and killed
  if it takes more time than allowed.
  .
- This package contains the mp4 scanner.
- .
- Homepage: http://lms.garage.maemo.org
+ This package contains the Real Media scanner.
 
-Package: lightmediascanner0-ogg
-Section: libs
-Priority: optional
+Package: lightmediascanner-plugin-flac
 Architecture: any
-Depends: ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version}), ogg-support (>= 0.7)
-Provides: lightmediascanner-ogg
-Suggests: ligthtmediascanner-plugins
-Description: Lightweight library to scan media.
+Depends: ${misc:Depends}, ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version}), libflac8
+Enhances: liblightmediascanner0
+Description: Lightmediascanner - Flac plugin
  Light Media Scanner scans media, parsing and storing data in
  a SQLite3 database. Provides safe execution by executing the
  parsers in another process, that will be monitored and killed
  if it takes more time than allowed.
  .
- This package contains the ogg scanner.
- .
- Homepage: http://lms.garage.maemo.org
+ This package contains the flac scanner.
 
-Package: lightmediascanner0-plugins
-Section: libs
-Priority: optional
+Package: lightmediascanner-plugin-mp4
 Architecture: any
-Depends: lightmediascanner0-id3 (= ${Source-Version}), lightmediascanner0-jpeg (= ${Source-Version}),
- lightmediascanner0-png (= ${Source-Version}), lightmediascanner0-playlists (= ${Source-Version}),
- lightmediascanner0-audio-dummy (= ${Source-Version}), lightmediascanner0-video-dummy (= ${Source-Version}),
- lightmediascanner0-asf (= ${Source-Version}), lightmediascanner0-rm (= ${Source-Version}),
- lightmediascanner0-flac (= ${Source-Version}), lightmediascanner0-mp4 (= ${Source-Version})
-Provides: lightmediascanner-plugins
-Description: Lightweight library to scan media.
+Depends: ${misc:Depends}, ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version}), libmp4v2-0
+Enhances: liblightmediascanner0
+Description: Lightmediascanner - Mp4 plugin
  Light Media Scanner scans media, parsing and storing data in
  a SQLite3 database. Provides safe execution by executing the
  parsers in another process, that will be monitored and killed
  if it takes more time than allowed.
  .
- This is a metapackage for all scanners.
- .
- Homepage: http://lms.garage.maemo.org
+ This package contains the mp4 scanner.
 
-Package: liblightmediascanner0-dev
-Section: libdevel
-Priority: optional
+Package: lightmediascanner-plugin-ogg
 Architecture: any
-Depends: liblightmediascanner0 (= ${Source-Version}), lightmediascanner0-plugins (= ${Source-Version})
-Provides: liblightmediascanner-dev
-Description: Lightweight library to scan media.
+Depends: ${misc:Depends}, ${shlibs:Depends}, liblightmediascanner0 (= ${Source-Version}), libvorbis0a
+Enhances: liblightmediascanner0
+Description: Lightmediascanner - Ogg plugin
  Light Media Scanner scans media, parsing and storing data in
  a SQLite3 database. Provides safe execution by executing the
  parsers in another process, that will be monitored and killed
  if it takes more time than allowed.
  .
- This package contains the lightmediascanner library.
- .
- Homepage: http://lms.garage.maemo.org
+ This package contains the ogg scanner.

diff --git a/packages/lightmediascanner/debian/liblightmediascanner-dev.install b/packages/lightmediascanner/debian/liblightmediascanner-dev.install
new file mode 100644 (file)
index 0000000..8d38467
--- /dev/null
+++ b/packages/lightmediascanner/debian/liblightmediascanner-dev.install
@@ -0,0 +1,9 @@
+debian/tmp/usr/include/*.h
+debian/tmp/usr/lib/liblightmediascanner*.a
+debian/tmp/usr/lib/liblightmediascanner*.la
+debian/tmp/usr/lib/liblightmediascanner*.so
+debian/tmp/usr/lib/lightmediascanner/plugins/*.a
+debian/tmp/usr/lib/lightmediascanner/plugins/*.la
+debian/tmp/usr/lib/lightmediascanner/plugins/dummy.so
+debian/tmp/usr/lib/pkgconfig/*
+

diff --git a/packages/lightmediascanner/debian/lightmediascanner-plugin-asf.install b/packages/lightmediascanner/debian/lightmediascanner-plugin-asf.install
new file mode 100644 (file)
index 0000000..9450929
--- /dev/null
+++ b/packages/lightmediascanner/debian/lightmediascanner-plugin-asf.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lightmediascanner/plugins/asf.so

diff --git a/packages/lightmediascanner/debian/lightmediascanner-plugin-audio-dummy.install b/packages/lightmediascanner/debian/lightmediascanner-plugin-audio-dummy.install
new file mode 100644 (file)
index 0000000..7899f7b
--- /dev/null
+++ b/packages/lightmediascanner/debian/lightmediascanner-plugin-audio-dummy.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lightmediascanner/plugins/audio-dummy.so

diff --git a/packages/lightmediascanner/debian/lightmediascanner-plugin-flac.install b/packages/lightmediascanner/debian/lightmediascanner-plugin-flac.install
new file mode 100644 (file)
index 0000000..365192f
--- /dev/null
+++ b/packages/lightmediascanner/debian/lightmediascanner-plugin-flac.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lightmediascanner/plugins/flac.so

diff --git a/packages/lightmediascanner/debian/lightmediascanner-plugin-id3.install b/packages/lightmediascanner/debian/lightmediascanner-plugin-id3.install
new file mode 100644 (file)
index 0000000..6aa9db2
--- /dev/null
+++ b/packages/lightmediascanner/debian/lightmediascanner-plugin-id3.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lightmediascanner/plugins/id3.so

diff --git a/packages/lightmediascanner/debian/lightmediascanner-plugin-jpeg.install b/packages/lightmediascanner/debian/lightmediascanner-plugin-jpeg.install
new file mode 100644 (file)
index 0000000..8c4ace8
--- /dev/null
+++ b/packages/lightmediascanner/debian/lightmediascanner-plugin-jpeg.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lightmediascanner/plugins/jpeg.so

diff --git a/packages/lightmediascanner/debian/lightmediascanner-plugin-mp4.install b/packages/lightmediascanner/debian/lightmediascanner-plugin-mp4.install
new file mode 100644 (file)
index 0000000..46b65b2
--- /dev/null
+++ b/packages/lightmediascanner/debian/lightmediascanner-plugin-mp4.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lightmediascanner/plugins/mp4.so

diff --git a/packages/lightmediascanner/debian/lightmediascanner-plugin-ogg.install b/packages/lightmediascanner/debian/lightmediascanner-plugin-ogg.install
new file mode 100644 (file)
index 0000000..5fec22d
--- /dev/null
+++ b/packages/lightmediascanner/debian/lightmediascanner-plugin-ogg.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/lightmediascanner/plugins/ogg.so
+

diff --git a/packages/lightmediascanner/debian/lightmediascanner-plugin-playlists.install b/packages/lightmediascanner/debian/lightmediascanner-plugin-playlists.install
new file mode 100644 (file)
index 0000000..8a2ac7c
--- /dev/null
+++ b/packages/lightmediascanner/debian/lightmediascanner-plugin-playlists.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/lightmediascanner/plugins/m3u.so
+debian/tmp/usr/lib/lightmediascanner/plugins/pls.so

diff --git a/packages/lightmediascanner/debian/lightmediascanner-plugin-png.install b/packages/lightmediascanner/debian/lightmediascanner-plugin-png.install
new file mode 100644 (file)
index 0000000..58a5ce0
--- /dev/null
+++ b/packages/lightmediascanner/debian/lightmediascanner-plugin-png.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lightmediascanner/plugins/png.so

diff --git a/packages/lightmediascanner/debian/lightmediascanner-plugin-rm.install b/packages/lightmediascanner/debian/lightmediascanner-plugin-rm.install
new file mode 100644 (file)
index 0000000..3f6c975
--- /dev/null
+++ b/packages/lightmediascanner/debian/lightmediascanner-plugin-rm.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lightmediascanner/plugins/rm.so

diff --git a/packages/lightmediascanner/debian/lightmediascanner-plugin-video-dummy.install b/packages/lightmediascanner/debian/lightmediascanner-plugin-video-dummy.install
new file mode 100644 (file)
index 0000000..139e0de
--- /dev/null
+++ b/packages/lightmediascanner/debian/lightmediascanner-plugin-video-dummy.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lightmediascanner/plugins/video-dummy.so

diff --git a/packages/lightmediascanner/debian/lightmediascanner-plugins.install b/packages/lightmediascanner/debian/lightmediascanner-plugins.install
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/lightmediascanner/debian/rules b/packages/lightmediascanner/debian/rules
index 7c79469..734f50e 100755 (executable)
--- a/packages/lightmediascanner/debian/rules
+++ b/packages/lightmediascanner/debian/rules
@@ -3,43 +3,4 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_BUILD_ARCH?=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-ifeq ($(DEB_BUILD_ARCH),armel)
-       COMMON_CFLAGS=-DNDEBUG=1 -fomit-frame-pointer -O2 -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
-       N770_CFLAGS=-mcpu=arm926ej-s
-       N8x0_CFLAGS=-mfpu=vfp -mfloat-abi=softfp -mcpu=arm1136jf-s
-       ifneq ($(DEB_BUILD_OPTIONS),)
-               ifneq (,$(findstring n8x0,$(DEB_BUILD_OPTIONS)))
-                       SPECIFIC_CFLAGS=$(N8x0_CFLAGS)
-               else
-                       ifneq (,$(findstring n770,$(DEB_BUILD_OPTIONS)))
-                               SPECIFIC_CFLAGS=$(N770_CFLAGS)
-                       endif
-               endif
-       endif
-    ifeq ($(SPECIFIC_CFLAGS),)
-        ifeq (0,$(shell test -e /etc/osso_software_version; echo $$?))
-            SW_VERSION?=$(shell cat /etc/osso_software_version|cut -d_ -f2)
-                       ifneq (,$(findstring $(SW_VERSION),OSSO1.1 2008SE DIABLO))
-                               SPECIFIC_CFLAGS=$(N8x0_CFLAGS)
-            endif
-               endif
-       ifeq ($(SPECIFIC_CFLAGS),)
-            # Our last hope is to look at the value returned by `sb-conf current`
-            SB_CURRENT?=$(shell sb-conf current|cut -d_ -f1)
-                       ifneq (,$(findstring $(SB_CURRENT),GREGALE BORA CHINOOK DIABLO))
-                               ifeq ($(SB_CURRENT),GREGALE)
-                                       SPECIFIC_CFLAGS=$(N770_CFLAGS)
-                               else
-                                       SPECIFIC_CFLAGS=$(N8x0_CFLAGS)
-                               endif
-                       else
-                               COMMON_CFLAGS=
-                       endif
-        endif
-    endif
-endif
-
-CFLAGS+=$(COMMON_CFLAGS) $(SPECIFIC_CFLAGS)
 

diff --git a/packages/python-lightmediascanner/debian/changelog b/packages/python-lightmediascanner/debian/changelog
index 0e68206..43f36f0 100644 (file)
--- a/packages/python-lightmediascanner/debian/changelog
+++ b/packages/python-lightmediascanner/debian/changelog
@@ -1,8 +1,8 @@
-python-lightmediascanner (0.2.0-maemo1) unstable; urgency=low
+python-lightmediascanner (0.2.0-1ubuntu0.1) jaunty; urgency=low
 
-  * New upstream release.
+  * Ubuntization
 
- -- Eduardo Lima (Etrunko) <eduardo.lima@indt.org.br>  Mon, 06 Oct 2008 15:08:36 -0300
+ -- Rodrigo Belem <rclbelem@gmail.com>  Thu, 23 Apr 2009 15:42:12 -0400
 
 python-lightmediascanner (0.1.2-maemo1) unstable; urgency=low
 

diff --git a/packages/python-lightmediascanner/debian/compat b/packages/python-lightmediascanner/debian/compat
index b8626c4..7f8f011 100644 (file)
--- a/packages/python-lightmediascanner/debian/compat
+++ b/packages/python-lightmediascanner/debian/compat
@@ -1 +1 @@
-4
+7

diff --git a/packages/python-lightmediascanner/debian/control b/packages/python-lightmediascanner/debian/control
index a8876c2..f984581 100644 (file)
--- a/packages/python-lightmediascanner/debian/control
+++ b/packages/python-lightmediascanner/debian/control
@@ -1,14 +1,17 @@
 Source: python-lightmediascanner
+Section: python
 Priority: optional
 Maintainer: Gustavo Sverzut Barbieri <gustavo.barbieri@openbossa.org>
-Build-Depends: debhelper, cdbs, liblightmediascanner0-dev (>= 0.2.0), python-setuptools (>= 0.6c3) | python2.5-setuptools (>= 0.6c3), python2.5-dev (>= 2.5.1-1osso6), python2.5-pyrex, python2.5-cython-dev, libsqlite3-dev
-Standards-Version: 3.6.1
+Build-Depends: cdbs, debhelper (>= 6), python-all-dev (>= 2.4), python-central (>= 0.5.6), python-setuptools (>= 0.6c3), cython, python-pyrex, liblightmediascanner-dev (>= 0.2.0), libsqlite3-dev
+Standards-Version: 3.8.0
+XS-Python-Version: >= 2.4
+Homepage: http://lms.garage.maemo.org/
 
-Package: python2.5-lightmediascanner
-Section: python
-Priority: optional
+Package: python-lightmediascanner
 Architecture: any
-Depends: ${shlibs:Depends}, python2.5 (>= 2.5.1-1osso6), liblightmediascanner0 (>= 0.2.0)
+Depends: ${shlibs:Depends}, ${python:Depends}, liblightmediascanner0 (>= 0.2.0)
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
 Description: Lightweight library to scan media.
  Light Media Scanner scans media, parsing and storing data in
  a SQLite3 database. Provides safe execution by executing the

diff --git a/packages/python-lightmediascanner/debian/python2.5-lightmediascanner.install b/packages/python-lightmediascanner/debian/python2.5-lightmediascanner.install
deleted file mode 100644 (file)
index 52b6b3c..0000000
--- a/packages/python-lightmediascanner/debian/python2.5-lightmediascanner.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python2.5/site-packages/*/*

diff --git a/packages/python-lightmediascanner/debian/rules b/packages/python-lightmediascanner/debian/rules
index 236604c..d6a842f 100755 (executable)
--- a/packages/python-lightmediascanner/debian/rules
+++ b/packages/python-lightmediascanner/debian/rules
@@ -1,92 +1,12 @@
 #!/usr/bin/make -f
+# -*- mode: makefile; coding: utf-8 -*-
 
-DEB_DESTDIR=$(CURDIR)/debian/tmp
+DEB_PYTHON_SYSTEM := pycentral
 
-PYVER=2.5
-PYTHON=python$(PYVER)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
 
-DEB_BUILD_ARCH?=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+clean::
+       find lightmediascanner -name '*.c' | xargs rm -rf
+       rm -rf python_lightmediascanner.egg-info
 
-ifeq ($(DEB_BUILD_ARCH),armel)
-       COMMON_CFLAGS=-DNDEBUG=1 -fomit-frame-pointer -O2 -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
-       N770_CFLAGS=-mcpu=arm926ej-s
-       N8x0_CFLAGS=-mfpu=vfp -mfloat-abi=softfp -mcpu=arm1136jf-s
-       ifneq ($(DEB_BUILD_OPTIONS),)
-               ifneq (,$(findstring n8x0,$(DEB_BUILD_OPTIONS)))
-                       SPECIFIC_CFLAGS=$(N8x0_CFLAGS)
-               else
-                       ifneq (,$(findstring n770,$(DEB_BUILD_OPTIONS)))
-                               SPECIFIC_CFLAGS=$(N770_CFLAGS)
-                       endif
-               endif
-       endif
-    ifeq ($(SPECIFIC_CFLAGS),)
-        ifeq (0,$(shell test -e /etc/osso_software_version; echo $$?))
-            SW_VERSION?=$(shell cat /etc/osso_software_version|cut -d_ -f2)
-                       ifneq (,$(findstring $(SW_VERSION),OSSO1.1 2008SE DIABLO))
-                               SPECIFIC_CFLAGS=$(N8x0_CFLAGS)
-            endif
-               endif
-       ifeq ($(SPECIFIC_CFLAGS),)
-            # Our last hope is to look at the value returned by `sb-conf current`
-            SB_CURRENT?=$(shell sb-conf current|cut -d_ -f1)
-                       ifneq (,$(findstring $(SB_CURRENT),GREGALE BORA CHINOOK DIABLO))
-                               ifeq ($(SB_CURRENT),GREGALE)
-                                       SPECIFIC_CFLAGS=$(N770_CFLAGS)
-                               else
-                                       SPECIFIC_CFLAGS=$(N8x0_CFLAGS)
-                               endif
-                       else
-                               COMMON_CFLAGS=
-                       endif
-        endif
-    endif
-endif
-
-CFLAGS+=$(COMMON_CFLAGS) $(SPECIFIC_CFLAGS)
-
-build: build-stamp
-build-stamp:
-       dh_testdir
-       touch lightmediascanner/lightmediascanner.*.pyx
-       CFLAGS="$(CFLAGS)" $(PYTHON) setup.py build_ext build
-       touch build-stamp
-clean:
-       dh_testdir
-       dh_testroot
-       CFLAGS="$(CFLAGS)" $(PYTHON) setup.py clean
-       -rm -f build-stamp
-       -rm -rf build dist python_lightmediascanner.egg-info
-       -rm -f lightmediascanner/*.py[co]
-       -rm -f *.py[co]
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_installdirs
-       CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install --root=$(DEB_DESTDIR)
-       if [ "x$(DEB_BUILD_ARCH)" = "xarmel" ]; then \
-        rm -rf $(DEB_DESTDIR)/usr/lib/$(PYTHON)/site-packages/ligthmediascanner/*.py; \
-        rm -rf $(DEB_DESTDIR)/usr/lib/$(PYTHON)/site-packages/ligthmediascanner/*.pyc; \
-    fi
-       dh_install --sourcedir=$(DEB_DESTDIR) --fail-missing
-
-binary: binary-arch
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installdocs
-       dh_installdebconf
-       dh_installchangelogs
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-.PHONY: build install clean binary binary-arch