Adding debian version 0.5.5-2. debian/0.5.5-2
authorDaniel Baumann <daniel@debian.org>
Fri, 20 Apr 2012 11:48:39 +0000 (13:48 +0200)
committerDaniel Baumann <daniel@debian.org>
Fri, 20 Apr 2012 11:48:39 +0000 (13:48 +0200)
debian/README.source
debian/changelog
debian/control
debian/patches/00list [deleted file]
debian/patches/01_default-config.dpatch [deleted file]
debian/patches/default-config.patch [new file with mode: 0644]
debian/patches/g_locale_to_utf8.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 fc98b3d..5dde0bf 100644 (file)
@@ -1,38 +1,58 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
 debian/patches and applied during the build.
 
-To get the fully patched source after unpacking the source package, cd
-to the root level of the source package and run:
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
 
-    debian/rules patch
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+                break
+        fi
+    done
 
-Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
-itself.
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
 
-Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
-where you should replace XX with a new number and patchname with a
-descriptive shortname of the patch. You can then simply edit all the
-files your patch wants to edit, and then simply "exit 0" from the shell
-to actually create the patch file.
+    quilt push -a
 
-To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
-and replace XX_patchname with the actual filename from debian/patches
-you want to use.
+The last patch listed in debian/patches/series will become the current
+patch.
 
-To clean up afterwards again, "debian/rules unpatch" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
+To add a new set of changes, first run quilt push -a, and then run:
 
+    quilt new <patch>
 
---- 
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
 
-this documentation is part of dpatch package, and may be used by
-packages using dpatch to comply with policy on README.source. This
-documentation is meant to be useful to users who are not proficient in
-dpatch in doing work with dpatch-based packages. Please send any
-improvements to the BTS of dpatch package.
+    quilt add <file>
 
-original text by Gerfried Fuchs, edited by Junichi Uekawa <dancer@debian.org>
-10 Aug 2008.
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
index 200f9e9..8ca2988 100644 (file)
@@ -1,3 +1,14 @@
+lxpanel (0.5.5-2) unstable; urgency=low
+
+  * debian/control:
+    - Build-depends on libiw-dev for linux only. (Closes:#565636)
+    - Build-depends on new libmenu-cache
+  * Applied backport g_locale_to_utf8.patch from upstream to 
+    preven crashes. (Closes:#572944)
+  * Switch to dpkg-source 3.0 (quilt) format
+
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Sat, 27 Mar 2010 12:04:30 +0700
+
 lxpanel (0.5.5-1) unstable; urgency=low
 
   * New upstream release
index 964f8a6..3b285e6 100644 (file)
@@ -1,10 +1,13 @@
 Source: lxpanel
 Section: x11
 Priority: optional
-Maintainer: Andrew Lee (李健秋) <ajqlee@debian.org>
-Build-Depends: debhelper (>= 5), autotools-dev, intltool, intltool-debian, libgtk2.0-dev (>=2.6), libglib2.0-dev (>=2.10), libxmu-dev, libxpm-dev, libiw-dev, libasound2-dev, libmenu-cache-dev (>=0.2.6), docbook-xml, docbook-xsl, xsltproc, dpatch, python
+Maintainer: Debian LXDE Packaging Team <pkg-lxde-maintainers@lists.alioth.debian.org>
+Uploaders: Andrew Lee (李健秋) <ajqlee@debian.org>
+Build-Depends: debhelper (>= 5), autotools-dev, intltool, intltool-debian, libgtk2.0-dev (>=2.6), libglib2.0-dev (>=2.10), libxmu-dev, libxpm-dev, libiw-dev [!kfreebsd-i386 !kfreebsd-amd64], libasound2-dev, libmenu-cache1-dev (>=0.3.2), docbook-xml, docbook-xsl, xsltproc, python
 Standards-Version: 3.8.4
 Homepage: http://lxde.org
+Vcs-Git: git://git.debian.org/git/collab-maint/lxpanel.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/lxpanel.git;a=summary
 
 Package: lxpanel
 Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644 (file)
index 0ac59e1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-01_default-config.dpatch
diff --git a/debian/patches/01_default-config.dpatch b/debian/patches/01_default-config.dpatch
deleted file mode 100644 (file)
index 77744a4..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_default-config.dpatch by Andrew Lee <andrew@linux.org.tw>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change default terminal and web browser.
-
-@DPATCH@
-diff -urNad lxpanel-0.3.7~/data/default/panels/panel.in lxpanel-0.3.7/data/default/panels/panel.in
---- lxpanel-0.3.7~/data/default/panels/panel.in        2008-04-27 00:47:22.000000000 +0800
-+++ lxpanel-0.3.7/data/default/panels/panel.in 2008-06-14 05:50:44.000000000 +0800
-@@ -53,10 +53,7 @@
-             id=pcmanfm.desktop
-         }
-         Button {
--            id=gnome-terminal.desktop
--        }
--        Button {
--            id=firefox.desktop
-+            id=lxde-x-www-browser.desktop
-         }
-     }
- }
diff --git a/debian/patches/default-config.patch b/debian/patches/default-config.patch
new file mode 100644 (file)
index 0000000..cfd5d8e
--- /dev/null
@@ -0,0 +1,14 @@
+--- a/data/default/panels/panel.in
++++ b/data/default/panels/panel.in
+@@ -53,10 +53,7 @@
+             id=pcmanfm.desktop
+         }
+         Button {
+-            id=gnome-terminal.desktop
+-        }
+-        Button {
+-            id=firefox.desktop
++            id=lxde-x-www-browser.desktop
+         }
+     }
+ }
diff --git a/debian/patches/g_locale_to_utf8.patch b/debian/patches/g_locale_to_utf8.patch
new file mode 100644 (file)
index 0000000..c8c1a0b
--- /dev/null
@@ -0,0 +1,58 @@
+--- a/src/plugins/taskbar.c
++++ b/src/plugins/taskbar.c
+@@ -496,31 +496,34 @@
+     {
+         /* Convert the class to UTF-8 and enter it in the class table. */
+         gchar * res_class = g_locale_to_utf8(ch.res_class, -1, NULL, NULL, NULL);
+-        gboolean name_consumed;
+-        TaskClass * tc = taskbar_enter_res_class(tk->tb, res_class, &name_consumed);
+-        if ( ! name_consumed) g_free(res_class);
+-
+-        /* If the task changed class, update data structures. */
+-        TaskClass * old_tc = tk->res_class;
+-        if (old_tc != tc)
++        if (res_class != NULL)
+         {
+-            /* Unlink from previous class, if any. */
+-            task_unlink_class(tk);
++            gboolean name_consumed;
++            TaskClass * tc = taskbar_enter_res_class(tk->tb, res_class, &name_consumed);
++            if ( ! name_consumed) g_free(res_class);
+-            /* Add to end of per-class task list.  Do this to keep the popup menu in order of creation. */
+-            if (tc->res_class_head == NULL)
+-                tc->res_class_head = tk;
+-            else
++            /* If the task changed class, update data structures. */
++            TaskClass * old_tc = tk->res_class;
++            if (old_tc != tc)
+             {
+-                Task * tk_pred;
+-                for (tk_pred = tc->res_class_head; tk_pred->res_class_flink != NULL; tk_pred = tk_pred->res_class_flink) ;
+-                tk_pred->res_class_flink = tk;
+-                task_button_redraw(tk, tk->tb);
+-            }
+-            tk->res_class = tc;
++                /* Unlink from previous class, if any. */
++                task_unlink_class(tk);
+-            /* Recompute group visibility. */
+-            recompute_group_visibility_for_class(tk->tb, tc);
++                /* Add to end of per-class task list.  Do this to keep the popup menu in order of creation. */
++                if (tc->res_class_head == NULL)
++                    tc->res_class_head = tk;
++                else
++                {
++                    Task * tk_pred;
++                    for (tk_pred = tc->res_class_head; tk_pred->res_class_flink != NULL; tk_pred = tk_pred->res_class_flink) ;
++                    tk_pred->res_class_flink = tk;
++                    task_button_redraw(tk, tk->tb);
++                }
++                tk->res_class = tc;
++
++                /* Recompute group visibility. */
++                recompute_group_visibility_for_class(tk->tb, tc);
++            }
+         }
+         XFree(ch.res_class);
+     }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..f316cb2
--- /dev/null
@@ -0,0 +1,2 @@
+default-config.patch
+g_locale_to_utf8.patch
index 511e802..b8c3ad3 100755 (executable)
@@ -9,7 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
+#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)
@@ -36,7 +36,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
     MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-config.status: configure patch-stamp
+config.status: configure
        dh_testdir
        # Add here commands to configure the package.
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -67,7 +67,7 @@ build-stamp:  config.status
 
        touch $@
 
-clean: unpatch
+clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp 
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)