r33038 - in /desktop/experimental/baobab/debian: ./ patches/ pixmaps/

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Mon Mar 12 22:38:33 UTC 2012


Author: biebl
Date: Mon Mar 12 22:38:33 2012
New Revision: 33038

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33038
Log:
* New upstream development release.
* gnome-utils has been split and baobab is a separate project now:
  - Rename the source package to baobab.
  - Drop non-baobab files, packages and build dependencies.
  - Stop using dh-autoreconf.
  - Bump Build-Depends on libglib2.0-dev and libgtk-3-dev.
  - Build-Depend on yelp-tools instead of gnome-doc-utils for the new
    Mallard-based help.

Removed:
    desktop/experimental/baobab/debian/docs
    desktop/experimental/baobab/debian/gnome-dictionary.install
    desktop/experimental/baobab/debian/gnome-dictionary.menu
    desktop/experimental/baobab/debian/gnome-font-viewer.install
    desktop/experimental/baobab/debian/gnome-screenshot.install
    desktop/experimental/baobab/debian/gnome-screenshot.links
    desktop/experimental/baobab/debian/gnome-screenshot.menu
    desktop/experimental/baobab/debian/gnome-search-tool.install
    desktop/experimental/baobab/debian/gnome-search-tool.menu
    desktop/experimental/baobab/debian/gnome-system-log.install
    desktop/experimental/baobab/debian/gnome-system-log.menu
    desktop/experimental/baobab/debian/gnome-utils-common.install
    desktop/experimental/baobab/debian/libgdict-1.0-6.install
    desktop/experimental/baobab/debian/libgdict-1.0-6.symbols
    desktop/experimental/baobab/debian/libgdict-1.0-dev.install
    desktop/experimental/baobab/debian/org.debian.pkexec.gnome-system-log.policy
    desktop/experimental/baobab/debian/patches/01_logview_gksu.patch
    desktop/experimental/baobab/debian/patches/10_no_disable_deprecated.patch
    desktop/experimental/baobab/debian/pixmaps/gdict.xpm
    desktop/experimental/baobab/debian/pixmaps/gnome-system-log.xpm
    desktop/experimental/baobab/debian/pixmaps/gsearchtool.xpm
Modified:
    desktop/experimental/baobab/debian/baobab.install
    desktop/experimental/baobab/debian/changelog
    desktop/experimental/baobab/debian/control
    desktop/experimental/baobab/debian/control.in
    desktop/experimental/baobab/debian/patches/series
    desktop/experimental/baobab/debian/rules
    desktop/experimental/baobab/debian/watch

Modified: desktop/experimental/baobab/debian/baobab.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/baobab/debian/baobab.install?rev=33038&op=diff
==============================================================================
--- desktop/experimental/baobab/debian/baobab.install [utf-8] (original)
+++ desktop/experimental/baobab/debian/baobab.install [utf-8] Mon Mar 12 22:38:33 2012
@@ -1,10 +1,1 @@
-usr/bin/baobab
-usr/share/applications/baobab.desktop
-usr/share/baobab
-usr/share/gnome/help/baobab
-usr/share/icons/hicolor
-usr/share/man/man1/baobab.1
-usr/share/omf/baobab
-usr/share/glib-2.0/schemas/org.gnome.baobab.gschema.xml
 debian/pixmaps/baobab.xpm /usr/share/pixmaps
-baobab/README /usr/share/doc/baobab

Modified: desktop/experimental/baobab/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/baobab/debian/changelog?rev=33038&op=diff
==============================================================================
--- desktop/experimental/baobab/debian/changelog [utf-8] (original)
+++ desktop/experimental/baobab/debian/changelog [utf-8] Mon Mar 12 22:38:33 2012
@@ -1,3 +1,16 @@
+baobab (3.3.3-1) UNRELEASED; urgency=low
+
+  * New upstream development release.
+  * gnome-utils has been split and baobab is a separate project now:
+    - Rename the source package to baobab.
+    - Drop non-baobab files, packages and build dependencies.
+    - Stop using dh-autoreconf.
+    - Bump Build-Depends on libglib2.0-dev and libgtk-3-dev.
+    - Build-Depend on yelp-tools instead of gnome-doc-utils for the new
+      Mallard-based help.
+
+ -- Michael Biebl <biebl at debian.org>  Mon, 12 Mar 2012 23:33:31 +0100
+
 gnome-utils (3.2.1-3) unstable; urgency=low
 
   [ Josselin Mouette ]

Modified: desktop/experimental/baobab/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/baobab/debian/control?rev=33038&op=diff
==============================================================================
--- desktop/experimental/baobab/debian/control [utf-8] (original)
+++ desktop/experimental/baobab/debian/control [utf-8] Mon Mar 12 22:38:33 2012
@@ -3,82 +3,29 @@
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
 
-Source: gnome-utils
+Source: baobab
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Jordi Mallach <jordi at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 8),
-               dh-autoreconf,
                gnome-pkg-tools (>= 0.10),
                autotools-dev,
                intltool (>= 0.40.0),
-               libxt-dev,
-               libglib2.0-dev (>= 2.29.14),
-               libgconf2-dev,
-               libgtk-3-dev (>= 3.0.3),
+               libglib2.0-dev (>= 2.30.0),
+               libgtk-3-dev (>= 3.0.0),
                libgtop2-dev (>= 2.12.0),
-               libcanberra-gtk3-dev (>= 0.26-3~),
-               x11proto-xext-dev,
-               libxext-dev,
-               libx11-dev,
-               zlib1g-dev,
-               rarian-compat,
-               gtk-doc-tools (>= 1.10),
-               gnome-doc-utils (>= 0.3.2),
-               libglib2.0-doc,
-               libgtk-3-doc,
-               gsettings-desktop-schemas-dev
-Standards-Version: 3.9.2
+               yelp-tools
+Standards-Version: 3.9.3
 Homepage: http://live.gnome.org/GnomeUtils
-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-utils/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-utils/
-
-Package: gnome-utils-common
-Architecture: all
-Section: libs
-Depends: ${misc:Depends}
-Breaks: 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},
-         gnome-utils-common (>= ${gnome:Version}),
-         gnome-utils-common (<< ${gnome:NextVersion})
-Replaces: gnome-utils (<< 2.23.90-1)
-Breaks: gnome-utils (<< 2.23.90-1),
-        gnome-dictionary (<< 3.0.0),
-        gtranslator (<< 2.90.0)
-Description: GNOME Dictionary base library - runtime
- This package contains the library used by the GNOME dictionary
- utility, and other applications providing similar functionality.
-
-Package: libgdict-1.0-dev
-Section: libdevel
-Architecture: any
-Depends: ${misc:Depends},
-         libgdict-1.0-6 (= ${binary:Version}),
-         libgtk-3-dev (>= 3.0.3),
-         libglib2.0-dev (>= 2.29.14)
-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.
+Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/baobab
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/baobab
 
 Package: baobab
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         gnome-utils-common (>= ${gnome:Version}),
-         gnome-utils-common (<< ${gnome:NextVersion})
+         ${misc:Depends}
 Suggests: yelp
 Breaks: gnome-utils (<< 2.30.0-2)
 Replaces: gnome-utils (<< 2.30.0-2)
@@ -91,96 +38,3 @@
  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
-Breaks: 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}),
-         nautilus (>= 3.0)
-Breaks: 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
-Breaks: 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}),
-         policykit-1
-Suggests: yelp
-Breaks: 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 one to
- filter or search expressions in them.
-
-Package: gnome-font-viewer
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         gnome-utils-common (>= ${gnome:Version}),
-         gnome-utils-common (<< ${gnome:NextVersion})
-Breaks: gnome-control-center (<< 1:3.0.0), capplets-data (<< 1:3.0.0)
-Replaces: gnome-control-center (<< 1:3.0.0), capplets-data (<< 1:3.0.0)
-Description: font viewer for GNOME
- This program can preview fonts and create thumbnails for fonts.
-
-Package: gnome-utils
-Architecture: all
-Depends: ${misc:Depends},
-         baobab,
-         gnome-dictionary,
-         gnome-screenshot,
-         gnome-search-tool,
-         gnome-system-log,
-         gnome-font-viewer
-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
-  - gnome-search-tool, with which one can find files by name or content
-  - gnome-system-log, a log viewing application
-  - gnome-screenshot, a tool to take desktop screenshots and save them into
-    a file
-  - gnome-font-viewer, a tool to preview fonts
- .
- It can be safely removed from your system.

Modified: desktop/experimental/baobab/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/baobab/debian/control.in?rev=33038&op=diff
==============================================================================
--- desktop/experimental/baobab/debian/control.in [utf-8] (original)
+++ desktop/experimental/baobab/debian/control.in [utf-8] Mon Mar 12 22:38:33 2012
@@ -1,79 +1,26 @@
-Source: gnome-utils
+Source: baobab
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs,
                debhelper (>= 8),
-               dh-autoreconf,
                gnome-pkg-tools (>= 0.10),
                autotools-dev,
                intltool (>= 0.40.0),
-               libxt-dev,
-               libglib2.0-dev (>= 2.29.14),
-               libgconf2-dev,
-               libgtk-3-dev (>= 3.0.3),
+               libglib2.0-dev (>= 2.30.0),
+               libgtk-3-dev (>= 3.3),
                libgtop2-dev (>= 2.12.0),
-               libcanberra-gtk3-dev (>= 0.26-3~),
-               x11proto-xext-dev,
-               libxext-dev,
-               libx11-dev,
-               zlib1g-dev,
-               rarian-compat,
-               gtk-doc-tools (>= 1.10),
-               gnome-doc-utils (>= 0.3.2),
-               libglib2.0-doc,
-               libgtk-3-doc,
-               gsettings-desktop-schemas-dev
-Standards-Version: 3.9.2
+               yelp-tools
+Standards-Version: 3.9.3
 Homepage: http://live.gnome.org/GnomeUtils
-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-utils/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-utils/
-
-Package: gnome-utils-common
-Architecture: all
-Section: libs
-Depends: ${misc:Depends}
-Breaks: 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},
-         gnome-utils-common (>= ${gnome:Version}),
-         gnome-utils-common (<< ${gnome:NextVersion})
-Replaces: gnome-utils (<< 2.23.90-1)
-Breaks: gnome-utils (<< 2.23.90-1),
-        gnome-dictionary (<< 3.0.0),
-        gtranslator (<< 2.90.0)
-Description: GNOME Dictionary base library - runtime
- This package contains the library used by the GNOME dictionary
- utility, and other applications providing similar functionality.
-
-Package: libgdict-1.0-dev
-Section: libdevel
-Architecture: any
-Depends: ${misc:Depends},
-         libgdict-1.0-6 (= ${binary:Version}),
-         libgtk-3-dev (>= 3.0.3),
-         libglib2.0-dev (>= 2.29.14)
-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.
+Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/baobab
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/baobab
 
 Package: baobab
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         gnome-utils-common (>= ${gnome:Version}),
-         gnome-utils-common (<< ${gnome:NextVersion})
+         ${misc:Depends}
 Suggests: yelp
 Breaks: gnome-utils (<< 2.30.0-2)
 Replaces: gnome-utils (<< 2.30.0-2)
@@ -86,96 +33,3 @@
  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
-Breaks: 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}),
-         nautilus (>= 3.0)
-Breaks: 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
-Breaks: 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}),
-         policykit-1
-Suggests: yelp
-Breaks: 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 one to
- filter or search expressions in them.
-
-Package: gnome-font-viewer
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         gnome-utils-common (>= ${gnome:Version}),
-         gnome-utils-common (<< ${gnome:NextVersion})
-Breaks: gnome-control-center (<< 1:3.0.0), capplets-data (<< 1:3.0.0)
-Replaces: gnome-control-center (<< 1:3.0.0), capplets-data (<< 1:3.0.0)
-Description: font viewer for GNOME
- This program can preview fonts and create thumbnails for fonts.
-
-Package: gnome-utils
-Architecture: all
-Depends: ${misc:Depends},
-         baobab,
-         gnome-dictionary,
-         gnome-screenshot,
-         gnome-search-tool,
-         gnome-system-log,
-         gnome-font-viewer
-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
-  - gnome-search-tool, with which one can find files by name or content
-  - gnome-system-log, a log viewing application
-  - gnome-screenshot, a tool to take desktop screenshots and save them into
-    a file
-  - gnome-font-viewer, a tool to preview fonts
- .
- It can be safely removed from your system.

Modified: desktop/experimental/baobab/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/baobab/debian/patches/series?rev=33038&op=diff
==============================================================================
--- desktop/experimental/baobab/debian/patches/series [utf-8] (original)
+++ desktop/experimental/baobab/debian/patches/series [utf-8] Mon Mar 12 22:38:33 2012
@@ -1,2 +1,0 @@
-01_logview_gksu.patch
-10_no_disable_deprecated.patch

Modified: desktop/experimental/baobab/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/baobab/debian/rules?rev=33038&op=diff
==============================================================================
--- desktop/experimental/baobab/debian/rules [utf-8] (original)
+++ desktop/experimental/baobab/debian/rules [utf-8] Mon Mar 12 22:38:33 2012
@@ -1,21 +1,8 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/autoreconf.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
-
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-ipv6=yes \
-                             --disable-scrollkeeper
-
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-
-DEB_DH_MAKESHLIBS_ARGS_libgdict-1.0-6 += -- -c4
-
-clean::
-	rm -f po/.intltool-merge-cache
-	rm -f intltool-extract intltool-merge intltool-update
-	find . -name "*.omf.out" -exec rm -f {} \;

Modified: desktop/experimental/baobab/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/baobab/debian/watch?rev=33038&op=diff
==============================================================================
--- desktop/experimental/baobab/debian/watch [utf-8] (original)
+++ desktop/experimental/baobab/debian/watch [utf-8] Mon Mar 12 22:38:33 2012
@@ -1,3 +1,3 @@
 version=3
-http://download.gnome.org/sources/gnome-utils/([\d\.]+[02468])/ \
-	gnome-utils-(.*)\.tar\.xz
+http://download.gnome.org/sources/gnome-utils/([\d\.])/ \
+	baobab-(.*)\.tar\.xz




More information about the pkg-gnome-commits mailing list