r10392 - in /desktop/unstable/gnome-applets/debian: changelog control control.in gnome-applets-data.postinst gnome-applets.postinst gnome-applets.postrm rules

lool at users.alioth.debian.org lool at users.alioth.debian.org
Wed Apr 25 09:43:04 UTC 2007


Author: lool
Date: Wed Apr 25 09:43:04 2007
New Revision: 10392

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10392
Log:
* Add ${misc:Depends}.
* Cleanups.

Modified:
    desktop/unstable/gnome-applets/debian/changelog
    desktop/unstable/gnome-applets/debian/control
    desktop/unstable/gnome-applets/debian/control.in
    desktop/unstable/gnome-applets/debian/gnome-applets-data.postinst
    desktop/unstable/gnome-applets/debian/gnome-applets.postinst
    desktop/unstable/gnome-applets/debian/gnome-applets.postrm
    desktop/unstable/gnome-applets/debian/rules

Modified: desktop/unstable/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/changelog?rev=10392&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/changelog (original)
+++ desktop/unstable/gnome-applets/debian/changelog Wed Apr 25 09:43:04 2007
@@ -3,8 +3,10 @@
   * Build-depend on libgucharmap5-dev instead of libgucharmap4-dev.
   * Upload to unstable; drop check-dist include.
   * Wrap build-deps and deps.
-
- -- Loic Minier <lool at dooz.org>  Wed, 25 Apr 2007 11:38:08 +0200
+  * Add ${misc:Depends}.
+  * Cleanups.
+
+ -- Loic Minier <lool at dooz.org>  Wed, 25 Apr 2007 11:40:08 +0200
 
 gnome-applets (2.18.0-1) experimental; urgency=low
 

Modified: desktop/unstable/gnome-applets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/control?rev=10392&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/control (original)
+++ desktop/unstable/gnome-applets/debian/control Wed Apr 25 09:43:04 2007
@@ -134,6 +134,7 @@
 Architecture: any
 Priority: extra
 Depends: ${shlibs:Depends},
+         ${misc:Depends},
          gnome-applets (= ${binary:Version})
 Description: Various applets for GNOME 2 panel - binary files with debugging symbols
  This package contains unstripped binaries used for debugging.
@@ -141,6 +142,7 @@
 Package: gnome-applets-dev
 Architecture: any
 Depends: ${shlibs:Depends},
+         ${misc:Depends},
          gnome-applets (= ${binary:Version})
 Description: Various applets for GNOME 2 panel - development files
  This package contains development materials needed to build extensions for

Modified: desktop/unstable/gnome-applets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/control.in?rev=10392&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/control.in (original)
+++ desktop/unstable/gnome-applets/debian/control.in Wed Apr 25 09:43:04 2007
@@ -134,6 +134,7 @@
 Architecture: any
 Priority: extra
 Depends: ${shlibs:Depends},
+         ${misc:Depends},
          gnome-applets (= ${binary:Version})
 Description: Various applets for GNOME 2 panel - binary files with debugging symbols
  This package contains unstripped binaries used for debugging.
@@ -141,6 +142,7 @@
 Package: gnome-applets-dev
 Architecture: any
 Depends: ${shlibs:Depends},
+         ${misc:Depends},
          gnome-applets (= ${binary:Version})
 Description: Various applets for GNOME 2 panel - development files
  This package contains development materials needed to build extensions for

Modified: desktop/unstable/gnome-applets/debian/gnome-applets-data.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/gnome-applets-data.postinst?rev=10392&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/gnome-applets-data.postinst (original)
+++ desktop/unstable/gnome-applets/debian/gnome-applets-data.postinst Wed Apr 25 09:43:04 2007
@@ -4,14 +4,12 @@
 #DEBHELPER#
 
 if [ "$1" = "configure" ]; then
-	GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	TMP_HOME=`mktemp -d /tmp/gconf.XXXXXX`
-	HOME=${TMP_HOME} gconftool-2 --direct \
-		--config-source=${GCONF_CONFIG_SOURCE} --recursive-unset \
-		/apps/mini-commander /apps/mini-commander-global \
-		/schemas/apps/mini-commander \
-		/schemas/apps/mini-commander-global   >/dev/null
-	rm -rf ${TMP_HOME}
+        GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+        TMP_HOME=`mktemp -d /tmp/gconf.XXXXXX`
+        HOME=${TMP_HOME} gconftool-2 --direct \
+                --config-source=${GCONF_CONFIG_SOURCE} --recursive-unset \
+                /apps/mini-commander /apps/mini-commander-global \
+                /schemas/apps/mini-commander \
+                /schemas/apps/mini-commander-global   >/dev/null
+        rm -rf ${TMP_HOME}
 fi
-
-exit 0

Modified: desktop/unstable/gnome-applets/debian/gnome-applets.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/gnome-applets.postinst?rev=10392&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/gnome-applets.postinst (original)
+++ desktop/unstable/gnome-applets/debian/gnome-applets.postinst Wed Apr 25 09:43:04 2007
@@ -10,12 +10,12 @@
 
 case "$1" in
     configure)
-	if test -e $prog; then
-	    db_get gnome-applets/cpufreq_SUID_bit
-	    if [ "$RET" = "false" ]; then
-		chmod 0755 $prog
-	    fi;
-	fi
+        if test -e $prog; then
+            db_get gnome-applets/cpufreq_SUID_bit
+            if [ "$RET" = "false" ]; then
+                chmod 0755 $prog
+            fi;
+        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
@@ -29,5 +29,3 @@
 esac
 
 #DEBHELPER#
-
-exit 0

Modified: desktop/unstable/gnome-applets/debian/gnome-applets.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/gnome-applets.postrm?rev=10392&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/gnome-applets.postrm (original)
+++ desktop/unstable/gnome-applets/debian/gnome-applets.postrm Wed Apr 25 09:43:04 2007
@@ -6,18 +6,16 @@
 prog=/usr/bin/cpufreq-selector
 
 case "$1" in
-	purge)
-		if dpkg-statoverride --list $prog > /dev/null; then
-			dpkg-statoverride --remove $prog
-		fi;
-	;;
-	remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+        purge)
+                if dpkg-statoverride --list $prog > /dev/null; then
+                        dpkg-statoverride --remove $prog
+                fi;
         ;;
-	*)
-        	echo "postrm called with unknown argument \`$1'" >&2
-	        exit 1
+        remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+        ;;
+        *)
+                echo "postrm called with unknown argument \`$1'" >&2
+                exit 1
 esac
 
 #DEBHELPER#
-
-exit 0

Modified: desktop/unstable/gnome-applets/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/rules?rev=10392&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/rules (original)
+++ desktop/unstable/gnome-applets/debian/rules Wed Apr 25 09:43:04 2007
@@ -1,21 +1,11 @@
 #!/usr/bin/make -f
 
-# Gnome Team
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-# Get upstream source
+include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-# Including this file gets us a simple patch system.  You can just
-# drop patches in debian/patches, and they will be automatically
-# applied and unapplied.
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-# Including this gives us a number of rules typical to a GNOME
-# program, including setting GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1.
-# Note that this class inherits from autotools.mk and docbookxml.mk,
-# so you don't need to include those too.
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
@@ -26,7 +16,7 @@
 
 DEB_DH_STRIP_ARGS += --dbg-package=gnome-applets-dbg
 
-DEB_DH_MAKESHLIBS_ARGS_gnome-applets := -V 'gnome-applets (>= 2.16)'
+DEB_DH_MAKESHLIBS_ARGS_gnome-applets += -V 'gnome-applets (>= 2.16)'
 
 # Build manual pages
 build/gnome-applets:: $(MANPAGES)




More information about the pkg-gnome-commits mailing list