Adding debian version 0.9.8-1. debian/0.9.8-1
authorDaniel Baumann <daniel@debian.org>
Sun, 15 Apr 2012 17:21:13 +0000 (17:21 +0000)
committerDaniel Baumann <daniel@debian.org>
Sun, 15 Apr 2012 17:21:13 +0000 (17:21 +0000)
debian/changelog
debian/control
debian/patches/01-libfm-0.1.14-API-changes.patch [new file with mode: 0644]
debian/patches/01_binary_rename.patch [deleted file]
debian/patches/90-enable-fake-transparency.patch [new file with mode: 0644]
debian/patches/libtool-fix.patch [deleted file]
debian/patches/series
debian/rules

index 46b29c9..9f8af55 100644 (file)
@@ -1,3 +1,33 @@
+pcmanfm (0.9.8-1) unstable; urgency=low
+
+  [ Julien Lavergne ]
+  * debian/rules:
+   - Use libfm apport hook only on Ubuntu.
+   - Use directly dh_auto_configure instead of configure.
+  * debian/control:
+   - Build-depends on lsb-release, needed to detect the distribution.
+   - Wrap depends and build-depends.
+   - Build-depends on libfm-dev (0.1.14).
+  * debian/patches/01-libfm-0.1.14-API-changes.patch:
+   - Migrate from fm_path_new to fm_path_new_for_str to follow libfm API change
+     (Closes: #600391)
+  * debian/patches/90-enable-fake-transparency.patch
+   - From upstream, fix fake transparency (LP: #566056)
+
+  [ Andrew Lee (李健秋) ]
+  * Imported Upstream version 0.9.8
+   - Desktop icons are now movable (Closes: #535814) (LP: #644259)
+   - Broken Dnd from folder view to desktop (Closes: #534928)
+   - Fix crash with // in the address bar (Closes: #586368)
+   - Fix crash on right click (LP: #617655)
+   - Translation updates (LP: #565496)
+  * Bumped Standard-version to 3.9.1
+  * Drop 01_binary_rename.patch
+  * Drop libtool-fix.patch
+  * delete debian/patches/series
+
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Wed, 24 Nov 2010 22:51:44 +0800
+
 pcmanfm (0.9.7-1) unstable; urgency=low
 
   * New upstream release
index 65d0247..8ce000e 100644 (file)
@@ -3,17 +3,33 @@ Section: utils
 Priority: optional
 Maintainer: Debian LXDE Packaging Team <pkg-lxde-maintainers@lists.alioth.debian.org>
 Uploaders: Andrew Lee (李健秋) <ajqlee@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev (>= 2.6.0), libgamin-dev, automake, autoconf, pkg-config, intltool, libstartup-notification0-dev, libdbus-glib-1-dev, python, libfm-dev (>= 0.1.10), libmenu-cache1-dev (>= 0.3.2), libtool
+Build-Depends: debhelper (>= 7.0.50~),
+               libgtk2.0-dev (>= 2.6.0),
+               libgamin-dev,
+               automake,
+               autoconf,
+               pkg-config,
+               intltool,
+               libstartup-notification0-dev,
+               libdbus-glib-1-dev,
+               python,
+               libfm-dev (>= 0.1.14),
+               libmenu-cache1-dev (>= 0.3.2),
+               libtool,
+               lsb-release
 Build-Conflicts: autoconf2.13, automake1.4
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://pcmanfm.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/collab-maint/pcmanfm.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/pcmanfm.git;a=summary
 
 Package: pcmanfm
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: lxde-icon-theme | gnome-icon-theme, gvfs-backends, gvfs-fuse
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Recommends: lxde-icon-theme | gnome-icon-theme,
+            gvfs-backends,
+            gvfs-fuse
 Conflicts: pcmanfm-nohal
 Description: an extremely fast and lightweight file manager
  PCMan File Manager is a gtk2 based file manager for the X Window System.
@@ -37,7 +53,9 @@ Package: pcmanfm-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, pcmanfm (= ${binary:Version})
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         pcmanfm (= ${binary:Version})
 Description: an extremely fast and lightweight file manager - debugging symbols
  PCMan File Manager is a gtk2 based file manager for the X Window System.
  Features:
diff --git a/debian/patches/01-libfm-0.1.14-API-changes.patch b/debian/patches/01-libfm-0.1.14-API-changes.patch
new file mode 100644 (file)
index 0000000..10cf5d9
--- /dev/null
@@ -0,0 +1,71 @@
+Index: pcmanfm/src/main-win.c
+===================================================================
+--- pcmanfm.orig/src/main-win.c
++++ pcmanfm/src/main-win.c
+@@ -118,7 +118,7 @@ static void fm_main_win_class_init(FmMai
+ static void on_location_activate(GtkEntry* entry, FmMainWin* self)
+ {
+-    FmPath* path = fm_path_new( gtk_entry_get_text(entry) );
++    FmPath* path = fm_path_new_for_str( gtk_entry_get_text(entry) );
+     char* disp_path = fm_path_to_str(path);
+     char* disp_name = fm_path_display_basename(path);
+     GtkWidget* label = gtk_notebook_get_tab_label((GtkNotebook*)self->notebook, self->folder_view);
+@@ -201,7 +201,7 @@ static void on_file_clicked(FmFolderView
+         {
+             /* symlinks also has fi->target, but we only handle shortcuts here. */
+             FmFileInfo* target_fi;
+-            FmPath* real_path = fm_path_new(fm_file_info_get_target(fi));
++            FmPath* real_path = fm_path_new_for_str(fm_file_info_get_target(fi));
+             /* query the info of target */
+             FmJob* job = fm_file_info_job_new(NULL, 0);
+             fm_file_info_job_add(FM_FILE_INFO_JOB(job), real_path);
+@@ -875,7 +875,7 @@ void on_go_apps(GtkAction* act, FmMainWi
+ void fm_main_win_chdir_by_name(FmMainWin* win, const char* path_str)
+ {
+-    FmPath* path = fm_path_new(path_str);
++    FmPath* path = fm_path_new_for_str(path_str);
+     fm_main_win_chdir(win, path);
+     fm_path_unref(path);
+ }
+Index: pcmanfm/src/pcmanfm.c
+===================================================================
+--- pcmanfm.orig/src/pcmanfm.c
++++ pcmanfm/src/pcmanfm.c
+@@ -406,7 +406,7 @@ gboolean pcmanfm_run()
+             {
+                 FmPath* path;
+                 if( **filename == '/' || strstr(*filename, ":/") ) /* absolute path or URI */
+-                    path = fm_path_new(*filename);
++                    path = fm_path_new_for_str(*filename);
+                 else if( strcmp(*filename, "~") == 0 ) /* special case for home dir */
+                 {
+                     path = fm_path_get_home();
+@@ -419,7 +419,7 @@ gboolean pcmanfm_run()
+                     {
+                         /* FIXME: This won't work if those filenames are passed via IPC since the receiving process has different cwd. */
+                         char* cwd_str = g_get_current_dir();
+-                        cwd = fm_path_new(cwd_str);
++                        cwd = fm_path_new_for_str(cwd_str);
+                         g_free(cwd_str);
+                     }
+                     path = fm_path_new_relative(cwd, *filename);
+@@ -443,7 +443,7 @@ gboolean pcmanfm_run()
+         {
+             FmPath* path;
+             char* cwd = ipc_cwd ? ipc_cwd : g_get_current_dir();
+-            path = fm_path_new(cwd);
++            path = fm_path_new_for_str(cwd);
+             fm_main_win_add_win(NULL, path);
+             fm_path_unref(path);
+             g_free(cwd);
+@@ -609,7 +609,7 @@ _retry:
+     }
+     else /* templates in ~/Templates */
+     {
+-        FmPath* dir = fm_path_new(g_get_user_special_dir(G_USER_DIRECTORY_TEMPLATES));
++        FmPath* dir = fm_path_new_for_str(g_get_user_special_dir(G_USER_DIRECTORY_TEMPLATES));
+         FmPath* template = fm_path_new_child(dir, templ);
+         fm_copy_file(template, cwd);
+         fm_path_unref(template);
diff --git a/debian/patches/01_binary_rename.patch b/debian/patches/01_binary_rename.patch
deleted file mode 100644 (file)
index acffeb7..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-Origin: OpenSuSE, https://build.opensuse.org/stage/package/view_file?file=pcmanfm-rename-to-pcmanfm.patch&package=pcmanfm&project=X11%3Alxde
-Reviewed-By: Andrea Florio
-Last-Update: 2010-05-10
-
---- pcmanfm-0.9.5.orig/configure.ac
-+++ pcmanfm-0.9.5/configure.ac
-@@ -93,7 +93,7 @@ PKG_CHECK_MODULES(MENU_CACHE, [$menu_mod
- AC_SUBST(MENU_CACHE_CFLAGS)
- AC_SUBST(MENU_CACHE_LIBS)
--GETTEXT_PACKAGE=pcmanfm2
-+GETTEXT_PACKAGE=pcmanfm
- AC_SUBST(GETTEXT_PACKAGE)
- # Generate po/LINGUAS on the fly rather than relying on translators
-@@ -116,7 +116,7 @@ AC_CONFIG_FILES([
-     data/Makefile
-     data/ui/Makefile
-     data/ui/about.glade
--    data/pcmanfm2.desktop
-+    data/pcmanfm.desktop
- ])
- AC_OUTPUT
---- pcmanfm-0.9.5.orig/po/POTFILES.skip
-+++ pcmanfm-0.9.5/po/POTFILES.skip
-@@ -1,3 +1,3 @@
--data/pcmanfm2.desktop.in
-+data/pcmanfm.desktop.in
- #we transtale .in file
- data/ui/about.glade
---- /dev/null
-+++ pcmanfm-0.9.5/data/pcmanfm.desktop.in
-@@ -0,0 +1,28 @@
-+[Desktop Entry]
-+Type=Application
-+Icon=system-file-manager
-+Name=File Manager
-+Name[de]=Dateimanager
-+Name[et]=Failihaldur
-+Name[fi]=Tiedostonhallinta
-+Name[ja]=ファイルマネージャ
-+Name[ru]=Файловый менеджер
-+Name[zh_TW]=檔案管理程式
-+GenericName=File Manager
-+GenericName[de]=Dateimanager
-+GenericName[et]=Failihaldur
-+GenericName[fi]=Tiedostonhallinta
-+GenericName[ja]=ファイルマネージャ
-+GenericName[ru]=Файловый менеджер
-+GenericName[zh_TW]=檔案管理程式
-+Comment=Browse the file system and manage the files
-+Comment[de]=Das Dateisystem durchsuchen und Dateien verwalten
-+Comment[et]=Lehitse failisüsteemi ja halda faile
-+Comment[fi]=Selaa tiedostojärjestelmää ja hallitse tiedostoja
-+Comment[ja]=ファイルシステムをブラウズし、ファイルの管理を行います
-+Comment[zh_TW]=瀏覽檔案系統及管理檔案
-+Categories=FileManager;Utility;Core;GTK;
-+Exec=pcmanfm %U
-+StartupNotify=true
-+Terminal=false
-+MimeType=x-directory/normal;inode/directory;
---- pcmanfm-0.9.5.orig/data/Makefile.am
-+++ pcmanfm-0.9.5/data/Makefile.am
-@@ -4,5 +4,5 @@ SUBDIRS=ui
- desktopdir=$(datadir)/applications
- desktop_DATA= \
--      pcmanfm2.desktop \
-+      pcmanfm.desktop \
-       $(NULL)
---- pcmanfm-0.9.5.orig/data/ui/Makefile.am
-+++ pcmanfm-0.9.5/data/ui/Makefile.am
-@@ -1,7 +1,7 @@
- NULL=
- # GtkBuilder UI definition files
--uidir=$(datadir)/pcmanfm2/ui
-+uidir=$(datadir)/pcmanfm/ui
- ui_in_files= \
-       about.glade \
-       pref.glade \
---- pcmanfm-0.9.5.orig/src/pcmanfm.c
-+++ pcmanfm-0.9.5/src/pcmanfm.c
-@@ -295,7 +295,7 @@ gboolean on_socket_event( GIOChannel* io
- void get_socket_name( char* buf, int len )
- {
-     char* dpy = gdk_get_display();
--    g_snprintf( buf, len, "/tmp/.pcmanfm2-socket%s-%s", dpy, g_get_user_name() );
-+    g_snprintf( buf, len, "/tmp/.pcmanfm-socket%s-%s", dpy, g_get_user_name() );
-     g_free( dpy );
- }
---- pcmanfm-0.9.5.orig/src/Makefile.am
-+++ pcmanfm-0.9.5/src/Makefile.am
-@@ -1,13 +1,13 @@
- NULL=
- AM_CPPFLAGS = \
--      -DPACKAGE_DATA_DIR=\""$(datadir)/pcmanfm2"\" \
--      -DPACKAGE_UI_DIR=\""$(datadir)/pcmanfm2/ui"\" \
-+      -DPACKAGE_DATA_DIR=\""$(datadir)/pcmanfm"\" \
-+      -DPACKAGE_UI_DIR=\""$(datadir)/pcmanfm/ui"\" \
-       -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
--bin_PROGRAMS = pcmanfm2
-+bin_PROGRAMS = pcmanfm
--pcmanfm2_SOURCES = \
-+pcmanfm_SOURCES = \
-       pcmanfm.c pcmanfm.h \
-       app-config.c app-config.h \
-       main-win.c main-win.h \
-@@ -22,7 +22,7 @@ EXTRA_DIST= \
-       desktop-ui.c \
-       $(NULL)
--pcmanfm2_CFLAGS = \
-+pcmanfm_CFLAGS = \
-       $(XLIB_CFLAGS) \
-       $(GTK_CFLAGS) \
-       $(GIO_CFLAGS) \
-@@ -34,7 +34,7 @@ pcmanfm2_CFLAGS = \
-       -Werror-implicit-function-declaration \
-       $(NULL)
--pcmanfm2_LDADD = \
-+pcmanfm_LDADD = \
-       $(XLIB_LIBS) \
-       $(GTK_LIBS) \
-       $(GIO_LIBS) \
---- pcmanfm-0.9.5.orig/src/main-win.c
-+++ pcmanfm-0.9.5/src/main-win.c
-@@ -625,9 +625,9 @@ void on_open_as_root(GtkAction* act, FmM
-         return;
-     }
-     if(strstr(app_config->su_cmd, "%s")) /* FIXME: need to rename to pcmanfm when we reach stable release. */
--        cmd = g_strdup_printf(app_config->su_cmd, "pcmanfm2 %U");
-+        cmd = g_strdup_printf(app_config->su_cmd, "pcmanfm %U");
-     else
--        cmd = g_strconcat(app_config->su_cmd, " ", "pcmanfm2 %U", NULL);
-+        cmd = g_strconcat(app_config->su_cmd, " ", "pcmanfm %U", NULL);
-     app = g_app_info_create_from_commandline(cmd, NULL, 0, NULL);
-     g_free(cmd);
-     if(app)
---- /dev/null
-+++ pcmanfm-0.9.5/patches/series
-@@ -0,0 +1 @@
-+01_binary_rename.patch
diff --git a/debian/patches/90-enable-fake-transparency.patch b/debian/patches/90-enable-fake-transparency.patch
new file mode 100644 (file)
index 0000000..a360363
--- /dev/null
@@ -0,0 +1,60 @@
+From 422e1061ffafc0b97ec31a99f86ddde890186ff5 Mon Sep 17 00:00:00 2001
+From: Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+Date: Sat, 23 Oct 2010 16:31:11 +0800
+Subject: [PATCH] Apply patch #3089346 - Re-enbale fake transparency when using pcmanfm 0.9.X.
+
+---
+ src/desktop.c |   31 +++++++++++++++++++++++++++++++
+ 1 files changed, 31 insertions(+), 0 deletions(-)
+
+diff --git a/src/desktop.c b/src/desktop.c
+index b7a6836..109a12f 100644
+--- a/src/desktop.c
++++ b/src/desktop.c
+@@ -1676,6 +1676,10 @@ static void update_background(FmDesktop* desktop)
+     GdkWindow* root = gdk_screen_get_root_window(gtk_widget_get_screen(widget));
+     GdkWindow *window = gtk_widget_get_window(widget);
++    Display* xdisplay;
++    Pixmap xpixmap = 0;
++    Window xroot;
++
+     if(app_config->wallpaper_mode == FM_WP_COLOR
+        || !app_config->wallpaper
+        || !*app_config->wallpaper
+@@ -1763,6 +1767,33 @@ static void update_background(FmDesktop* desktop)
+     XChangeProperty(GDK_WINDOW_XDISPLAY(root), GDK_WINDOW_XID(root),
+                     XA_XROOTMAP_ID, XA_PIXMAP, 32, PropModeReplace, (guchar*)&pixmap_id, 1);
++    /* set root map here */
++    xdisplay = GDK_WINDOW_XDISPLAY(root);
++    xroot = GDK_WINDOW_XID(root);
++
++    XGrabServer (xdisplay);
++
++    if( pixmap )
++    {
++        xpixmap = GDK_WINDOW_XWINDOW(pixmap);
++
++        XChangeProperty( xdisplay,
++                    xroot,
++                    gdk_x11_get_xatom_by_name("_XROOTPMAP_ID"), XA_PIXMAP,
++                    32, PropModeReplace,
++                    (guchar *) &xpixmap, 1);
++
++        XSetWindowBackgroundPixmap( xdisplay, xroot, xpixmap );
++    }
++    else
++    {
++        /* FIXME: Anyone knows how to handle this correctly??? */
++    }
++    XClearWindow( xdisplay, xroot );
++
++    XUngrabServer( xdisplay );
++    XFlush( xdisplay );
++
+     g_object_unref(pixmap);
+     if(pix)
+         g_object_unref(pix);
+-- 
+1.7.0.1
diff --git a/debian/patches/libtool-fix.patch b/debian/patches/libtool-fix.patch
deleted file mode 100644 (file)
index 04ea48e..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Add libtool missing check to fix 554821 or similar bugs in the future
-
-Author: Andrew Lee (李健秋) <ajqlee@debian.org>
-Bug-Debian: http://bugs.debian.org/558582
-Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554821
-Reviewed-By: Jonas Smedegaard <dr@jones.dk>, Hector Oron <zumbi@debian.org>
-Last-Update: <2010-02-20>
-
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -4909,6 +4909,7 @@
-     fi
-     supports_anon_versioning=no
-     case `$LD -v 2>&1` in
-+      *GNU\ gold*) supports_anon_versioning=yes ;;
-       *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
---- a/configure
-+++ b/configure
-@@ -8659,6 +8659,7 @@
-     fi
-     supports_anon_versioning=no
-     case `$LD -v 2>&1` in
-+      *GNU\ gold*) supports_anon_versioning=yes ;;
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
index 3ebd876..66e62d6 100644 (file)
@@ -1 +1,2 @@
-libtool-fix.patch
+01-libfm-0.1.14-API-changes.patch
+90-enable-fake-transparency.patch
\ No newline at end of file
index adb7398..ec71ff3 100755 (executable)
@@ -9,21 +9,23 @@
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
+DISTRO = "$(shell lsb_release -si)"
+
 %:
        dh $@
 
 override_dh_auto_configure:
-       /usr/bin/autoreconf -fiv
-       CFLAGS="$(CFLAGS)" ./configure \
-       --host=$(DEB_HOST_GNU_TYPE) \
-       --build=$(DEB_BUILD_GNU_TYPE) \
-       --prefix=/usr \
-       --mandir=\$${prefix}/share/man \
-       --infodir=\$${prefix}/share/info \
-       CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed"
+       #/usr/bin/autoreconf -fiv
+       dh_auto_configure -- LDFLAGS="-Wl,-z,defs -Wl,--as-needed"
        
 override_dh_strip:
        dh_strip --dbg-package=pcmanfm-dbg
 
+override_dh_link:
+       #Symlinks to libfm apport hook only on Ubuntu, until apport call it automaticly.
+ifeq ($(DISTRO),"Ubuntu")
+       dh_link -ppcmanfm usr/share/apport/package-hooks/source_libfm.py usr/share/apport/package-hooks/source_pcmanfm.py
+endif
+
 override_dh_auto_test:
        :