r20491 - in /desktop/unstable/gnome-utils/debian: changelog control control.in gnome-screenshot.1 gnome-screenshot.sgml patches/01_logview_gksu.patch rules watch

pochu-guest at users.alioth.debian.org pochu-guest at users.alioth.debian.org
Sat Jun 27 17:15:46 UTC 2009


Author: pochu-guest
Date: Sat Jun 27 17:15:45 2009
New Revision: 20491

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20491
Log:
* debian/gnome-screenshot.sgml: updated for the new options. Patch by
  Tom Feiner, thanks! Closes: #534539.
* Autogenerate the manpage during the build.
* debian/watch: don't uupdate.
* debian/rules: don't call dh_desktop and dh_scrollkeeper, they're
  deprecated.
* Standards-Version is 3.8.2, no changes needed.
* Update Vcs-* fields.
* debian/patches/01_logview_gksu.patch: add upstream bug reference.

Removed:
    desktop/unstable/gnome-utils/debian/gnome-screenshot.1
Modified:
    desktop/unstable/gnome-utils/debian/changelog
    desktop/unstable/gnome-utils/debian/control
    desktop/unstable/gnome-utils/debian/control.in
    desktop/unstable/gnome-utils/debian/gnome-screenshot.sgml
    desktop/unstable/gnome-utils/debian/patches/01_logview_gksu.patch
    desktop/unstable/gnome-utils/debian/rules
    desktop/unstable/gnome-utils/debian/watch

Modified: desktop/unstable/gnome-utils/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/changelog?rev=20491&op=diff
==============================================================================
--- desktop/unstable/gnome-utils/debian/changelog (original)
+++ desktop/unstable/gnome-utils/debian/changelog Sat Jun 27 17:15:45 2009
@@ -1,3 +1,17 @@
+gnome-utils (2.26.0-2) UNRELEASED; urgency=low
+
+  * debian/gnome-screenshot.sgml: updated for the new options. Patch by
+    Tom Feiner, thanks! Closes: #534539.
+  * Autogenerate the manpage during the build.
+  * debian/watch: don't uupdate.
+  * debian/rules: don't call dh_desktop and dh_scrollkeeper, they're
+    deprecated.
+  * Standards-Version is 3.8.2, no changes needed.
+  * Update Vcs-* fields.
+  * debian/patches/01_logview_gksu.patch: add upstream bug reference.
+
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Sat, 27 Jun 2009 17:44:20 +0200
+
 gnome-utils (2.26.0-1) unstable; urgency=low
 
   [ Josselin Mouette ]

Modified: desktop/unstable/gnome-utils/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/control?rev=20491&op=diff
==============================================================================
--- desktop/unstable/gnome-utils/debian/control (original)
+++ desktop/unstable/gnome-utils/debian/control Sat Jun 27 17:15:45 2009
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Gustavo Noronha Silva <kov at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at ubuntu.com>, Gustavo Noronha Silva <kov at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 5),
                intltool (>= 0.35.0),
@@ -28,6 +28,7 @@
                gnome-doc-utils (>= 0.3.2),
                zlib1g-dev,
                autotools-dev,
+               docbook-to-man,
                libglib2.0-doc,
                libgtk2.0-doc
 Standards-Version: 3.8.1

Modified: desktop/unstable/gnome-utils/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/control.in?rev=20491&op=diff
==============================================================================
--- desktop/unstable/gnome-utils/debian/control.in (original)
+++ desktop/unstable/gnome-utils/debian/control.in Sat Jun 27 17:15:45 2009
@@ -28,12 +28,13 @@
                gnome-doc-utils (>= 0.3.2),
                zlib1g-dev,
                autotools-dev,
+               docbook-to-man,
                libglib2.0-doc,
                libgtk2.0-doc
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Homepage: http://live.gnome.org/GnomeUtils
-Vcs-Svn: svn://svn.debian.org/pkg-gnome/packages/experimental/gnome-utils/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-utils/?op=log
+Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/gnome-utils/
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/gnome-utils/
 
 Package: libgdict-1.0-6
 Architecture: any

Modified: desktop/unstable/gnome-utils/debian/gnome-screenshot.sgml
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/gnome-screenshot.sgml?rev=20491&op=diff
==============================================================================
--- desktop/unstable/gnome-utils/debian/gnome-screenshot.sgml (original)
+++ desktop/unstable/gnome-utils/debian/gnome-screenshot.sgml Sat Jun 27 17:15:45 2009
@@ -42,9 +42,13 @@
       <command>&dhpackage;</command>
 
      <arg><option>-w</option></arg>
+     <arg><option>-a</option></arg>
+     <arg><option>-b</option></arg>
+     <arg><option>-B</option></arg>
      <arg><option>-d <replaceable>SECONDS</replaceable> </option></arg>
      <arg><option>-e <replaceable>EFFECT</replaceable> </option></arg>
      <arg><option>-i</option></arg>
+     <arg><option>--display</option> <replaceable>DISPLAY</replaceable> </arg>
 
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -65,12 +69,37 @@
     <title>OPTIONS</title>
 
     <variablelist>
+
       <varlistentry>
         <term><option>-w</option>,
           <option>--window</option></term>
         <listitem>
           <para>Grab the current active window instead of the entire
             screen.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-a</option>,
+          <option>--area</option></term>
+        <listitem>
+          <para>Grab an area of the screen instead of the entire screen.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-b</option>,
+          <option>--include-border</option></term>
+        <listitem>
+          <para>Include the window border with the screenshot.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-B</option>,
+          <option>--remove-border</option></term>
+        <listitem>
+          <para>Remove the window border from the screenshot.</para>
         </listitem>
       </varlistentry>
 
@@ -102,7 +131,15 @@
         </listitem>
       </varlistentry>
 
+ 
       <varlistentry>
+        <term><option>--display <replaceable>DISPLAY</replaceable></option></term>
+        <listitem>
+          <para>X display to use.</para>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry>
         <term><option>-?</option>,
           <option>--help</option></term>
         <listitem>
@@ -132,6 +169,9 @@
     <para>Updated by Theppitak Karoonboonyanan
       <email>thep at linux.thai.net</email>.</para>
 
+    <para>Updated by Tom Feiner
+      <email>feiner.tom at gmail.com</email>.</para>
+
   </refsect1>
 </refentry>
 

Modified: desktop/unstable/gnome-utils/debian/patches/01_logview_gksu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/patches/01_logview_gksu.patch?rev=20491&op=diff
==============================================================================
--- desktop/unstable/gnome-utils/debian/patches/01_logview_gksu.patch (original)
+++ desktop/unstable/gnome-utils/debian/patches/01_logview_gksu.patch Sat Jun 27 17:15:45 2009
@@ -1,3 +1,7 @@
+Bug: http://bugzilla.gnome.org/show_bug.cgi?id=126051
+
+This will be obsolete if/when upstream has PolicyKit integration
+
 --- logview/data/gnome-system-log.desktop.in.in.orig	2008-09-14 15:43:48.000000000 +0200
 +++ logview/data/gnome-system-log.desktop.in.in	2009-01-04 12:36:47.321178809 +0100
 @@ -1,11 +1,12 @@

Modified: desktop/unstable/gnome-utils/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/rules?rev=20491&op=diff
==============================================================================
--- desktop/unstable/gnome-utils/debian/rules (original)
+++ desktop/unstable/gnome-utils/debian/rules Sat Jun 27 17:15:45 2009
@@ -30,6 +30,7 @@
 	CFLAGS="$(CFLAGS)" ./configure $(configure_flags)
 
 build: build-stamp
+	/usr/bin/docbook-to-man debian/gnome-screenshot.sgml > debian/gnome-screenshot.1
 
 build-stamp:  config.status
 	dh_testdir
@@ -52,6 +53,7 @@
 	rm -f intltool-extract intltool-merge intltool-update
 	find . -name "*.omf.out" -exec rm -f {} \;
 	dh_clean
+	rm -f debian/gnome-terminal.1
 
 install: build
 	dh_testdir
@@ -79,8 +81,6 @@
 	# remove empty directories from the gnome-utils package
 	rm -rf debian/gnome-utils/usr/include/ debian/gnome-utils/usr/lib/pkgconfig/
 	dh_gconf
-	dh_desktop
-	dh_scrollkeeper
 	dh_makeshlibs
 	dh_link
 	dh_strip

Modified: desktop/unstable/gnome-utils/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/watch?rev=20491&op=diff
==============================================================================
--- desktop/unstable/gnome-utils/debian/watch (original)
+++ desktop/unstable/gnome-utils/debian/watch Sat Jun 27 17:15:45 2009
@@ -1,4 +1,3 @@
 version=2
 http://download.gnome.org/sources/gnome-utils/([\d\.]+)[02468]/ \
-	gnome-utils-(.*)\.tar\.gz \
-	debian uupdate
+	gnome-utils-(.*)\.tar\.gz




More information about the pkg-gnome-commits mailing list