sync debian/ for lxpanel and lxde-common
authorAndrew Lee <ajqlee@debian.org>
Wed, 26 Mar 2008 14:58:49 +0000 (14:58 +0000)
committerAndrew Lee <ajqlee@debian.org>
Wed, 26 Mar 2008 14:58:49 +0000 (14:58 +0000)
debian/changelog
debian/control
debian/lxde-terminal-emulator.desktop [new file with mode: 0644]
debian/lxde-www-browser.desktop [new file with mode: 0644]
debian/patches/00list [new file with mode: 0644]
debian/patches/01_default-config.dpatch [new file with mode: 0755]
debian/rules

index 229e59f..836686d 100644 (file)
@@ -1,5 +1,7 @@
-lxpanel (0.2.7.1-1) unstable; urgency=low
+lxpanel (0.2.8.2-1) unstable; urgency=low
 
   * Initial release (Closes: #466562)
 
- -- Andrew Lee <andrew@linux.org.tw>  Mon, 03 Mar 2008 02:16:04 +0800
+ -- Andrew Lee <andrew@linux.org.tw>  Tue, 25 Mar 2008 23:47:22 +0800
+
+
index 0a5b22a..a879dd8 100644 (file)
@@ -2,12 +2,14 @@ Source: lxpanel
 Section: x11
 Priority: optional
 Maintainer: Andrew Lee <andrew@linux.org.tw>
-Build-Depends: debhelper (>= 5), autotools-dev, libgtk2.0-dev (>=2.6), libglib2.0-dev(>=2.10), libxmu-dev, libxpm-dev, docbook-to-man
+Build-Depends: debhelper (>= 5), autotools-dev, libgtk2.0-dev (>=2.6), libglib2.0-dev(>=2.10), libxmu-dev, libxpm-dev, libiw-dev, libasound2-dev, docbook-to-man, dpatch
 Standards-Version: 3.7.3
+Homepage: http://www.gnomefiles.org/app.php/LXPanel
 
 Package: lxpanel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: lxsession
 Description: a lightweight desktop panel for X
  LXPanel is a lightweight GTK+ 2.x based desktop panel with following 
  features:
diff --git a/debian/lxde-terminal-emulator.desktop b/debian/lxde-terminal-emulator.desktop
new file mode 100644 (file)
index 0000000..eca60a2
--- /dev/null
@@ -0,0 +1,19 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=Terminal emulator
+Name[zh_CN]=终端
+Name[zh_TW]=終端機
+Comment=Terminal Emulator
+Comment[zh_TW]=終端機程式
+GenericName=Terminal Emulator
+GenericName[zh_TW]=終端機程式
+Exec=x-terminal-emulator
+Icon=Terminal
+Terminal=false
+Type=Application
+Categories=System;TerminalEmulator;Utility;
+StartupNotify=true
+Hidden=True
+
+# vi:set encoding=UTF-8:
diff --git a/debian/lxde-www-browser.desktop b/debian/lxde-www-browser.desktop
new file mode 100644 (file)
index 0000000..af80c31
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Web Browser
+GenericName=X Web Browser
+Exec=/etc/alternatives/x-www-browser %u
+Terminal=false
+Type=Application
+Categories=GTK;WebBrowser;Network
+Icon=applications-internet
+Hidden=True
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644 (file)
index 0000000..0ac59e1
--- /dev/null
@@ -0,0 +1 @@
+01_default-config.dpatch
diff --git a/debian/patches/01_default-config.dpatch b/debian/patches/01_default-config.dpatch
new file mode 100755 (executable)
index 0000000..e3aaf81
--- /dev/null
@@ -0,0 +1,23 @@
+#! /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.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
+         }
+         button {
+-            id = gnome-terminal.desktop
++            id = lxde-terminal-emulator.desktop
+         }
+         button {
+-            id = firefox.desktop
++            id = lxde-x-www-browser.desktop
+         }
+     }
+ }
index ee9f9c5..a71adc1 100755 (executable)
@@ -9,6 +9,7 @@
 # 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)
@@ -16,7 +17,7 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 
-config.status: configure
+config.status: configure patch-stamp
        dh_testdir
        # Add here commands to configure the package.
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -45,7 +46,7 @@ build-stamp:  config.status
 
        touch $@
 
-clean:
+clean: unpatch
        dh_testdir
        dh_testroot
        rm -f build-stamp 
@@ -53,6 +54,11 @@ clean:
        # Add here commands to clean up after the build process.
        [ ! -f Makefile ] || $(MAKE) distclean
        rm -f config.sub config.guess
+       rm -f intltool-extract \
+             intltool-update \
+             intltool-merge \
+             man/lxpanel.1  \
+             man/lxpanelctl.1
 
        dh_clean 
 
@@ -65,6 +71,13 @@ install: build
        # Add here commands to install the package into debian/lxpanel.
        $(MAKE) DESTDIR=$(CURDIR)/debian/lxpanel install
 
+       # Install .desktop files
+       install -d $(CURDIR)/debian/usr/share/applications
+       install -m644 $(CURDIR)/debian/lxde-terminal-emulator.desktop \
+                       $(CURDIR)/debian/usr/share/applications
+       install -m644 $(CURDIR)/debian/lxde-www-browser.desktop \
+                       $(CURDIR)/debian/usr/share/applications
+
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -88,6 +101,7 @@ binary-arch: build install
 #      dh_installinit
 #      dh_installcron
 #      dh_installinfo
+       dh_desktop -A lxde-terminal-emulator.desktop lxde-www-browser.desktop
        dh_installman
        dh_link
        dh_strip