[svn r37] Added gstreamer-plugins-base-0.10 dependence to configure.ac (gst interfaces). Fixed debian package removing maemo dependencies and renamed package to gmyth instead of mmyth
1.1 --- a/gmyth/ChangeLog Fri Oct 20 22:48:04 2006 +0100
1.2 +++ b/gmyth/ChangeLog Sat Oct 21 03:54:07 2006 +0100
1.3 @@ -16,7 +16,7 @@
1.4 (configure.ac, Makefile.am) - some autotools misusage fixed.
1.5 * Added the MythURI structure, and the URI parsing utility functions
1.6 (missing in the GLib).
1.7 - * Some functions were exported (myth_socket, mmyth_context), that's
1.8 + * Some functions were exported (myth_socket, gmyth_context), that's
1.9 why many ther modules need to use them.
1.10 * Fixed some library dependencies.
1.11 * Prepared to be used inside the GStreamer (linking with the MythTV
2.1 --- a/gmyth/configure.ac Fri Oct 20 22:48:04 2006 +0100
2.2 +++ b/gmyth/configure.ac Sat Oct 21 03:54:07 2006 +0100
2.3 @@ -140,7 +140,7 @@
2.4 AC_SUBST(GST_CFLAGS)
2.5 AC_SUBST(GST_LIBS)
2.6
2.7 -# check for gstreamer-base plugins (xoverlay interface)
2.8 +# check for gstreamer-base
2.9 GSTBASE_REQUIRED=0.10
2.10 GSTBASE_MAJORMINOR=0.10
2.11 PKG_CHECK_MODULES(GSTBASE, \
2.12 @@ -156,9 +156,35 @@
2.13 AC_SUBST(GSTBASE_CFLAGS)
2.14 AC_SUBST(GSTBASE_LIBS)
2.15
2.16 +# check for gstreamer-base plugins (xoverlay interface)
2.17 +GSTPLUGINSBASE_REQUIRED=0.10
2.18 +GSTPLUGINSBASE_MAJORMINOR=0.10
2.19 +PKG_CHECK_MODULES(GSTPLUGINSBASE, \
2.20 + gstreamer-plugins-base-$GSTPLUGINSBASE_MAJORMINOR >= $GSTPLUGINSBASE_REQUIRED,
2.21 + HAVE_GSTPLUGINSBASE=yes, HAVE_GSTPLUGINSBASE=no)
2.22 +
2.23 +# Give error and exit if we don't have gstreamer base libraries
2.24 +if test "x$HAVE_GSTPLUGINSBASE" = "xno"; then
2.25 + AC_MSG_ERROR(you need gstreamer plugins base development packages installed !)
2.26 +fi
2.27 +
2.28 +# make GSTPLUGINSBASE_CFLAGS and GSTPLUGINSBASE_LIBS available
2.29 +AC_SUBST(GSTPLUGINSBASE_CFLAGS)
2.30 +AC_SUBST(GSTPLUGINSBASE_LIBS)
2.31 +
2.32
2.33 # make GST_MAJORMINOR available in Makefile.am
2.34 AC_SUBST(GST_MAJORMINOR)
2.35 +GSTBASE_MAJORMINOR=0.10
2.36 +PKG_CHECK_MODULES(GSTBASE, \
2.37 + gstreamer-base-$GSTBASE_MAJORMINOR >= $GSTBASE_REQUIRED,
2.38 + HAVE_GSTBASE=yes, HAVE_GSTBASE=no)
2.39 +
2.40 +# Give error and exit if we don't have gstreamer base libraries
2.41 +if test "x$HAVE_GSTBASE" = "xno"; then
2.42 + AC_MSG_ERROR(you need gstreamer base development packages installed !)
2.43 +fi
2.44 +
2.45
2.46 #
2.47 # mysql libraries
3.1 --- a/gmyth/debian/changelog Fri Oct 20 22:48:04 2006 +0100
3.2 +++ b/gmyth/debian/changelog Sat Oct 21 03:54:07 2006 +0100
3.3 @@ -1,4 +1,4 @@
3.4 -mmyth (0.1-indt1) unstable; urgency=low
3.5 +gmyth (0.1-indt1) unstable; urgency=low
3.6
3.7 * Initial Maemo Package.
3.8
4.1 --- a/gmyth/debian/control Fri Oct 20 22:48:04 2006 +0100
4.2 +++ b/gmyth/debian/control Sat Oct 21 03:54:07 2006 +0100
4.3 @@ -1,14 +1,13 @@
4.4 -Source: mmyth
4.5 +Source: gmyth
4.6 Section: user/accessories
4.7 Priority: optional
4.8 Maintainer: Hallyson Melo <hallyson.melo@indt.org.br>
4.9 Build-Depends: debhelper, libgtk2.0-dev (>= 2.4.0),
4.10 - libosso-dev, hildon-libs-dev, hildon-fm-dev
4.11 Standards-Version: 3.6.2
4.12
4.13 -Package: mmyth
4.14 +Package: gmyth
4.15 Architecture: any
4.16 -Depends: ${shlibs:Depends}, ${misc:Depends}, maemo-select-menu-location
4.17 +Depends: ${shlibs:Depends}, ${misc:Depends}
4.18 Provides: MythTV
4.19 Description: MythTV frontend
4.20 NONONONONONONONONONONONONONONONONO
5.1 --- a/gmyth/debian/control.in Fri Oct 20 22:48:04 2006 +0100
5.2 +++ b/gmyth/debian/control.in Sat Oct 21 03:54:07 2006 +0100
5.3 @@ -1,14 +1,13 @@
5.4 -Source: mmyth
5.5 +Source: gmyth
5.6 Section: user/accessories
5.7 Priority: optional
5.8 Maintainer: Hallyson Melo <hallyson.melo@indt.org.br>
5.9 Build-Depends: debhelper, libgtk2.0-dev (>= 2.4.0),
5.10 - libosso-dev, hildon-libs-dev, hildon-fm-dev
5.11 Standards-Version: 3.6.2
5.12
5.13 -Package: mmyth
5.14 +Package: gmyth
5.15 Architecture: any
5.16 -Depends: ${shlibs:Depends}, ${misc:Depends}, maemo-select-menu-location
5.17 +Depends: ${shlibs:Depends}, ${misc:Depends}
5.18 Provides: MythTV
5.19 Description: MythTV frontend
5.20 NONONONONONONONONONONONONONONONONO
6.1 --- a/gmyth/debian/mmyth.desktop Fri Oct 20 22:48:04 2006 +0100
6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
6.3 @@ -1,10 +0,0 @@
6.4 -[Desktop Entry]
6.5 -Encoding=UTF-8
6.6 -Version=0.1
6.7 -Type=Application
6.8 -Name=Maemo Myth
6.9 -Exec=/usr/bin/mmyth
6.10 -Terminal=false
6.11 -X-HildonDesk-ShowInToolbar=true
6.12 -X-Osso-Type=application/x-executable
6.13 -StartupWMClass=mmyth
7.1 --- a/gmyth/debian/mmyth.dirs Fri Oct 20 22:48:04 2006 +0100
7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
7.3 @@ -1,3 +0,0 @@
7.4 -usr/share/pixmaps
7.5 -usr/share/applications/hildon
7.6 -usr/share/dbus-1/services
8.1 --- a/gmyth/debian/mmyth.postinst Fri Oct 20 22:48:04 2006 +0100
8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
8.3 @@ -1,5 +0,0 @@
8.4 -#! /bin/sh
8.5 -
8.6 -maemo-select-menu-location mmyth.desktop tana_fi_extras
8.7 -
8.8 -exit 0
9.1 --- a/gmyth/debian/mmyth.service Fri Oct 20 22:48:04 2006 +0100
9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
9.3 @@ -1,3 +0,0 @@
9.4 -[D-BUS Service]
9.5 -Name=com.nokia.xournal
9.6 -Exec=/usr/bin/xournal
10.1 --- a/gmyth/debian/rules Fri Oct 20 22:48:04 2006 +0100
10.2 +++ b/gmyth/debian/rules Sat Oct 21 03:54:07 2006 +0100
10.3 @@ -8,8 +8,8 @@
10.4
10.5 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/usr
10.6
10.7 -binary-install/mmyth::
10.8 -# /usr/bin/install -p -m 644 debian/mmyth.png `pwd`/debian/mmyth/usr/share/pixmaps
10.9 - /usr/bin/install -p -m 644 debian/mmyth.desktop `pwd`/debian/mmyth/usr/share/applications/hildon
10.10 +#binary-install/gmyth::
10.11 +# /usr/bin/install -p -m 644 debian/gmyth.png `pwd`/debian/gmyth/usr/share/pixmaps
10.12 +# /usr/bin/install -p -m 644 debian/mmyth.desktop `pwd`/debian/mmyth/usr/share/applications/hildon
10.13 # /usr/bin/install -p -m 644 debian/mmyth.service `pwd`/debian/mmyth/usr/share/dbus-1/services
10.14
11.1 --- a/gmyth/src/Makefile.am Fri Oct 20 22:48:04 2006 +0100
11.2 +++ b/gmyth/src/Makefile.am Sat Oct 21 03:54:07 2006 +0100
11.3 @@ -22,6 +22,7 @@
11.4 $(GOBJECT_CFLAGS) \
11.5 $(GST_CFLAGS) \
11.6 $(GSTBASE_CFLAGS) \
11.7 + $(GSTPLUGINSBASE_CFLAGS) \
11.8 $(MYSQL_CFLAGS) \
11.9 -g3 -O0
11.10
11.11 @@ -30,10 +31,10 @@
11.12
11.13 libgmyth_la_LDFLAGS = \
11.14 -export-dynamic \
11.15 - -lgstinterfaces-0.10 \
11.16 $(MYSQL_LIBS) \
11.17 $(GST_LIBS) \
11.18 - $(GSTBASE_LIBS)
11.19 + $(GSTBASE_LIBS) \
11.20 + $(GSTPLUGINS_LIBS)
11.21
11.22 libgmyth_includedir = \
11.23 $(pkgincludedir)
12.1 --- a/gmyth/src/gmyth_settings.c Fri Oct 20 22:48:04 2006 +0100
12.2 +++ b/gmyth/src/gmyth_settings.c Sat Oct 21 03:54:07 2006 +0100
12.3 @@ -7,7 +7,7 @@
12.4 * user and program settings.
12.5 *
12.6 * The standard settings file is created in the user home folder, in the
12.7 - * file ~/.mmyth/settings.dat.
12.8 + * file ~/.gmyth/settings.dat.
12.9 *
12.10 * Copyright (C) 2006 INdT - Instituto Nokia de Tecnologia.
12.11 * @author Alexsandro Jose Virginio dos Santos <alexsandro.santos@indt.org.br>
12.12 @@ -41,7 +41,7 @@
12.13 #include <glib/gstdio.h>
12.14
12.15 #define GMYTH_SETTINGS_FILE_NAME "settings.dat"
12.16 -#define GMYTH_SETTINGS_DIR ".mmyth"
12.17 +#define GMYTH_SETTINGS_DIR ".gmyth"
12.18
12.19 static void gmyth_settings_class_init (GMythSettingsClass *klass);
12.20 static void gmyth_settings_init (GMythSettings *object);
12.21 @@ -198,7 +198,7 @@
12.22 }
12.23
12.24 /** Loads the GMyth settings from the standard settings file
12.25 - * (~/.mmyth/settings.dat).
12.26 + * (~/.gmyth/settings.dat).
12.27 *
12.28 * @param gmyth_settings the GMythSettings instance.
12.29 * @return TRUE if success, FALSE if error.
13.1 --- a/gmyth/src/gmyth_settings.h Fri Oct 20 22:48:04 2006 +0100
13.2 +++ b/gmyth/src/gmyth_settings.h Sat Oct 21 03:54:07 2006 +0100
13.3 @@ -7,7 +7,7 @@
13.4 * user and program settings.
13.5 *
13.6 * The standard settings file is created in the user home folder, in the
13.7 - * file ~/.mmyth/settings.dat.
13.8 + * file ~/.gmyth/settings.dat.
13.9 *
13.10 * Copyright (C) 2006 INdT - Instituto Nokia de Tecnologia.
13.11 * @author Alexsandro Jose Virginio dos Santos <alexsandro.santos@indt.org.br>