Merge branch 'upstream' into experimental
authorJulien Valroff <julien@kirya.net>
Sun, 17 Jul 2011 11:32:23 +0000 (13:32 +0200)
committerJulien Valroff <julien@kirya.net>
Sun, 17 Jul 2011 11:32:23 +0000 (13:32 +0200)
14 files changed:
.gitignore [new file with mode: 0644]
debian/changelog [new file with mode: 0644]
debian/compat [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/manpages [new file with mode: 0644]
debian/patches/001_fix-build.diff [new file with mode: 0644]
debian/patches/002_default-stock-icons.diff [new file with mode: 0644]
debian/patches/series [new file with mode: 0644]
debian/pino.7 [new file with mode: 0644]
debian/rules [new file with mode: 0755]
debian/source/format [new file with mode: 0644]
debian/source/local-options [new file with mode: 0644]
debian/watch [new file with mode: 0644]

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..845ca06
--- /dev/null
@@ -0,0 +1 @@
+.pc
diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..cb47255
--- /dev/null
@@ -0,0 +1,36 @@
+pino (0.2.85+hg33-1) experimental; urgency=low
+
+  * First alpha version of the 0.3 branch
+  * Update to new policy 3.9.2 (no changes needed)
+
+ -- Julien Valroff <julien@debian.org>  Sat, 09 Apr 2011 07:57:49 +0200
+
+pino (0.2.11-4) unstable; urgency=low
+
+  * Apply patches from upstream bug tracker to allow build with recent
+    vala versions (Closes: #614431)
+
+ -- Julien Valroff <julien@debian.org>  Sun, 27 Feb 2011 14:21:52 +0100
+
+pino (0.2.11-3) unstable; urgency=low
+
+  * Bump debhelper compat to 8
+  * Upload to unstable 
+
+ -- Julien Valroff <julien@debian.org>  Sun, 13 Feb 2011 09:50:11 +0100
+
+pino (0.2.11-2) experimental; urgency=low
+
+  * Update my email address 
+  * Remove DMUA field, now useless 
+  * Update copyright information
+  * Add patch to fix Spanish translation - thanks to Josue Abarca
+    <jmaslibre@debian.org.gt> (Closes: #610502) 
+
+ -- Julien Valroff <julien@debian.org>  Wed, 19 Jan 2011 18:16:51 +0100
+
+pino (0.2.11-1) experimental; urgency=low
+
+  * Initial release (Closes: #573040)
+
+ -- Julien Valroff <julien@debian.org>  Sat, 11 Dec 2010 16:42:08 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..45a4fb7
--- /dev/null
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..6249ca5
--- /dev/null
@@ -0,0 +1,40 @@
+Source: pino
+Section: net
+Priority: optional
+Maintainer: Julien Valroff <julien@debian.org>
+Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 8),
+               cmake (>= 2.6.0),
+               valac,
+               libvala-0.10-dev,
+               libglib2.0-dev (>= 2.14),
+               libgtk2.0-dev (>= 2.10),
+               libgee-dev (>= 0.5.0),
+               libnotify-dev,
+               libsoup2.4-dev,
+               libxml2-dev,
+               libwebkit-dev,
+               libunique-dev (>= 1.0),
+               libgirepository1.0-dev,
+               libgtkspell-dev,
+               gettext,
+               libindicate-dev,
+               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
+
+Package: pino
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: simple and fast microblogging client
+ Pino is a simple and fast Twitter, Identi.ca and StatusNet client.
+ .
+ Pino provides several advanced features:
+  * Multi account support
+  * Conversation view
+  * Single instance mode
+  * Option for hiding tray icon
+  * Notification with application icon (for "docks" users) 
+  * Fresh statuses color
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..b854686
--- /dev/null
@@ -0,0 +1,97 @@
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166 
+Upstream-Name: Pino
+Upstream-Contact: troorl <troorl@gmail.com>
+Source: http://code.google.com/p/pino-twitter/downloads/list
+
+Files: *
+Copyright: 2009-2010, troorl <troorl@gmail.com>
+License: LGPL-3+
+
+Files: CMakeLists.txt
+Copyright: 2010, Cristian Greco <cristian@regolo.cc>
+License: LGPL-3+
+
+Files: cmake/ValaPrecompile.cmake cmake/FindVala.cmake cmake/ValaVersion.cmake
+Copyright: 2009, Jakob Westhoff <jakob@westhoffswelt.de>
+License:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+ .
+    2. Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation
+       and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ .
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of Jakob Westhoff
+
+Files: src/oauth-client.vala
+Copyright: 2009 Mark Lee <oauth@lazymalevolence.com>
+License: LGPL-3+
+
+Files: src/vapi/sha1.[ch]
+Copyright: 2009, Mark Lee <oauth@lazymalevolence.com>
+License: LGPL-2.1+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, either version 2.1 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ .
+ On Debian systems the full text of the GNU Lesser General Public
+ License can be found in the file `/usr/share/common-licenses/LGPL'.
+
+Files: src/vapi/time_parser.[ch]
+Copyright: 2007-2008, Daniel Morales <daniminas@gmail.com>
+License: GPL-2+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+ .
+ On Debian systems the full text of the GNU General Public
+ License can be found in the file `/usr/share/common-licenses/GPL'.
+
+Files: debian/*
+Copyright: 2009, troorl <troorl@gmail.com>
+           2010, Cristian Greco <cristian@regolo.cc>
+           2010-2011, Julien Valroff <julien@debian.org>
+License: GPL-3
+ On Debian systems the full text of the GNU General Public
+ License can be found in the file `/usr/share/common-licenses/GPL-3'.
+
+License: LGPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Lesser General Public License for more details.
+ .
+ On Debian systems, the full text of the GNU Lesser General Public
+ License can be found in the file `/usr/share/common-license/LGPL'.              
diff --git a/debian/manpages b/debian/manpages
new file mode 100644 (file)
index 0000000..4715dc0
--- /dev/null
@@ -0,0 +1 @@
+debian/pino.7
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/002_default-stock-icons.diff b/debian/patches/002_default-stock-icons.diff
new file mode 100644 (file)
index 0000000..340c53e
--- /dev/null
@@ -0,0 +1,33 @@
+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 @@
+       private Gdk.Pixbuf pix_updating;
+       
+       public Frame frame;
++
++      public Gdk.Pixbuf get_pixbuf_from_stock (string stock_id, Gtk.IconSize size) {
++
++              Gdk.Pixbuf pixbuf;
++              Gtk.Invisible w;
++     
++              w = new Gtk.Invisible ();
++              pixbuf = w.render_icon (stock_id, size, "vala");
++
++              return pixbuf;
++      }
+       
+       public TreeWidget(Window parent, Accounts accounts) {
+               this.parent = parent;
+               this.accounts = accounts;
+               
+               try {
+-                      pix_account = new Gdk.Pixbuf.from_file("/usr/share/icons/Humanity/places/24/folder-videos.svg");
++                      pix_account = get_pixbuf_from_stock("folder-videos", Gtk.IconSize.SMALL_TOOLBAR);
+                       pix_updating = new Gdk.Pixbuf.from_file(Config.UPDATING_PATH);
+               } catch(GLib.Error e) {
+                       debug(e.message);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..902e0e7
--- /dev/null
@@ -0,0 +1,2 @@
+001_fix-build.diff
+002_default-stock-icons.diff
diff --git a/debian/pino.7 b/debian/pino.7
new file mode 100644 (file)
index 0000000..5dec1a7
--- /dev/null
@@ -0,0 +1,22 @@
+.TH pino 7 "MARCH 2010" Linux "User Manuals"
+.SH NAME
+Pino \- Simple and fast microblogging client
+.SH SYNOPSIS
+.B pino
+.SH DESCRIPTION
+.B Pino
+is a simple and fast microblogging client. It currently supports Twitter, Identi.ca and StatusNet.
+.SH BUGS
+Please report all bugs to the Pino bug tracker:
+.br
+http://code.google.com/p/pino-twitter/issues/list
+.SH AUTHORS
+.B Pino
+was written by troorl <troorl@gmail.com>
+.br
+This manual page was written by Julien Valroff <julien@kirya.net>.
+.SH COPYRIGHT
+Copyright (c) 2009-2010 troorl <troorl@gmail.com>.
+.br
+This manual page is licensed under the GNU General Public License (GPL) version 3, see: <http://www.gnu.org/licenses/gpl-3.0.html>.
+
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..e43a808
--- /dev/null
@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+
+%:
+       dh $@
+
+override_dh_auto_configure:
+       dh_auto_configure -- -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed"
+
+override_dh_auto_install:
+       dh_auto_install
+       -rm -f $(CURDIR)/debian/pino/usr/share/doc/pino/INSTALL
+       -rm -f $(CURDIR)/debian/pino/usr/share/doc/pino/COPYING
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644 (file)
index 0000000..9cdfca9
--- /dev/null
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes
diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..7008b84
--- /dev/null
@@ -0,0 +1,3 @@
+version=3
+http://code.google.com/p/pino-twitter/downloads/list?can=1 http://pino-twitter.googlecode.com/files/pino-([\d\.]*)\.tar\.bz2
+