remove patches merged upstream
authorJulien Valroff <julien@kirya.net>
Tue, 6 Jul 2010 12:18:52 +0000 (14:18 +0200)
committerJulien Valroff <julien@kirya.net>
Tue, 6 Jul 2010 12:18:52 +0000 (14:18 +0200)
debian/changelog
debian/patches/002_allow-current-user-info.diff [new file with mode: 0644]
debian/patches/002_identica-tags.diff [deleted file]
debian/patches/003_improve-regex.diff [deleted file]
debian/patches/004_allow-current-user-info.diff [deleted file]
debian/patches/005_startup-notify.diff [deleted file]
debian/patches/series

index 20e0b5c..a381273 100644 (file)
@@ -1,4 +1,4 @@
-pino (0.2.10-1) experimental; urgency=low
+pino (0.2.11-1) experimental; urgency=low
 
   * Initial release (Closes: #573040)
 
diff --git a/debian/patches/002_allow-current-user-info.diff b/debian/patches/002_allow-current-user-info.diff
new file mode 100644 (file)
index 0000000..ce78829
--- /dev/null
@@ -0,0 +1,36 @@
+Description: Allows current user to display her own information & timeline
+Author: Julien Valroff <julien@kirya.net>
+Bug: http://code.google.com/p/pino-twitter/issues/detail?id=268
+Forwarded: yes
+
+--- a/src/user_info_list.vala
++++ b/src/user_info_list.vala
+@@ -167,9 +167,6 @@
+       
+       /* get user full info and his timeline */
+       public void show_user(string screen_name) {
+-              if(accounts.get_current_account().login == screen_name)
+-                      return;
+-              
+               act.activate();
+               
+               if(full_status != null && full_status.user_screen_name == screen_name)
+--- a/templates/status_me.tpl
++++ b/templates/status_me.tpl
+@@ -1,5 +1,5 @@
+ <div class="status">
+-      <div class="avatar_me" style="background-image:url('{{avatar}}');"></div>
++      <a href="userinfo://{{screen_name}}"><div class="avatar_me" style="background-image:url('{{avatar}}');"></div></a>
+       <div class="content_{{me}}" id="{{id}}">
+               <div class="header">
+                       <span class="date">{{time}}</span>
+--- a/src/template.vala
++++ b/src/template.vala
+@@ -281,6 +281,7 @@
+                               map["id"] = i.id;
+                               map["time"] = time;
+                               map["by_who"] = by_who;
++                              map["screen_name"] = i.user_screen_name;
+                               
+                               if(prefs.fullNames)
+                                       map["name"] = i.user_name;
diff --git a/debian/patches/002_identica-tags.diff b/debian/patches/002_identica-tags.diff
deleted file mode 100644 (file)
index 456eb23..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix url to identi.ca tags
-Author: Julien Valroff <julien@kirya.net>
-Bug: http://code.google.com/p/pino-twitter/issues/detail?id=141
-Forwarded: yes
-
---- a/src/template.vala
-+++ b/src/template.vala
-@@ -91,7 +91,7 @@
-                               
-                               case "identi.ca":
-                                       status_url = "http://identi.ca/notice/%s";
--                                      search_url = "http://identi.ca/search/notice?q=";
-+                                      search_url = "http://identi.ca/tag/";
-                                       nick_url = "http://identi.ca/";
-                                       break;
-                       }
diff --git a/debian/patches/003_improve-regex.diff b/debian/patches/003_improve-regex.diff
deleted file mode 100644 (file)
index 776e5d4..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Fix regex for search/tags
-Author: Julien Valroff <julien@kirya.net>
-Bug: http://code.google.com/p/pino-twitter/issues/detail?id=141
-Forwarded: yes
-
---- a/src/template.vala
-+++ b/src/template.vala
-@@ -59,10 +59,10 @@
-               reload();
-               
-               //compile regex
--              nicks = new Regex("(^|\\s)@([A-Za-z0-9_]+)");
--              tags = new Regex("((^|\\s)\\#[A-Za-z0-9_\\p{Latin}\\p{Greek}]+)");
--              groups = new Regex("(^|\\s)!([A-Za-z0-9_]+)"); //for identi.ca groups
--              urls = new Regex("((http|https|ftp)://([\\S]+))"); //need something better
-+              nicks = new Regex("(^|\\s|['\"+&!/\\(-])@([A-Za-z0-9_]+)");
-+              tags = new Regex("(^|\\s|['\"+&!/\\(-])#([A-Za-z0-9_.-\\p{Latin}\\p{Greek}]+)");
-+              groups = new Regex("(^|\\s|['\"+&!/\\(-])!([A-Za-z0-9_]+)"); //for identi.ca groups
-+              urls = new Regex("((https?|ftp)://([A-Za-z0-9+&@#/%?=~_|!:,.;-]*)([A-Za-z0-9+&@#/%=~_|$]))"); // still needs to be improved for urls containing () such as wikipedia's
-               
-               // characters must be cleared to know direction of text
-               clear_notice = new Regex("[: \n\t\r♻♺]+|@[^ ]+");
-@@ -400,7 +400,7 @@
-               }
-               
-               result = nicks.replace(result, -1, 0, "\\1@<a class='re_nick' href='userinfo://\\2'>\\2</a>");
--              result = tags.replace(result, -1, 0, "<a class='tags' href='%s\\1'>\\1</a>".printf(search_url));
-+              result = tags.replace(result, -1, 0, "\\1#<a class='tags' href='%s\\2'>\\2</a>".printf(search_url));
-               
-               if(service == "identi.ca") //for identi.ca only
-                       result = groups.replace(result, -1, 0, "\\1!<a class='tags' href='http://identi.ca/group/\\2'>\\2</a>");
diff --git a/debian/patches/004_allow-current-user-info.diff b/debian/patches/004_allow-current-user-info.diff
deleted file mode 100644 (file)
index ce78829..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Allows current user to display her own information & timeline
-Author: Julien Valroff <julien@kirya.net>
-Bug: http://code.google.com/p/pino-twitter/issues/detail?id=268
-Forwarded: yes
-
---- a/src/user_info_list.vala
-+++ b/src/user_info_list.vala
-@@ -167,9 +167,6 @@
-       
-       /* get user full info and his timeline */
-       public void show_user(string screen_name) {
--              if(accounts.get_current_account().login == screen_name)
--                      return;
--              
-               act.activate();
-               
-               if(full_status != null && full_status.user_screen_name == screen_name)
---- a/templates/status_me.tpl
-+++ b/templates/status_me.tpl
-@@ -1,5 +1,5 @@
- <div class="status">
--      <div class="avatar_me" style="background-image:url('{{avatar}}');"></div>
-+      <a href="userinfo://{{screen_name}}"><div class="avatar_me" style="background-image:url('{{avatar}}');"></div></a>
-       <div class="content_{{me}}" id="{{id}}">
-               <div class="header">
-                       <span class="date">{{time}}</span>
---- a/src/template.vala
-+++ b/src/template.vala
-@@ -281,6 +281,7 @@
-                               map["id"] = i.id;
-                               map["time"] = time;
-                               map["by_who"] = by_who;
-+                              map["screen_name"] = i.user_screen_name;
-                               
-                               if(prefs.fullNames)
-                                       map["name"] = i.user_name;
diff --git a/debian/patches/005_startup-notify.diff b/debian/patches/005_startup-notify.diff
deleted file mode 100644 (file)
index 3e330f0..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-Description: add sartupnotify to desktop file
-Forwarded: yes
-Bug: http://code.google.com/p/pino-twitter/issues/detail?id=272
-
---- a/pino.desktop
-+++ b/pino.desktop
-@@ -13,3 +13,4 @@
- GenericName[ua]=Pino
- GenericName[ru]=Pino
- Terminal=false
-+StartupNotify=true
index d45d597..4681f32 100644 (file)
@@ -1,5 +1,2 @@
 001_sec-accounts-file.diff
-002_identica-tags.diff
-003_improve-regex.diff
-004_allow-current-user-info.diff
-005_startup-notify.diff
+002_allow-current-user-info.diff