Package: synaptic
Version: 0.60
Severity: important
Tags: patch
--- Please enter the report below this line. ---
The attached patch contains the required bits to integrate the patch in
#435682 and in the process also provides a fix for #429895.
Sorry if this is not your preferred way of receiving integration
patches, but since I was worried on fixing this two issues on my system
I ended up producing a single patch.
Thanks for your time
--- System information. ---
Architecture: i386
Kernel: Linux 2.6.22-3-686
Debian Release: lenny/sid
500 unstable http.us.debian.org
--- Package information. ---
Depends (Version) | Installed
===========================================-+-==============
libapt-inst-libc6.6-6-1.1 |
libapt-pkg-libc6.6-6-4.6 |
libatk1.0-0 (>= 1.20.0) | 1.20.0-1
libc6 (>= 2.7-1) | 2.7-1
libcairo2 (>= 1.4.0) | 1.4.10-1
libfontconfig1 (>= 2.4.0) | 2.5.0-2
libgcc1 (>= 1:4.2.1) | 1:4.2.2-3
libglade2-0 (>= 1:2.6.1) | 1:2.6.2-1
libglib2.0-0 (>= 2.14.0) | 2.14.3-1
libgtk2.0-0 (>= 2.12.0) | 2.12.1-3
libpango1.0-0 (>= 1.18.3) | 1.18.3-1
libstdc++6 (>= 4.2.1) | 4.2.2-3
libvte9 (>= 1:0.16.9) | 1:0.16.9-1
libx11-6 | 2:1.0.3-7
libxft2 (>> 2.1.1) | 2.1.12-2
libxml2 | 2.6.30.dfsg-3
scrollkeeper | 0.3.14-15
diff -uN orig/synaptic-0.60/debian/patches/00list.Debian synaptic-0.60/debian/patches/00list.Debian
--- orig/synaptic-0.60/debian/patches/00list.Debian 2006-02-28 08:33:05.000000000 +0000
+++ synaptic-0.60/debian/patches/00list.Debian 2007-11-25 19:50:13.000000000 +0000
@@ -0,0 +1,2 @@
+01_debian_desktop-file
+02_debian_export-script
diff -uN orig/synaptic-0.60/debian/patches/01_debian_desktop-file.dpatch synaptic-0.60/debian/patches/01_debian_desktop-file.dpatch
--- orig/synaptic-0.60/debian/patches/01_debian_desktop-file.dpatch 1970-01-01 01:00:00.000000000 +0100
+++ synaptic-0.60/debian/patches/01_debian_desktop-file.dpatch 2007-11-25 19:50:09.000000000 +0000
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_debian_desktop-file by Diego Escalante Urrelo <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove legacy Applications category and put the menu entry in System->Administration
+
[EMAIL PROTECTED]@
+diff -u data/synaptic.desktop.in synaptic-0.60/data/synaptic.desktop.in
+--- data/synaptic.desktop.in 2007-06-10 19:58:57.000000000 +0100
++++ data/synaptic.desktop.in 2007-11-25 19:31:46.000000000 +0000
+@@ -8,5 +8,5 @@
+ MultipleArgs=false
+ Type=Application
+ Encoding=UTF-8
+-Categories=PackageManager;Applications;GTK;System;
++Categories=PackageManager;GTK;System;Settings;
+ NotShowIn=KDE
diff -uN orig/synaptic-0.60/debian/patches/02_debian_export-script.dpatch synaptic-0.60/debian/patches/02_debian_export-script.dpatch
--- orig/synaptic-0.60/debian/patches/02_debian_export-script.dpatch 1970-01-01 01:00:00.000000000 +0100
+++ synaptic-0.60/debian/patches/02_debian_export-script.dpatch 2007-11-25 19:50:23.000000000 +0000
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_debian_export-script.dpatch by Diego Escalante Urrelo <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes a missing space. Patch by Avi Rozen <[EMAIL PROTECTED]>
+
[EMAIL PROTECTED]@
+--- gtk/rgmainwindow.cc 2007-06-10 23:25:47.000000000 +0300
++++ gtk/rgmainwindow.cc 2007-08-02 12:30:49.000000000 +0300
+@@ -3352,7 +3352,7 @@
+ ofstream out(file);
+ out << "#!/bin/sh" << endl;
+ for(int i=0;i<uris.size();i++) {
+- out << "wget -c" << uris[i] << endl;
++ out << "wget -c " << uris[i] << endl;
+ }
+ chmod(file, 0755);
+ }
diff -u orig/synaptic-0.60/debian/changelog synaptic-0.60/debian/changelog
--- orig/synaptic-0.60/debian/changelog 2007-06-10 21:26:11.000000000 +0100
+++ synaptic-0.60/debian/changelog 2007-11-25 19:42:47.000000000 +0000
@@ -1,3 +1,17 @@
+synaptic (0.60-1) unstable; urgency=low
+
+ * debian/patches/00list.Debian:
+ * 01_debian_desktop_file.dpatch:
+ - Add 01_debian_desktop_file, so the menu entry for Synaptic is in
+ System->Administration. It also removes the legacy Applications category.
+ closes: #429895
+ * 02_debian_export-script.dpatch:
+ - Adds a missing space in the export script that produced '-cURL' instead of
+ '-c URL'. Patch by Avi Rozen <[EMAIL PROTECTED]>
+ closes: #435682
+
+ -- Diego Escalante Urrelo <[EMAIL PROTECTED]> Sun, 25 Nov 2007 19:40:59 +0000
+
synaptic (0.60) unstable; urgency=low
* moved most icons use the icontheme
