[Pkg-voip-commits] r6294 - in /twinkle/trunk/debian: bug/ bug/presubj changelog dirs patches/desktop-entry-contains-encoding-key.patch rules twinkle.install

Fri Oct 10 13:09:05 UTC 2008

Author: msp
Date: Fri Oct 10 13:09:05 2008
New Revision: 6294

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6294
Log:
* Update debian.install: twinkle.desktop & sip.protocol
* Update twinkle.desktop fixes
  - linitan:desktop-entry-contains-encoding-key
* Add bug/presubj directing users to upstream user group
* Add debian/twinkle.manpages
* TODO: fixup: 
E: twinkle: menu-icon-too-big /usr/share/pixmaps/twinkle-48x48.xpm

Added:
    twinkle/trunk/debian/bug/
    twinkle/trunk/debian/bug/presubj
    twinkle/trunk/debian/patches/desktop-entry-contains-encoding-key.patch
Modified:
    twinkle/trunk/debian/changelog
    twinkle/trunk/debian/dirs
    twinkle/trunk/debian/rules
    twinkle/trunk/debian/twinkle.install

Added: twinkle/trunk/debian/bug/presubj
URL: http://svn.debian.org/wsvn/pkg-voip/twinkle/trunk/debian/bug/presubj?rev=6294&op=file
==============================================================================

--- twinkle/trunk/debian/bug/presubj (added)
+++ twinkle/trunk/debian/bug/presubj Fri Oct 10 13:09:05 2008
@@ -1,0 +1,9 @@
+If you know that the bug you want to report is in the "upstream"
+code then please file directly with the twinkle users group:
+   http://groups.yahoo.com/group/twinklephone/
+
+If you feel that the bug is one that other Debian users should
+know about then you are welcome to file a report in the Debian BTS
+as well.  Please keep in mind, however, that managing bug reports
+is part of the maintainers' workload.
+

Modified: twinkle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/twinkle/trunk/debian/changelog?rev=6294&op=diff
==============================================================================
--- twinkle/trunk/debian/changelog (original)
+++ twinkle/trunk/debian/changelog Fri Oct 10 13:09:05 2008
@@ -5,7 +5,17 @@
   * Converted menu images to xpm and use them at twinkle.menu.
     Thanks lintian.
 
- -- Mark Purcell <msp at debian.org>  Sun, 01 Jun 2008 07:56:03 +1000
+  [ Mark Purcell ]
+  * Update debian.install: twinkle.desktop & sip.protocol
+  * Update twinkle.desktop fixes
+    - linitan:desktop-entry-contains-encoding-key
+  * Add bug/presubj directing users to upstream user group
+  * Add debian/twinkle.manpages
+
+  * TODO: fixup: 
+  E: twinkle: menu-icon-too-big /usr/share/pixmaps/twinkle-48x48.xpm
+
+ -- Mark Purcell <msp at debian.org>  Sat, 11 Oct 2008 00:05:29 +1100
 
 twinkle (1:1.2-2) unstable; urgency=low
 

Modified: twinkle/trunk/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-voip/twinkle/trunk/debian/dirs?rev=6294&op=diff
==============================================================================
--- twinkle/trunk/debian/dirs (original)
+++ twinkle/trunk/debian/dirs Fri Oct 10 13:09:05 2008
@@ -1,3 +1,4 @@
 usr/bin
 usr/share/applications
 usr/share/services
+usr/share/bug/twinkle

Added: twinkle/trunk/debian/patches/desktop-entry-contains-encoding-key.patch
URL: http://svn.debian.org/wsvn/pkg-voip/twinkle/trunk/debian/patches/desktop-entry-contains-encoding-key.patch?rev=6294&op=file
==============================================================================
--- twinkle/trunk/debian/patches/desktop-entry-contains-encoding-key.patch (added)
+++ twinkle/trunk/debian/patches/desktop-entry-contains-encoding-key.patch Fri Oct 10 13:09:05 2008
@@ -1,0 +1,9 @@
+diff -Nur -x '*.orig' -x '*~' twinkle-1.2/twinkle.desktop.in twinkle-1.2.new/twinkle.desktop.in
+--- twinkle-1.2/twinkle.desktop.in	2007-07-24 03:54:16.000000000 +1000
++++ twinkle-1.2.new/twinkle.desktop.in	2008-10-10 23:45:40.000000000 +1100
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Twinkle
+ GenericName=A SIP softphone
+ Comment=A SIP softphone

Modified: twinkle/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/twinkle/trunk/debian/rules?rev=6294&op=diff
==============================================================================
--- twinkle/trunk/debian/rules (original)
+++ twinkle/trunk/debian/rules Fri Oct 10 13:09:05 2008
@@ -11,12 +11,6 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS := --without-ilbc
 
-DEB_INSTALL_MANPAGES_twinkle = debian/twinkle.1
-
-install/twinkle::
-	cp twinkle.desktop $(CURDIR)/debian/twinkle/usr/share/applications
-	cp sip.protocol $(CURDIR)/debian/twinkle/usr/share/services
-
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs

Modified: twinkle/trunk/debian/twinkle.install
URL: http://svn.debian.org/wsvn/pkg-voip/twinkle/trunk/debian/twinkle.install?rev=6294&op=diff
==============================================================================
--- twinkle/trunk/debian/twinkle.install (original)
+++ twinkle/trunk/debian/twinkle.install Fri Oct 10 13:09:05 2008
@@ -1,3 +1,6 @@
 debian/twinkle-32x32.xpm usr/share/pixmaps/
 debian/twinkle-16x16.xpm usr/share/pixmaps/
 debian/twinkle-48x48.xpm usr/share/pixmaps/
+debian/bug/* usr/share/bug/twinkle/
+twinkle.desktop usr/share/applications
+sip.protocol usr/share/services


