r11180 - in /desktop/unstable/gnome-panel/debian: changelog gnome-panel-data.postinst gnome-panel-data.postrm libpanel-applet2-dev.install rules

[lool at users.alioth.debian.org]

Author: lool
Date: Mon May 28 14:49:51 2007
New Revision: 11180

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11180
Log:
* New upstream stable release; no API change.
* Misc cleanups; drop obsolete snippets in maintainer scripts.

Modified:
    desktop/unstable/gnome-panel/debian/changelog
    desktop/unstable/gnome-panel/debian/gnome-panel-data.postinst
    desktop/unstable/gnome-panel/debian/gnome-panel-data.postrm
    desktop/unstable/gnome-panel/debian/libpanel-applet2-dev.install
    desktop/unstable/gnome-panel/debian/rules

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=11180&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog (original)
+++ desktop/unstable/gnome-panel/debian/changelog Mon May 28 14:49:51 2007
@@ -1,3 +1,10 @@
+gnome-panel (2.18.2-1) unstable; urgency=low
+
+  * New upstream stable release; no API change.
+  * Misc cleanups; drop obsolete snippets in maintainer scripts.
+
+ -- Loic Minier <lool at dooz.org>  Mon, 28 May 2007 16:49:33 +0200
+
 gnome-panel (2.18.1-2) unstable; urgency=low
 
   [ Loic Minier ]

Modified: desktop/unstable/gnome-panel/debian/gnome-panel-data.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/gnome-panel-data.postinst?rev=11180&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/gnome-panel-data.postinst (original)
+++ desktop/unstable/gnome-panel/debian/gnome-panel-data.postinst Mon May 28 14:49:51 2007
@@ -10,20 +10,6 @@
 
 case "$action" in
   configure)
-    version="$2"
-
-    if [ -n "$version" ] \
-       && dpkg --compare-versions "$version" lt "2.14.2-2"; then
-        config_source=$(gconftool-2 --get-default-source)
-        tmp_dir=$(mktemp -t -d gconf.XXXXXXXXXX)
-        HOME="$tmp_dir" gconftool-2 --direct \
-                                    --config-source="$config_source" \
-                                    --recursive-unset \
-                                    /apps/panel/default_setup \
-                                    >/dev/null
-        kill -s HUP `pidof gconfd-2` >/dev/null 2>&1 || true
-        rm -rf "$tmp_dir"
-    fi
     update-gconf-defaults
   ;;
   abort-upgrade|abort-remove|abort-remove|abort-deconfigure)

Modified: desktop/unstable/gnome-panel/debian/gnome-panel-data.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/gnome-panel-data.postrm?rev=11180&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/gnome-panel-data.postrm (original)
+++ desktop/unstable/gnome-panel/debian/gnome-panel-data.postrm Mon May 28 14:49:51 2007
@@ -10,12 +10,7 @@
   remove)
     [ -x /usr/sbin/update-gconf-defaults ] && update-gconf-defaults
   ;;
-  purge)
-    # FIXME I am probably a very old cleanup snippet, check whether you can
-    # remove me!
-    rm -rf /var/lib/gnome
-  ;;
-  upgrade|failed-upgrade|abort-install|abort-install|abort-upgrade|disappear)
+  upgrade|failed-upgrade|abort-install|abort-install|abort-upgrade|disappear|purge)
   ;;
   *)
     echo "$self: W: unknown action \`$action'" >&2

Modified: desktop/unstable/gnome-panel/debian/libpanel-applet2-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/libpanel-applet2-dev.install?rev=11180&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/libpanel-applet2-dev.install (original)
+++ desktop/unstable/gnome-panel/debian/libpanel-applet2-dev.install Mon May 28 14:49:51 2007
@@ -1,4 +1,6 @@
 debian/tmp/usr/include/ usr/
 debian/tmp/usr/lib/pkgconfig usr/lib/
-debian/tmp/usr/lib/libpanel-applet-2.{a,la,so} usr/lib/
+debian/tmp/usr/lib/libpanel-applet-2.a usr/lib/
+debian/tmp/usr/lib/libpanel-applet-2.la usr/lib/
+debian/tmp/usr/lib/libpanel-applet-2.so usr/lib/
 debian/tmp/usr/share/idl/ usr/share/

Modified: desktop/unstable/gnome-panel/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/rules?rev=11180&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/rules (original)
+++ desktop/unstable/gnome-panel/debian/rules Mon May 28 14:49:51 2007
@@ -10,7 +10,9 @@
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --with-in-process-applets=all
+DEB_CONFIGURE_EXTRA_FLAGS += \
+			--disable-scrollkeeper \
+			--with-in-process-applets=all
 ifneq ($(DEB_BUILD_GNU_SYSTEM),gnu)
 	DEB_CONFIGURE_EXTRA_FLAGS += --enable-eds
 endif