[tbo] Updated debian package. Making code debian compatible



commit 8d5c99b3e9df720bc998365390b9c0fc12336940
Author: Daniel Garcia Moreno <danigm wadobo com>
Date:   Sat Apr 13 13:06:40 2013 +0200

    Updated debian package. Making code debian compatible

 VERSION                 |  2 +-
 configure.ac            |  2 +-
 debian/changelog        |  6 ++++++
 debian/compat           |  2 +-
 debian/control          | 14 ++++++--------
 debian/rules            |  2 +-
 src/tbo-object-base.c   |  6 +++---
 src/tbo-object-group.c  |  6 +++---
 src/tbo-object-pixmap.c |  6 +++---
 src/tbo-object-svg.c    |  6 +++---
 src/tbo-object-text.c   |  6 +++---
 src/tbo-utils.c         |  2 +-
 12 files changed, 32 insertions(+), 28 deletions(-)
---
diff --git a/VERSION b/VERSION
index 0f6db3d..d3827e7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.98
+1.0
diff --git a/configure.ac b/configure.ac
index b6549cc..d6fcc25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT([tbo], [0.98], [dani danigm net])
+AC_INIT([tbo], [1.0], [dani danigm net])
 AC_CONFIG_AUX_DIR([build])
 AM_INIT_AUTOMAKE([1.9.6 -Wall -Werror dist-bzip2])
 
diff --git a/debian/changelog b/debian/changelog
index daaabad..e7469f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tbo (1.0.0) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Garcia <danigm wadobo com>  Sat, 13 Apr 2013 06:40:04 -0400
+
 tbo (0.98~git20100623+2295523-0ubuntu1) lucid; urgency=low
 
   * New upstream release
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 0d5ff2b..f499307 100644
--- a/debian/control
+++ b/debian/control
@@ -1,25 +1,23 @@
 Source: tbo
 Section: gnome
 Priority: optional
-Maintainer: Daniel Garcia <dani danigm net>
+Maintainer: Daniel Garcia <danigm wadobo com>
 Uploaders: Roberto C. Morano <rcmorano emergya es>
 Build-Depends: cdbs,
-               debhelper,
+               debhelper (>= 8),
                pkg-config,
                libglib2.0-dev,
-               libgtk2.0-dev,
-               libgnome2-dev,
+               libgtk-3-dev,
                librsvg2-dev,
-               gnome-pkg-tools,
                gnome-common,
                intltool
-Standards-Version: 3.8.1
-Homepage: http://danigm.net/TBO
+Standards-Version: 3.9.2
+Homepage: http://github.com/danigm/TBO
 
 Package: tbo
 Architecture: any
 Depends: ${shlibs:Depends},
-         libgtk2.0-0,
+         libgtk-3-0,
          ${misc:Depends}
 Description: Intuitive GNOME comic creator
  TBO is a simple and easy drag and drop comic creator.
diff --git a/debian/rules b/debian/rules
index f860049..08623a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,4 +4,4 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
 # Add here any variable or target overrides you need.
-DEB_CONFIGURE_SCRIPT := ./autogen.sh
+# DEB_CONFIGURE_SCRIPT := ./autogen.sh
diff --git a/src/tbo-object-base.c b/src/tbo-object-base.c
index 90dd37e..db47519 100644
--- a/src/tbo-object-base.c
+++ b/src/tbo-object-base.c
@@ -27,7 +27,7 @@ G_DEFINE_TYPE (TboObjectBase, tbo_object_base, G_TYPE_OBJECT);
 
 static void draw (TboObjectBase *, Frame *, cairo_t *);
 static void save (TboObjectBase *, FILE *);
-static TboObjectBase * clone (TboObjectBase *);
+static TboObjectBase * tclone (TboObjectBase *);
 
 static void
 draw (TboObjectBase *self, Frame *frame, cairo_t *cr)
@@ -83,7 +83,7 @@ resize (TboObjectBase *self, enum RESIZE_OPT type)
 }
 
 static TboObjectBase *
-clone (TboObjectBase *self)
+tclone (TboObjectBase *self)
 {
     return NULL;
 }
@@ -103,7 +103,7 @@ tbo_object_base_init (TboObjectBase *self)
 
     self->draw = draw;
     self->save = save;
-    self->clone = clone;
+    self->clone = tclone;
 
     self->move = move;
     self->resize = resize;
diff --git a/src/tbo-object-group.c b/src/tbo-object-group.c
index 09373eb..71b2d5b 100644
--- a/src/tbo-object-group.c
+++ b/src/tbo-object-group.c
@@ -26,10 +26,10 @@
 
 G_DEFINE_TYPE (TboObjectGroup, tbo_object_group, TBO_TYPE_OBJECT_BASE);
 
-static TboObjectBase * clone (TboObjectBase *);
+static TboObjectBase * tclone (TboObjectBase *);
 
 static TboObjectBase *
-clone (TboObjectBase *self)
+tclone (TboObjectBase *self)
 {
     return NULL;
 }
@@ -86,7 +86,7 @@ tbo_object_group_init (TboObjectGroup *self)
     self->objs = NULL;
     self->parent_move = self->parent_instance.move;
 
-    self->parent_instance.clone = clone;
+    self->parent_instance.clone = tclone;
     self->parent_instance.resize = resize;
     self->parent_instance.move = move;
 }
diff --git a/src/tbo-object-pixmap.c b/src/tbo-object-pixmap.c
index 346905b..4dfa314 100644
--- a/src/tbo-object-pixmap.c
+++ b/src/tbo-object-pixmap.c
@@ -29,7 +29,7 @@ G_DEFINE_TYPE (TboObjectPixmap, tbo_object_pixmap, TBO_TYPE_OBJECT_BASE);
 
 static void draw (TboObjectBase *, Frame *, cairo_t *);
 static void save (TboObjectBase *, FILE *);
-static TboObjectBase * clone (TboObjectBase *);
+static TboObjectBase * tclone (TboObjectBase *);
 
 static void
 draw (TboObjectBase *self, Frame *frame, cairo_t *cr)
@@ -98,7 +98,7 @@ save (TboObjectBase *self, FILE *file)
 }
 
 static TboObjectBase *
-clone (TboObjectBase *self)
+tclone (TboObjectBase *self)
 {
     TboObjectPixmap *pixmap;
     TboObjectBase *newpixmap;
@@ -125,7 +125,7 @@ tbo_object_pixmap_init (TboObjectPixmap *self)
 
     self->parent_instance.draw = draw;
     self->parent_instance.save = save;
-    self->parent_instance.clone = clone;
+    self->parent_instance.clone = tclone;
 }
 
 static void
diff --git a/src/tbo-object-svg.c b/src/tbo-object-svg.c
index 1e4bc7f..0f94936 100644
--- a/src/tbo-object-svg.c
+++ b/src/tbo-object-svg.c
@@ -33,7 +33,7 @@ G_DEFINE_TYPE (TboObjectSvg, tbo_object_svg, TBO_TYPE_OBJECT_BASE);
 
 static void draw (TboObjectBase *, Frame *, cairo_t *);
 static void save (TboObjectBase *, FILE *);
-static TboObjectBase * clone (TboObjectBase *);
+static TboObjectBase * tclone (TboObjectBase *);
 
 static void
 draw (TboObjectBase *self, Frame *frame, cairo_t *cr)
@@ -109,7 +109,7 @@ save (TboObjectBase *self, FILE *file)
 }
 
 static TboObjectBase *
-clone (TboObjectBase *self)
+tclone (TboObjectBase *self)
 {
     TboObjectSvg *svg;
     TboObjectBase *newsvg;
@@ -136,7 +136,7 @@ tbo_object_svg_init (TboObjectSvg *self)
 
     self->parent_instance.draw = draw;
     self->parent_instance.save = save;
-    self->parent_instance.clone = clone;
+    self->parent_instance.clone = tclone;
 }
 
 static void
diff --git a/src/tbo-object-text.c b/src/tbo-object-text.c
index fe7cc4c..943fcc5 100644
--- a/src/tbo-object-text.c
+++ b/src/tbo-object-text.c
@@ -28,7 +28,7 @@ G_DEFINE_TYPE (TboObjectText, tbo_object_text, TBO_TYPE_OBJECT_BASE);
 
 static void draw (TboObjectBase *, Frame *, cairo_t *);
 static void save (TboObjectBase *, FILE *);
-static TboObjectBase * clone (TboObjectBase *);
+static TboObjectBase * tclone (TboObjectBase *);
 
 static void
 draw (TboObjectBase *self, Frame *frame, cairo_t *cr)
@@ -117,7 +117,7 @@ save (TboObjectBase *self, FILE *file)
 }
 
 static TboObjectBase *
-clone (TboObjectBase *self)
+tclone (TboObjectBase *self)
 {
     TboObjectText *text;
     TboObjectBase *newtext;
@@ -148,7 +148,7 @@ tbo_object_text_init (TboObjectText *self)
 
     self->parent_instance.draw = draw;
     self->parent_instance.save = save;
-    self->parent_instance.clone = clone;
+    self->parent_instance.clone = tclone;
 }
 
 static void
diff --git a/src/tbo-utils.c b/src/tbo-utils.c
index acaf718..1b187aa 100644
--- a/src/tbo-utils.c
+++ b/src/tbo-utils.c
@@ -30,6 +30,6 @@ get_base_name (gchar *str, gchar *ret, int size)
     dirname = paths;
     while (*dirname) dirname++;
     dirname--;
-    snprintf (ret, size, *dirname);
+    snprintf (ret, size, "%s", *dirname);
     g_strfreev (paths);
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]