Adding debian version 0.2.1-3. debian-squeeze debian/0.2.1-3
authorDaniel Baumann <daniel@debian.org>
Fri, 20 Apr 2012 10:13:24 +0000 (12:13 +0200)
committerDaniel Baumann <daniel@debian.org>
Fri, 20 Apr 2012 10:13:24 +0000 (12:13 +0200)
12 files changed:
debian/changelog
debian/compat
debian/control
debian/patches/00list [deleted file]
debian/patches/01_fix_infinite_loop.dpatch [deleted file]
debian/patches/01_fix_infinite_loop.patch [new file with mode: 0644]
debian/patches/02_lxlauncher-matchbox.dpatch [deleted file]
debian/patches/02_lxlauncher-matchbox.patch [new file with mode: 0644]
debian/patches/03_libmenu-cache-0.3-series.patch [new file with mode: 0644]
debian/patches/series [new file with mode: 0644]
debian/rules
debian/source/format [new file with mode: 0644]

index d6f4ead..53b2757 100644 (file)
@@ -1,3 +1,17 @@
+lxlauncher (0.2.1-3) unstable; urgency=low
+
+  * Applied 03_libmenu-cache-0.3-series.dpatch
+  * debian/control:
+    - Minor fix in description (Closes:#534190)
+    - Team maintainer: Debian LXDE Packaging Team
+    - Added Vcs-Git and Vcs-Browser tags
+    - Build-depends on libmenu-cache1-dev (>= 0.3.2) (Closes:#577336)
+  * Bumpped Standard-Version to 3.8.4
+  * Switch to dpkg-source 3.0 (quilt) format
+  * Set urgency=high for unblock transition on LXDE packages.
+
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Thu, 15 Apr 2010 00:03:44 +0800
+
 lxlauncher (0.2.1-2) unstable; urgency=low
 
   * Applied 01_fix_infinite_loop.dpatch (Closes:#537404)
index 7ed6ff8..7f8f011 100644 (file)
@@ -1 +1 @@
-5
+7
index f0ed96b..f1c8fac 100644 (file)
@@ -1,11 +1,13 @@
 Source: lxlauncher
 Section: x11
 Priority: extra
-Maintainer: Andrew Lee <andrew@linux.org.tw>
-Build-Depends: debhelper (>= 5), autotools-dev, libgtk2.0-dev (>= 2.6.0), libstartup-notification0-dev, libmenu-cache-dev (>= 0.2.5), dpatch, intltool, autoconf
-Standards-Version: 3.8.2
-DM-Upload-Allowed: yes
-Homepage: http://lxde.sf.net
+Maintainer: Debian LXDE Packaging Team <pkg-lxde-maintainers@lists.alioth.debian.org> 
+Uploaders: Andrew Lee (李健秋) <ajqlee@debian.org>
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libgtk2.0-dev (>= 2.6.0), libstartup-notification0-dev, libmenu-cache1-dev (>= 0.3.2), intltool, autoconf
+Standards-Version: 3.8.4
+Homepage: http://lxde.org
+Vcs-Git: git://git.debian.org/git/collab-maint/lxlauncher.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/lxlauncher.git;a=summary
 
 Package: lxlauncher
 Architecture: any
@@ -18,5 +20,3 @@ Description: Easy-Mode launcher for subnotebook like EeePC
  It is standard-compliant and desktop-independent. It follows 
  freedesktop.org specs, so newly added applications will automatically
  show up in the launcher, and vice versa for the removed ones.
- .
- Drop the limieted Asus launcher and try LXLauncher today!
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644 (file)
index 3d6f25d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-01_fix_infinite_loop.dpatch
-02_lxlauncher-matchbox.dpatch
diff --git a/debian/patches/01_fix_infinite_loop.dpatch b/debian/patches/01_fix_infinite_loop.dpatch
deleted file mode 100644 (file)
index 51f05ee..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix_infinite_loop.dpatch by Andrew Lee <andrew@linux.org.tw>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: solve the problem on runs configure in infinite loop
-
-@DPATCH@
-diff -urNad lxlauncher-0.2.1~/configure.in lxlauncher-0.2.1/configure.in
---- lxlauncher-0.2.1~/configure.in     2009-07-07 14:45:39.000000000 +0200
-+++ lxlauncher-0.2.1/configure.in      2009-07-18 22:07:32.607296338 +0200
-@@ -5,6 +5,9 @@
- AM_CONFIG_HEADER(config.h)
- AM_MAINTAINER_MODE
-+# Init intltool
-+IT_PROG_INTLTOOL
-+
- AC_ISC_POSIX
- AC_PROG_CC
- AM_PROG_CC_STDC
diff --git a/debian/patches/01_fix_infinite_loop.patch b/debian/patches/01_fix_infinite_loop.patch
new file mode 100644 (file)
index 0000000..e4286dc
--- /dev/null
@@ -0,0 +1,14 @@
+Author: Andrew Lee <andrew@linux.org.tw>
+Description: solve the problem on runs configure in infinite loop
+--- a/configure.in
++++ b/configure.in
+@@ -5,6 +5,9 @@
+ AM_CONFIG_HEADER(config.h)
+ AM_MAINTAINER_MODE
++# Init intltool
++IT_PROG_INTLTOOL
++
+ AC_ISC_POSIX
+ AC_PROG_CC
+ AM_PROG_CC_STDC
diff --git a/debian/patches/02_lxlauncher-matchbox.dpatch b/debian/patches/02_lxlauncher-matchbox.dpatch
deleted file mode 100644 (file)
index c24f609..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_lxlauncher-matchbox.dpatch by Enrico Zini <enrico@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Do not segfault if a window manager returns no data for current desktop.
-
-@DPATCH@
-diff -urNad lxlauncher-0.2~/src/working-area.c lxlauncher-0.2/src/working-area.c
---- lxlauncher-0.2~/src/working-area.c 2008-06-15 15:09:45.000000000 +0100
-+++ lxlauncher-0.2/src/working-area.c  2009-01-30 13:21:00.000000000 +0000
-@@ -94,7 +94,10 @@
-       if(!data)
-               return FALSE;
--      current = *(guint32 *)data;
-+      if (len == 0)
-+              current = 0;
-+      else
-+              current = *(guint32 *)data;
-       XFree(data);
-       /* find the _NET_WORKAREA atom */
diff --git a/debian/patches/02_lxlauncher-matchbox.patch b/debian/patches/02_lxlauncher-matchbox.patch
new file mode 100644 (file)
index 0000000..119fc0a
--- /dev/null
@@ -0,0 +1,16 @@
+Author: Enrico Zini <enrico@debian.org>
+Description: Do not segfault if a window manager returns no data for current desktop.
+--- a/src/working-area.c
++++ b/src/working-area.c
+@@ -94,7 +94,10 @@
+       if(!data)
+               return FALSE;
+-      current = *(guint32 *)data;
++      if (len == 0)
++              current = 0;
++      else
++              current = *(guint32 *)data;
+       XFree(data);
+       /* find the _NET_WORKAREA atom */
diff --git a/debian/patches/03_libmenu-cache-0.3-series.patch b/debian/patches/03_libmenu-cache-0.3-series.patch
new file mode 100644 (file)
index 0000000..0bb502e
--- /dev/null
@@ -0,0 +1,50 @@
+Author: Andrew Lee (李健秋) <ajqlee@debian.org>
+Description: Make it works with libmenu-cache 0.3 series
+--- a/src/lxlauncher.c
++++ b/src/lxlauncher.c
+@@ -676,6 +676,28 @@
+     }
+ }
++static void on_menu_cache_reload(MenuCache* mc, gpointer user_data)
++{
++    GMainLoop* mainloop = (GMainLoop*)user_data;
++    g_main_loop_quit(mainloop);
++}
++
++MenuCache* _menu_cache_lookup_sync( const char* menu_name )
++{
++    MenuCache* mc = menu_cache_lookup(menu_name);
++    /* ensure that the menu cache is loaded */
++    if(! menu_cache_get_root_dir(mc)) /* if it's not yet loaded */
++    {
++        GMainLoop* mainloop = g_main_loop_new(NULL, FALSE);
++        gpointer notify_id = menu_cache_add_reload_notify(mc, on_menu_cache_reload, mainloop);
++        g_main_loop_run(mainloop);
++        g_main_loop_unref(mainloop);
++        menu_cache_remove_reload_notify(mc, notify_id);
++    }
++    return mc;
++}
++
++
+ int main(int argc, char** argv)
+ {
+     int i;
+@@ -756,9 +778,14 @@
+     gtk_container_add( (GtkContainer*)main_window, notebook );
+     g_setenv("XDG_MENU_PREFIX", "lxlauncher-", TRUE);
+-    menu_tree = menu_cache_lookup( "applications.menu" );
++    menu_tree = _menu_cache_lookup_sync( "applications.menu" );
++    if(!menu_tree)
++    {
++        g_print("Unable to load application menu\n");
++        return 1;
++    }
++    root_dir = menu_cache_item_ref(menu_cache_get_root_dir( menu_tree ));
+     reload_notify_id = menu_cache_add_reload_notify( menu_tree, on_menu_tree_changed, NULL );
+-    root_dir = menu_cache_ref(menu_cache_get_root_dir( menu_tree ));
+     create_notebook_pages();
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..f72a96b
--- /dev/null
@@ -0,0 +1,3 @@
+01_fix_infinite_loop.patch
+02_lxlauncher-matchbox.patch
+03_libmenu-cache-0.3-series.patch
index ad499d5..c8f6d05 100755 (executable)
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/dpatch/dpatch.make
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-INSTALL = install
-INSTALL_FILE    = $(INSTALL) -p    -o root -g root  -m  644
-INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
-INSTALL_SCRIPT  = $(INSTALL) -p    -o root -g root  -m  755
-INSTALL_DIR     = $(INSTALL) -p -d -o root -g root  -m  755
+export DH_VERBOSE=1
 
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-    CFLAGS += -O0
-else
-    CFLAGS += -O2 -fprofile-arcs
-endif
-ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-    INSTALL_PROGRAM += -s
-endif
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-    MAKEFLAGS += -j$(NUMJOBS)
-endif
+%:
+       dh $@
 
-include /usr/share/dpatch/dpatch.make
-
-config.status: patch-stamp configure
-       dh_testdir
-       # Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-       cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-       cp -f /usr/share/misc/config.guess config.guess
-endif
+override_dh_auto_configure:
        /usr/bin/autoreconf -fiv
-       ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --sysconfdir=/etc --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-
-build: build-stamp
-
-build-stamp:  config.status
-       dh_testdir
-
-       # Add here commands to compile the package.
-       $(MAKE)
-       #docbook-to-man debian/lxlauncher.sgml > lxlauncher.1
-
-       touch $@
-
-clean: unpatch
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp 
-
-       # Add here commands to clean up after the build process.
-       [ ! -f Makefile ] || $(MAKE) distclean
-       rm -f config.sub config.guess
-       rm -f src/*.gcno
-       rm -f po/*.gmo
-       rm -f aclocal.m4
-       rm -f config.h config.h.in config.log config.status config.sub
-       rm -f config.guess
-
-       dh_clean 
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k 
-       dh_installdirs
-
-       # Add here commands to install the package into debian/lxlauncher.
-       $(MAKE) DESTDIR=$(CURDIR)/debian/lxlauncher install
-
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
-       dh_installdocs
-       dh_installexamples
-#      dh_install
-#      dh_installmenu
-#      dh_installdebconf       
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_python
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
-       dh_installman
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-#      dh_perl
-#      dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
+       dh_auto_configure
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+override_dh_auto_test:
+       :
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)