r24552 - in /desktop/unstable/gnome-utils/debian: ./ patches/ source/

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat Jun 19 13:54:54 UTC 2010


Author: joss
Date: Sat Jun 19 13:54:52 2010
New Revision: 24552

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24552
Log:
* Update build-dependencies, especially add missing one on 
  gtk-doc-tools.
* Switch to cdbs, based on Ubuntu packaging. Closes: #583370.
* Remove workaround for docbook stuff, gtk-doc-tools should bring 
  docbook-xml and its XML catalog.
* Remove workaround for broken .schemas file, it’s been fixed 
  upstream.
* Split gnome-utils into one package per tool. Closes: #584981.
* Switch to 3.0 (quilt) source format.

Added:
    desktop/unstable/gnome-utils/debian/baobab.docs
    desktop/unstable/gnome-utils/debian/baobab.install
    desktop/unstable/gnome-utils/debian/baobab.menu
    desktop/unstable/gnome-utils/debian/gnome-dictionary.docs
    desktop/unstable/gnome-utils/debian/gnome-dictionary.install
    desktop/unstable/gnome-utils/debian/gnome-dictionary.menu
    desktop/unstable/gnome-utils/debian/gnome-screenshot.install
    desktop/unstable/gnome-utils/debian/gnome-screenshot.menu
    desktop/unstable/gnome-utils/debian/gnome-search-tool.install
    desktop/unstable/gnome-utils/debian/gnome-search-tool.menu
    desktop/unstable/gnome-utils/debian/gnome-system-log.install
    desktop/unstable/gnome-utils/debian/gnome-system-log.menu
    desktop/unstable/gnome-utils/debian/gnome-utils-common.install
    desktop/unstable/gnome-utils/debian/libgdict-1.0-6.install
    desktop/unstable/gnome-utils/debian/libgdict-1.0-dev.install
    desktop/unstable/gnome-utils/debian/patches/series
    desktop/unstable/gnome-utils/debian/source/
    desktop/unstable/gnome-utils/debian/source/format
Removed:
    desktop/unstable/gnome-utils/debian/gnome-utils.install
    desktop/unstable/gnome-utils/debian/gnome-utils.menu
    desktop/unstable/gnome-utils/debian/libgdict-1.0-6.files
    desktop/unstable/gnome-utils/debian/libgdict-1.0-dev.files
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/patches/01_logview_gksu.patch
    desktop/unstable/gnome-utils/debian/rules

Added: desktop/unstable/gnome-utils/debian/baobab.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/baobab.docs?rev=24552&op=file
==============================================================================
--- desktop/unstable/gnome-utils/debian/baobab.docs (added)
+++ desktop/unstable/gnome-utils/debian/baobab.docs [utf-8] Sat Jun 19 13:54:52 2010
@@ -1,0 +1,1 @@
+baobab/README

Added: desktop/unstable/gnome-utils/debian/baobab.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/baobab.install?rev=24552&op=file
==============================================================================
--- desktop/unstable/gnome-utils/debian/baobab.install (added)
+++ desktop/unstable/gnome-utils/debian/baobab.install [utf-8] Sat Jun 19 13:54:52 2010
@@ -1,0 +1,9 @@
+debian/tmp/etc/gconf/schemas/baobab.schemas
+debian/tmp/usr/bin/baobab
+debian/tmp/usr/share/applications/baobab.desktop
+debian/tmp/usr/share/baobab
+debian/tmp/usr/share/gnome/help/baobab
+debian/tmp/usr/share/icons/hicolor
+debian/tmp/usr/share/man/man1/baobab.1
+debian/tmp/usr/share/omf/baobab
+debian/pixmaps/baobab.xpm /usr/share/pixmaps

Added: desktop/unstable/gnome-utils/debian/baobab.menu
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/baobab.menu?rev=24552&op=file
==============================================================================
--- desktop/unstable/gnome-utils/debian/baobab.menu (added)
+++ desktop/unstable/gnome-utils/debian/baobab.menu [utf-8] Sat Jun 19 13:54:52 2010
@@ -1,0 +1,5 @@
+?package(baobab):needs="X11" \
+  section="Applications/File Management" \
+  title="Baobab" command="/usr/bin/baobab" \
+  icon="/usr/share/pixmaps/baobab.xpm" hints="Gnome"
+

Modified: desktop/unstable/gnome-utils/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/changelog?rev=24552&op=diff
==============================================================================
--- desktop/unstable/gnome-utils/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-utils/debian/changelog [utf-8] Sat Jun 19 13:54:52 2010
@@ -1,3 +1,17 @@
+gnome-utils (2.30.0-2) unstable; urgency=low
+
+  * Update build-dependencies, especially add missing one on 
+    gtk-doc-tools.
+  * Switch to cdbs, based on Ubuntu packaging. Closes: #583370.
+  * Remove workaround for docbook stuff, gtk-doc-tools should bring 
+    docbook-xml and its XML catalog.
+  * Remove workaround for broken .schemas file, it’s been fixed 
+    upstream.
+  * Split gnome-utils into one package per tool. Closes: #584981.
+  * Switch to 3.0 (quilt) source format.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 19 Jun 2010 15:20:04 +0200
+
 gnome-utils (2.30.0-1) unstable; urgency=low
 
   * New upstream stable release:

Modified: desktop/unstable/gnome-utils/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/control?rev=24552&op=diff
==============================================================================
--- desktop/unstable/gnome-utils/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-utils/debian/control [utf-8] Sat Jun 19 13:54:52 2010
@@ -10,22 +10,23 @@
 Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, 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),
+               gnome-pkg-tools (>= 0.10),
+               autotools-dev,
                intltool (>= 0.40.0),
+               libxt-dev,
                libglib2.0-dev (>= 2.20.0),
+               libgconf2-dev,
                libgtk2.0-dev (>= 2.18.0),
-               libxt-dev,
                libpanel-applet2-dev (>= 2.13.4),
                libgtop2-dev (>= 2.12.0),
                libcanberra-gtk-dev (>= 0.4),
                x11proto-xext-dev,
+               libxext-dev,
                libx11-dev,
-               libgconf2-dev,
-               e2fslibs-dev,
-               scrollkeeper,
-               gnome-pkg-tools (>= 0.10),
+               zlib1g-dev,
+               rarian-compat,
+               gtk-doc-tools (>= 1.10),
                gnome-doc-utils (>= 0.3.2),
-               zlib1g-dev,
-               autotools-dev,
                libglib2.0-doc,
                libgtk2.0-doc
 Standards-Version: 3.8.3
@@ -33,15 +34,26 @@
 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: gnome-utils-common
+Architecture: all
+Section: libs
+Depends: ${misc:Depends}
+Conflicts: gnome-utils (<< 2.30.0-2)
+Replaces: gnome-utils (<< 2.30.0-2)
+Description: data files for the GNOME utilities
+ This package contains the translation files for the GNOME utilities 
+ bundle.
+
 Package: libgdict-1.0-6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
+         ${misc:Depends},
+         gnome-utils-common (>= ${gnome:Version}),
+         gnome-utils-common (<< ${gnome:NextVersion})
 Replaces: gnome-utils (<< 2.23.90-1)
 Conflicts: gnome-utils (<< 2.23.90-1)
-Description: GNOME Dictionary base library
- GNOME is the "GNU Network Object Model Environment".
+Description: GNOME Dictionary base library - runtime
  This package contains the library used by the GNOME dictionary
  utility, and other applications providing similar functionality.
 
@@ -50,34 +62,102 @@
 Architecture: any
 Depends: ${misc:Depends},
          libgdict-1.0-6 (= ${binary:Version}),
-         libgtk2.0-dev (>= 2.18.0)
+         libgtk2.0-dev (>= 2.18.0),
+         libglib2.0-dev (>= 2.20.0)
 Replaces: gnome-utils (<< 2.24.1-3)
 Description: GNOME Dictionary base library - development files
  This package contains the development files for a library used by the
  GNOME dictionary utility, and other applications providing similar
  functionality.
 
-Package: gnome-utils
+Package: baobab
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Recommends: gksu
-Suggests: yelp,
-          gcalctool
-Provides: gdict,
-          dict-client
-Conflicts: gdict,
-           gnome-panel (<< 2.10),
-           gnome-panel-data (<< 2.10),
-           baobab
-Replaces: gdict,
-          gnome-admin (<= 1.0.3-2),
-          gnome-panel (<< 2.9),
-          gnome-panel-data (<< 2.9),
-          baobab
-Description: GNOME desktop utilities
- This package contains the following utilities for the GNOME desktop:
+         ${misc:Depends},
+         gnome-utils-common (>= ${gnome:Version}),
+         gnome-utils-common (<< ${gnome:NextVersion})
+Suggests: yelp
+Conflicts: gnome-utils (<< 2.30.0-2)
+Replaces: gnome-utils (<< 2.30.0-2)
+Description: GNOME disk usage analyzer
+ Disk Usage Analyzer is a graphical, menu-driven application to analyse 
+ disk usage in a GNOME environment. It can easily scan either the whole 
+ filesystem tree, or a specific user-requested directory branch (local or
+ remote).
  .
+ It also auto-detects in real-time any changes made to your home 
+ directory as far as any mounted/unmounted device. Disk Usage Analyzer 
+ also provides a full graphical treemap window for each selected folder.
+
+Package: gnome-dictionary
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gnome-utils-common (>= ${gnome:Version}),
+         gnome-utils-common (<< ${gnome:NextVersion})
+Suggests: yelp
+Provides: dict-client
+Conflicts: gnome-utils (<< 2.30.0-2)
+Replaces: gnome-utils (<< 2.30.0-2)
+Description: GNOME dictionary application
+ This program can look for the definition or translation of a word in 
+ existing databases over the Internet
+ .
+ It also contains a GNOME panel applet for that effect.
+
+Package: gnome-screenshot
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gnome-utils-common (>= ${gnome:Version}),
+         gnome-utils-common (<< ${gnome:NextVersion})
+Conflicts: gnome-utils (<< 2.30.0-2)
+Replaces: gnome-utils (<< 2.30.0-2)
+Description: screenshot application for GNOME
+ This tool takes a picture of the desktop or of a window and saves it 
+ into a file.
+
+Package: gnome-search-tool
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gnome-utils-common (>= ${gnome:Version}),
+         gnome-utils-common (<< ${gnome:NextVersion})
+Suggests: yelp
+Conflicts: gnome-utils (<< 2.30.0-2)
+Replaces: gnome-utils (<< 2.30.0-2)
+Description: GNOME tool to search files
+ This application can search for files in a given directory, matching 
+ their names or contents.
+ .
+ It doesn’t require any indexation tool, and as such is lightweight but 
+ slow.
+
+Package: gnome-system-log
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gnome-utils-common (>= ${gnome:Version}),
+         gnome-utils-common (<< ${gnome:NextVersion}),
+         gksu
+Suggests: yelp
+Conflicts: gnome-utils (<< 2.30.0-2)
+Replaces: gnome-utils (<< 2.30.0-2)
+Description: system log viewer for GNOME
+ This program displays system log files in a friendly way and allows to 
+ filter or search expressions in them.
+
+Package: gnome-utils
+Architecture: all
+Depends: ${misc:Depends},
+         baobab,
+         gnome-dictionary,
+         gnome-screenshot,
+         gnome-search-tool,
+         gnome-system-log
+Description: GNOME desktop utilities - transitional package
+ This dummy package depends on all the tools bundled the GNOME 
+ utilities:
   - baobab, a disk usage analyser
   - gnome-dictionary, a program which can look up the definition of words
     over the internet (including a panel applet to do the same)
@@ -85,3 +165,5 @@
   - gnome-system-log, a log viewing application
   - gnome-screenshot, a tool to take desktop screenshots and save them into
     a file
+ .
+ It can be safely removed from your system.

Modified: desktop/unstable/gnome-utils/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/control.in?rev=24552&op=diff
==============================================================================
--- desktop/unstable/gnome-utils/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-utils/debian/control.in [utf-8] Sat Jun 19 13:54:52 2010
@@ -5,22 +5,23 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs,
                debhelper (>= 5),
+               gnome-pkg-tools (>= 0.10),
+               autotools-dev,
                intltool (>= 0.40.0),
+               libxt-dev,
                libglib2.0-dev (>= 2.20.0),
+               libgconf2-dev,
                libgtk2.0-dev (>= 2.18.0),
-               libxt-dev,
                libpanel-applet2-dev (>= 2.13.4),
                libgtop2-dev (>= 2.12.0),
                libcanberra-gtk-dev (>= 0.4),
                x11proto-xext-dev,
+               libxext-dev,
                libx11-dev,
-               libgconf2-dev,
-               e2fslibs-dev,
-               scrollkeeper,
-               gnome-pkg-tools (>= 0.10),
+               zlib1g-dev,
+               rarian-compat,
+               gtk-doc-tools (>= 1.10),
                gnome-doc-utils (>= 0.3.2),
-               zlib1g-dev,
-               autotools-dev,
                libglib2.0-doc,
                libgtk2.0-doc
 Standards-Version: 3.8.3
@@ -28,15 +29,26 @@
 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: gnome-utils-common
+Architecture: all
+Section: libs
+Depends: ${misc:Depends}
+Conflicts: gnome-utils (<< 2.30.0-2)
+Replaces: gnome-utils (<< 2.30.0-2)
+Description: data files for the GNOME utilities
+ This package contains the translation files for the GNOME utilities 
+ bundle.
+
 Package: libgdict-1.0-6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
+         ${misc:Depends},
+         gnome-utils-common (>= ${gnome:Version}),
+         gnome-utils-common (<< ${gnome:NextVersion})
 Replaces: gnome-utils (<< 2.23.90-1)
 Conflicts: gnome-utils (<< 2.23.90-1)
-Description: GNOME Dictionary base library
- GNOME is the "GNU Network Object Model Environment".
+Description: GNOME Dictionary base library - runtime
  This package contains the library used by the GNOME dictionary
  utility, and other applications providing similar functionality.
 
@@ -45,34 +57,102 @@
 Architecture: any
 Depends: ${misc:Depends},
          libgdict-1.0-6 (= ${binary:Version}),
-         libgtk2.0-dev (>= 2.18.0)
+         libgtk2.0-dev (>= 2.18.0),
+         libglib2.0-dev (>= 2.20.0)
 Replaces: gnome-utils (<< 2.24.1-3)
 Description: GNOME Dictionary base library - development files
  This package contains the development files for a library used by the
  GNOME dictionary utility, and other applications providing similar
  functionality.
 
-Package: gnome-utils
+Package: baobab
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Recommends: gksu
-Suggests: yelp,
-          gcalctool
-Provides: gdict,
-          dict-client
-Conflicts: gdict,
-           gnome-panel (<< 2.10),
-           gnome-panel-data (<< 2.10),
-           baobab
-Replaces: gdict,
-          gnome-admin (<= 1.0.3-2),
-          gnome-panel (<< 2.9),
-          gnome-panel-data (<< 2.9),
-          baobab
-Description: GNOME desktop utilities
- This package contains the following utilities for the GNOME desktop:
+         ${misc:Depends},
+         gnome-utils-common (>= ${gnome:Version}),
+         gnome-utils-common (<< ${gnome:NextVersion})
+Suggests: yelp
+Conflicts: gnome-utils (<< 2.30.0-2)
+Replaces: gnome-utils (<< 2.30.0-2)
+Description: GNOME disk usage analyzer
+ Disk Usage Analyzer is a graphical, menu-driven application to analyse 
+ disk usage in a GNOME environment. It can easily scan either the whole 
+ filesystem tree, or a specific user-requested directory branch (local or
+ remote).
  .
+ It also auto-detects in real-time any changes made to your home 
+ directory as far as any mounted/unmounted device. Disk Usage Analyzer 
+ also provides a full graphical treemap window for each selected folder.
+
+Package: gnome-dictionary
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gnome-utils-common (>= ${gnome:Version}),
+         gnome-utils-common (<< ${gnome:NextVersion})
+Suggests: yelp
+Provides: dict-client
+Conflicts: gnome-utils (<< 2.30.0-2)
+Replaces: gnome-utils (<< 2.30.0-2)
+Description: GNOME dictionary application
+ This program can look for the definition or translation of a word in 
+ existing databases over the Internet
+ .
+ It also contains a GNOME panel applet for that effect.
+
+Package: gnome-screenshot
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gnome-utils-common (>= ${gnome:Version}),
+         gnome-utils-common (<< ${gnome:NextVersion})
+Conflicts: gnome-utils (<< 2.30.0-2)
+Replaces: gnome-utils (<< 2.30.0-2)
+Description: screenshot application for GNOME
+ This tool takes a picture of the desktop or of a window and saves it 
+ into a file.
+
+Package: gnome-search-tool
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gnome-utils-common (>= ${gnome:Version}),
+         gnome-utils-common (<< ${gnome:NextVersion})
+Suggests: yelp
+Conflicts: gnome-utils (<< 2.30.0-2)
+Replaces: gnome-utils (<< 2.30.0-2)
+Description: GNOME tool to search files
+ This application can search for files in a given directory, matching 
+ their names or contents.
+ .
+ It doesn’t require any indexation tool, and as such is lightweight but 
+ slow.
+
+Package: gnome-system-log
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gnome-utils-common (>= ${gnome:Version}),
+         gnome-utils-common (<< ${gnome:NextVersion}),
+         gksu
+Suggests: yelp
+Conflicts: gnome-utils (<< 2.30.0-2)
+Replaces: gnome-utils (<< 2.30.0-2)
+Description: system log viewer for GNOME
+ This program displays system log files in a friendly way and allows to 
+ filter or search expressions in them.
+
+Package: gnome-utils
+Architecture: all
+Depends: ${misc:Depends},
+         baobab,
+         gnome-dictionary,
+         gnome-screenshot,
+         gnome-search-tool,
+         gnome-system-log
+Description: GNOME desktop utilities - transitional package
+ This dummy package depends on all the tools bundled the GNOME 
+ utilities:
   - baobab, a disk usage analyser
   - gnome-dictionary, a program which can look up the definition of words
     over the internet (including a panel applet to do the same)
@@ -80,3 +160,5 @@
   - gnome-system-log, a log viewing application
   - gnome-screenshot, a tool to take desktop screenshots and save them into
     a file
+ .
+ It can be safely removed from your system.

Added: desktop/unstable/gnome-utils/debian/gnome-dictionary.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/gnome-dictionary.docs?rev=24552&op=file
==============================================================================
--- desktop/unstable/gnome-utils/debian/gnome-dictionary.docs (added)
+++ desktop/unstable/gnome-utils/debian/gnome-dictionary.docs [utf-8] Sat Jun 19 13:54:52 2010
@@ -1,0 +1,1 @@
+gnome-dictionary/README

Added: desktop/unstable/gnome-utils/debian/gnome-dictionary.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/gnome-dictionary.install?rev=24552&op=file
==============================================================================
--- desktop/unstable/gnome-utils/debian/gnome-dictionary.install (added)
+++ desktop/unstable/gnome-utils/debian/gnome-dictionary.install [utf-8] Sat Jun 19 13:54:52 2010
@@ -1,0 +1,11 @@
+debian/tmp/etc/gconf/schemas/gnome-dictionary.schemas
+debian/tmp/usr/bin/gnome-dictionary
+debian/tmp/usr/lib/gnome-utils
+debian/tmp/usr/lib/bonobo
+debian/tmp/usr/share/applications/gnome-dictionary.desktop
+debian/tmp/usr/share/gnome-2.0
+debian/tmp/usr/share/gnome-dictionary
+debian/tmp/usr/share/gnome/help/gnome-dictionary
+debian/tmp/usr/share/man/man1/gnome-dictionary.1
+debian/tmp/usr/share/omf/gnome-dictionary
+debian/pixmaps/gdict.xpm /usr/share/pixmaps

Added: desktop/unstable/gnome-utils/debian/gnome-dictionary.menu
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/gnome-dictionary.menu?rev=24552&op=file
==============================================================================
--- desktop/unstable/gnome-utils/debian/gnome-dictionary.menu (added)
+++ desktop/unstable/gnome-utils/debian/gnome-dictionary.menu [utf-8] Sat Jun 19 13:54:52 2010
@@ -1,0 +1,5 @@
+?package(gnome-dictionary):needs="X11" \
+  section="Applications/Text" \
+  title="GNOME Dictionary" command="/usr/bin/gnome-dictionary" \
+  icon="/usr/share/pixmaps/gdict.xpm" hints="Gnome"
+

Added: desktop/unstable/gnome-utils/debian/gnome-screenshot.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/gnome-screenshot.install?rev=24552&op=file
==============================================================================
--- desktop/unstable/gnome-utils/debian/gnome-screenshot.install (added)
+++ desktop/unstable/gnome-utils/debian/gnome-screenshot.install [utf-8] Sat Jun 19 13:54:52 2010
@@ -1,0 +1,5 @@
+debian/tmp/etc/gconf/schemas/gnome-screenshot.schemas
+debian/tmp/usr/bin/gnome*-screenshot
+debian/tmp/usr/share/applications/gnome-screenshot.desktop
+debian/tmp/usr/share/gnome-screenshot
+debian/tmp/usr/share/man/man1/gnome-screenshot.1

Added: desktop/unstable/gnome-utils/debian/gnome-screenshot.menu
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/gnome-screenshot.menu?rev=24552&op=file
==============================================================================
--- desktop/unstable/gnome-utils/debian/gnome-screenshot.menu (added)
+++ desktop/unstable/gnome-utils/debian/gnome-screenshot.menu [utf-8] Sat Jun 19 13:54:52 2010
@@ -1,0 +1,5 @@
+?package(gnome-screenshot):needs="X11" \
+  section="Applications/Graphics" \
+  title="GNOME Screenshot Tool" command="/usr/bin/gnome-panel-screenshot" \
+  hints="Gnome"
+

Added: desktop/unstable/gnome-utils/debian/gnome-search-tool.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/gnome-search-tool.install?rev=24552&op=file
==============================================================================
--- desktop/unstable/gnome-utils/debian/gnome-search-tool.install (added)
+++ desktop/unstable/gnome-utils/debian/gnome-search-tool.install [utf-8] Sat Jun 19 13:54:52 2010
@@ -1,0 +1,8 @@
+debian/tmp/etc/gconf/schemas/gnome-search-tool.schemas
+debian/tmp/usr/bin/gnome-search-tool
+debian/tmp/usr/share/applications/gnome-search-tool.desktop
+debian/tmp/usr/share/gnome/help/gnome-search-tool
+debian/tmp/usr/share/man/man1/gnome-search-tool.1
+debian/tmp/usr/share/omf/gnome-search-tool
+debian/tmp/usr/share/pixmaps/gsearchtool
+debian/pixmaps/gsearchtool.xpm /usr/share/pixmaps

Added: desktop/unstable/gnome-utils/debian/gnome-search-tool.menu
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/gnome-search-tool.menu?rev=24552&op=file
==============================================================================
--- desktop/unstable/gnome-utils/debian/gnome-search-tool.menu (added)
+++ desktop/unstable/gnome-utils/debian/gnome-search-tool.menu [utf-8] Sat Jun 19 13:54:52 2010
@@ -1,0 +1,5 @@
+?package(gnome-search-tool):needs="X11" \
+  section="Applications/File Management" \
+  title="GNOME Search Tool" command="/usr/bin/gnome-search-tool" \
+  icon="/usr/share/pixmaps/gsearchtool.xpm" hints="Gnome"
+

Added: desktop/unstable/gnome-utils/debian/gnome-system-log.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/gnome-system-log.install?rev=24552&op=file
==============================================================================
--- desktop/unstable/gnome-utils/debian/gnome-system-log.install (added)
+++ desktop/unstable/gnome-utils/debian/gnome-system-log.install [utf-8] Sat Jun 19 13:54:52 2010
@@ -1,0 +1,8 @@
+debian/tmp/etc/gconf/schemas/gnome-system-log.schemas
+debian/tmp/usr/bin/gnome-system-log
+debian/tmp/usr/share/applications/gnome-system-log.desktop
+debian/tmp/usr/share/gnome-utils
+debian/tmp/usr/share/gnome/help/gnome-system-log
+debian/tmp/usr/share/man/man1/gnome-system-log.1
+debian/tmp/usr/share/omf/gnome-system-log
+debian/pixmaps/gnome-system-log.xpm /usr/share/pixmaps

Added: desktop/unstable/gnome-utils/debian/gnome-system-log.menu
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/gnome-system-log.menu?rev=24552&op=file
==============================================================================
--- desktop/unstable/gnome-utils/debian/gnome-system-log.menu (added)
+++ desktop/unstable/gnome-utils/debian/gnome-system-log.menu [utf-8] Sat Jun 19 13:54:52 2010
@@ -1,0 +1,5 @@
+?package(gnome-system-log):needs="X11" \
+  section="Applications/System/Monitoring" \
+  title="GNOME Log Viewer" command="/usr/bin/gnome-system-log" \
+  icon="/usr/share/pixmaps/gnome-system-log.xpm" hints="Gnome,Monitoring"
+

Added: desktop/unstable/gnome-utils/debian/gnome-utils-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/gnome-utils-common.install?rev=24552&op=file
==============================================================================
--- desktop/unstable/gnome-utils/debian/gnome-utils-common.install (added)
+++ desktop/unstable/gnome-utils/debian/gnome-utils-common.install [utf-8] Sat Jun 19 13:54:52 2010
@@ -1,0 +1,2 @@
+debian/tmp/usr/share/gdict-1.0
+debian/tmp/usr/share/locale

Added: desktop/unstable/gnome-utils/debian/libgdict-1.0-6.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/libgdict-1.0-6.install?rev=24552&op=file
==============================================================================
--- desktop/unstable/gnome-utils/debian/libgdict-1.0-6.install (added)
+++ desktop/unstable/gnome-utils/debian/libgdict-1.0-6.install [utf-8] Sat Jun 19 13:54:52 2010
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/libgdict*.so.*

Added: desktop/unstable/gnome-utils/debian/libgdict-1.0-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/libgdict-1.0-dev.install?rev=24552&op=file
==============================================================================
--- desktop/unstable/gnome-utils/debian/libgdict-1.0-dev.install (added)
+++ desktop/unstable/gnome-utils/debian/libgdict-1.0-dev.install [utf-8] Sat Jun 19 13:54:52 2010
@@ -1,0 +1,5 @@
+debian/tmp/usr/include
+debian/tmp/usr/lib/*.so
+debian/tmp/usr/lib/*.a
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/share/gtk-doc

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=24552&op=diff
==============================================================================
--- desktop/unstable/gnome-utils/debian/patches/01_logview_gksu.patch [utf-8] (original)
+++ desktop/unstable/gnome-utils/debian/patches/01_logview_gksu.patch [utf-8] Sat Jun 19 13:54:52 2010
@@ -2,14 +2,15 @@
 
 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 @@
+Index: gnome-utils-2.30.0/logview/data/gnome-system-log.desktop.in.in
+===================================================================
+--- gnome-utils-2.30.0.orig/logview/data/gnome-system-log.desktop.in.in	2009-04-27 13:37:52.000000000 +0200
++++ gnome-utils-2.30.0/logview/data/gnome-system-log.desktop.in.in	2010-06-19 15:24:00.203243787 +0200
+@@ -1,11 +1,11 @@
  [Desktop Entry]
- _Name=System Log
+ _Name=Log File Viewer
  _Comment=View or monitor system log files
 -Exec=gnome-system-log
-+TryExec=gksu
 +Exec=gksu gnome-system-log
  Icon=logviewer
  Terminal=false

Added: desktop/unstable/gnome-utils/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/patches/series?rev=24552&op=file
==============================================================================
--- desktop/unstable/gnome-utils/debian/patches/series (added)
+++ desktop/unstable/gnome-utils/debian/patches/series [utf-8] Sat Jun 19 13:54:52 2010
@@ -1,0 +1,1 @@
+01_logview_gksu.patch

Modified: desktop/unstable/gnome-utils/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/rules?rev=24552&op=diff
==============================================================================
--- desktop/unstable/gnome-utils/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-utils/debian/rules [utf-8] Sat Jun 19 13:54:52 2010
@@ -1,97 +1,17 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
-
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-configure_flags += \
-		--prefix=/usr \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
-		--sysconfdir=/etc \
-		--libexecdir=\$${prefix}/lib/gnome-utils \
-		--enable-ipv6=yes \
-		--disable-scrollkeeper \
-		--build=$(DEB_BUILD_GNU_TYPE)
-
-ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-	configure_flags += --host=$(DEB_HOST_GNU_TYPE)
-endif
-
-config.status: configure
-	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure $(configure_flags)
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-	# Change DTD URL in documentation to the one on the local system, so
-	# the DTD is not fetched off the network
-	find -name "*.xml" -print0 | xargs -0 perl -i -pe 's/http:\/\/www.oasis-open.org\/docbook\/xml\/4.1.2\/docbookx.dtd/\/usr\/share\/sgml\/docbook\/dtd\/xml\/4.1.2\/docbookx.dtd/'
-	# Workaround for a broken .schemas file, see GNOME #599317
-	rm -f gsearchtool/gnome-search-tool.schemas
-	$(MAKE)
-	touch build-stamp
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-ipv6=yes \
+                             --disable-scrollkeeper \
+                             --enable-gdict-applet=yes
 
 clean::
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
-	-test -r /usr/share/misc/config.sub && test -r config.sub && \
-		cp -f /usr/share/misc/config.sub config.sub
-	-test -r /usr/share/misc/config.guess && test -r config.guess && \
-		cp -f /usr/share/misc/config.guess config.guess
 	rm -f po/.intltool-merge-cache
 	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
-	dh_testroot
-	dh_clean -k
-	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 $(MAKE) install DESTDIR=$(CURDIR)/debian/gnome-utils prefix=$(DESTDIR)/usr
-	# Remove scrollkeeper generated files. Re-created in postinst on user's
-	# system
-	-rm -rf $(CURDIR)/debian/gnome-utils/usr/var
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs ChangeLog
-	cp baobab/README debian/gnome-utils/usr/share/doc/gnome-utils/README.baobab
-	cp gnome-dictionary/README debian/gnome-utils/usr/share/doc/gnome-utils/README.gdict
-	dh_install
-	dh_installmenu
-	dh_installman
-	dh_movefiles --sourcedir=debian/gnome-utils
-	# remove empty directories from the gnome-utils package
-	rm -rf debian/gnome-utils/usr/include/ debian/gnome-utils/usr/lib/pkgconfig/
-	# drop useless libtool file
-	rm -f debian/libgdict-1.0-dev/usr/lib/*.la
-	dh_gconf
-	dh_makeshlibs
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

Added: desktop/unstable/gnome-utils/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-utils/debian/source/format?rev=24552&op=file
==============================================================================
--- desktop/unstable/gnome-utils/debian/source/format (added)
+++ desktop/unstable/gnome-utils/debian/source/format [utf-8] Sat Jun 19 13:54:52 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)




More information about the pkg-gnome-commits mailing list