Sync debian/ for lxde-common, lxpanel and lxsession
authorAndrew Lee <ajqlee@debian.org>
Mon, 5 May 2008 01:47:56 +0000 (01:47 +0000)
committerAndrew Lee <ajqlee@debian.org>
Mon, 5 May 2008 01:47:56 +0000 (01:47 +0000)
debian/changelog
debian/control
debian/patches/01_default-config.dpatch
debian/rules

index 836686d..b8f9a44 100644 (file)
@@ -1,7 +1,12 @@
-lxpanel (0.2.8.2-1) unstable; urgency=low
+lxpanel (0.3.5.2+svn20080426-1) unstable; urgency=low
 
-  * Initial release (Closes: #466562)
+  * New upstream release
+
+ -- Andrew Lee <andrew@linux.org.tw>  Sat, 26 Apr 2008 08:21:46 +0800
 
- -- Andrew Lee <andrew@linux.org.tw>  Tue, 25 Mar 2008 23:47:22 +0800
+lxpanel (0.3.5.2-1) unstable; urgency=low
+
+  * Initial release (Closes: #466562)
 
+ -- Andrew Lee <andrew@linux.org.tw>  Sun, 20 Apr 2008 18:54:40 +0800
 
index a879dd8..5b6b877 100644 (file)
@@ -9,7 +9,7 @@ Homepage: http://www.gnomefiles.org/app.php/LXPanel
 Package: lxpanel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: lxsession
+Suggests: lxsession-lite (>=0.3.5) | lxsession (>=0.3.2) | menu
 Description: a lightweight desktop panel for X
  LXPanel is a lightweight GTK+ 2.x based desktop panel with following 
  features:
index e3aaf81..56f9efc 100755 (executable)
@@ -5,19 +5,19 @@
 ## DP: Change default terminal and web browser.
 
 @DPATCH@
-diff -urNad lxpanel-0.2.8~/data/default/config.in lxpanel-0.2.8/data/default/config.in
---- lxpanel-0.2.8~/data/default/config.in      2008-02-25 21:13:09.000000000 +0800
-+++ lxpanel-0.2.8/data/default/config.in       2008-03-21 21:28:58.000000000 +0800
-@@ -149,10 +149,10 @@
-             id = pcmanfm.desktop
+diff -urNad lxpanel-0.3.5.2~/data/default/panels/panel.in lxpanel-0.3.5.2/data/default/panels/panel.in
+--- lxpanel-0.3.5.2~/data/default/panels/panel.in      2008-04-20 18:09:12.000000000 +0800
++++ lxpanel-0.3.5.2/data/default/panels/panel.in       2008-04-20 18:53:54.000000000 +0800
+@@ -53,10 +53,10 @@
+             id=pcmanfm.desktop
          }
-         button {
--            id = gnome-terminal.desktop
-+            id = lxde-terminal-emulator.desktop
+         Button {
+-            id=gnome-terminal.desktop
++            id=lxde-x-terminal-emulator.desktop
          }
-         button {
--            id = firefox.desktop
-+            id = lxde-x-www-browser.desktop
+         Button {
+-            id=firefox.desktop
++            id=lxde-x-www-browser.desktop
          }
      }
  }
index ddb65c2..8d04ee1 100755 (executable)
@@ -73,9 +73,9 @@ install: build
 
        # Install .desktop files
        install -d $(CURDIR)/debian/lxpanel/usr/share/applications
-       install -m644 $(CURDIR)/debian/lxde-terminal-emulator.desktop \
+       install -m644 $(CURDIR)/debian/lxde-x-terminal-emulator.desktop \
                        $(CURDIR)/debian/lxpanel/usr/share/applications
-       install -m644 $(CURDIR)/debian/lxde-www-browser.desktop \
+       install -m644 $(CURDIR)/debian/lxde-x-www-browser.desktop \
                        $(CURDIR)/debian/lxpanel/usr/share/applications
 
 
@@ -101,7 +101,7 @@ binary-arch: build install
 #      dh_installinit
 #      dh_installcron
 #      dh_installinfo
-       dh_desktop -A lxde-terminal-emulator.desktop lxde-www-browser.desktop
+       dh_desktop -A lxde-x-terminal-emulator.desktop lxde-x-www-browser.desktop
        dh_installman
        dh_link
        dh_strip