Allow build with vala 0.10
authorJulien Valroff <julien@kirya.net>
Sun, 6 Mar 2011 14:01:51 +0000 (15:01 +0100)
committerJulien Valroff <julien@kirya.net>
Sun, 6 Mar 2011 14:01:51 +0000 (15:01 +0100)
debian/changelog
debian/control
debian/patches/001_fix-build.diff [new file with mode: 0644]
debian/patches/001_librest0-7.diff [deleted file]
debian/patches/002_default-stock-icons.diff
debian/patches/003_es-translation.diff [deleted file]
debian/patches/series

index f768b3d..11c735c 100644 (file)
@@ -1,8 +1,8 @@
-pino (0.2.85-1) experimental; urgency=low
+pino (0.2.85+hg33-1) experimental; urgency=low
 
   * First alpha version of the 0.3 branch
 
- -- Julien Valroff <julien@debian.org>  Sun, 02 Jan 2011 13:50:06 +0100
+ -- Julien Valroff <julien@debian.org>  Sun, 06 Mar 2011 14:58:46 +0100
 
 pino (0.2.11-4) unstable; urgency=low
 
index e316987..a55e2aa 100644 (file)
@@ -6,7 +6,7 @@ Standards-Version: 3.9.1
 Build-Depends: debhelper (>= 8),
                cmake (>= 2.6.0),
                valac,
-               libvala-dev,
+               libvala-0.10-dev,
                libglib2.0-dev (>= 2.14),
                libgtk2.0-dev (>= 2.10),
                libgee-dev (>= 0.5.0),
@@ -19,8 +19,8 @@ Build-Depends: debhelper (>= 8),
                libgtkspell-dev,
                gettext,
                libindicate-dev,
-               librest-dev (>= 0.7.5-1),
-               librest-extras-dev (>= 0.7.5-1)
+               librest-dev (>= 0.7.5),
+               librest-extras-dev (>= 0.7.5)
 Homepage: http://pino-app.appspot.com/
 Vcs-Git: git://git.kirya.net/git/pino.git
 Vcs-Browser: http://git.kirya.net/?p=pino.git;a=summary
diff --git a/debian/patches/001_fix-build.diff b/debian/patches/001_fix-build.diff
new file mode 100644 (file)
index 0000000..cb781ac
--- /dev/null
@@ -0,0 +1,45 @@
+Description: Fixes several build issues
+Author: Julien Valroff <julien@debian.org>
+Forwarded: no
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,8 +59,8 @@
+ pkg_check_modules(WEBKIT REQUIRED "webkit-1.0 >= 1.0")
+ pkg_check_modules(LIBUNIQUE REQUIRED "unique-1.0 >= 1.0")
+ pkg_check_modules(GTKSPELL REQUIRED "gtkspell-2.0 >= 2.0")
+-pkg_check_modules(REST REQUIRED "rest-0.6 >= 0.6")
+-pkg_check_modules(RESTEXTRAS REQUIRED "rest-extras-0.6 >= 0.6")
++pkg_check_modules(REST REQUIRED "rest-0.7 >= 0.7")
++pkg_check_modules(RESTEXTRAS REQUIRED "rest-extras-0.7 >= 0.7")
+ pkg_check_modules(LIBINDICATE "indicate >= 0.3")
+ if(${LIBINDICATE_FOUND})
+--- a/src/stream_abstract.vala
++++ b/src/stream_abstract.vala
+@@ -7,9 +7,9 @@
+       
+       public signal void updated();
+       
+-      //public ArrayList<Status> statuses {get; set; default = new ArrayList<Status>();}
++      public ArrayList<Status> statuses {get; set; default = new ArrayList<Status>();}
+       
+-      //public ArrayList<Status> statuses_fresh {get; set; default = new ArrayList<Status>();}
++      public ArrayList<Status> statuses_fresh {get; set; default = new ArrayList<Status>();}
+       
+       public FeedModel model {get; set; default = new FeedModel();}
+       
+--- a/src/visual_style.vala
++++ b/src/visual_style.vala
+@@ -27,9 +27,9 @@
+               bg_light_color = rgb_to_hex(style.light[Gtk.StateType.NORMAL]);
+               fg_color = rgb_to_hex(style.fg[Gtk.StateType.NORMAL]);
+               
+-              Value? v = new Value(typeof(Gdk.Color));
++              Value? v = Value(typeof(Gdk.Color));
+               if(v != null) {
+-                      style.get_style_property(typeof(Gtk.Widget), "link-color", v);
++                      style.get_style_property(typeof(Gtk.Widget), "link-color", out v);
+                       lk_color = rgb_to_hex((Gdk.Color) v);
+                       debug(lk_color);
+               }
diff --git a/debian/patches/001_librest0-7.diff b/debian/patches/001_librest0-7.diff
deleted file mode 100644 (file)
index 72fae4d..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,8 +59,8 @@
- pkg_check_modules(WEBKIT REQUIRED "webkit-1.0 >= 1.0")
- pkg_check_modules(LIBUNIQUE REQUIRED "unique-1.0 >= 1.0")
- pkg_check_modules(GTKSPELL REQUIRED "gtkspell-2.0 >= 2.0")
--pkg_check_modules(REST REQUIRED "rest-0.6 >= 0.6")
--pkg_check_modules(RESTEXTRAS REQUIRED "rest-extras-0.6 >= 0.6")
-+pkg_check_modules(REST REQUIRED "rest-0.7 >= 0.7")
-+pkg_check_modules(RESTEXTRAS REQUIRED "rest-extras-0.7 >= 0.7")
- pkg_check_modules(LIBINDICATE "indicate >= 0.3")
- if(${LIBINDICATE_FOUND})
index 74f426c..340c53e 100644 (file)
@@ -1,3 +1,8 @@
+Description: don't use humanity icons as default
+Author: unknown
+Bug: https://bitbucket.org/troorl/pino3/issue/1
+Forwarded: not-needed
+
 --- a/src/tree_widget.vala
 +++ b/src/tree_widget.vala
 @@ -15,13 +15,24 @@
diff --git a/debian/patches/003_es-translation.diff b/debian/patches/003_es-translation.diff
deleted file mode 100644 (file)
index 6fd22a9..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix for Spanish translation
-Author: Josue Abarca <jmaslibre@debian.org.gt>
-Bug-Debian: http://bugs.debian.org/610502
-Forwarded: no
-
---- a/po/es.po
-+++ b/po/es.po
-@@ -149,7 +149,7 @@
- #: src/main_window.vala:465
- msgid "Show user"
--msgstr "Mostrar menĂº"
-+msgstr "Mostrar usuario"
- #: src/main_window.vala:466
- msgid "Show information about specified user"
index 843e3df..902e0e7 100644 (file)
@@ -1,2 +1,2 @@
-001_librest0-7.diff
+001_fix-build.diff
 002_default-stock-icons.diff