r33058 - in /desktop/experimental/gnome-system-log/debian: ./ patches/ pixmaps/
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Mon Mar 12 23:47:23 UTC 2012
Author: biebl
Date: Mon Mar 12 23:47:22 2012
New Revision: 33058
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33058
Log:
* Drop non-gnome-system-log files, packages and build dependencies.
* Update watch file and Vcs-* URLs.
* Stop using dh-autoreconf.
* Bump Build-Depends on libglib2.0-dev to (>= 2.31.0).
* Update watch file.
Removed:
desktop/experimental/gnome-system-log/debian/baobab.install
desktop/experimental/gnome-system-log/debian/baobab.menu
desktop/experimental/gnome-system-log/debian/docs
desktop/experimental/gnome-system-log/debian/gnome-dictionary.install
desktop/experimental/gnome-system-log/debian/gnome-dictionary.menu
desktop/experimental/gnome-system-log/debian/gnome-font-viewer.install
desktop/experimental/gnome-system-log/debian/gnome-screenshot.install
desktop/experimental/gnome-system-log/debian/gnome-screenshot.links
desktop/experimental/gnome-system-log/debian/gnome-screenshot.menu
desktop/experimental/gnome-system-log/debian/gnome-search-tool.install
desktop/experimental/gnome-system-log/debian/gnome-search-tool.menu
desktop/experimental/gnome-system-log/debian/gnome-system-log.menu
desktop/experimental/gnome-system-log/debian/gnome-utils-common.install
desktop/experimental/gnome-system-log/debian/libgdict-1.0-6.install
desktop/experimental/gnome-system-log/debian/libgdict-1.0-6.symbols
desktop/experimental/gnome-system-log/debian/libgdict-1.0-dev.install
desktop/experimental/gnome-system-log/debian/patches/10_no_disable_deprecated.patch
desktop/experimental/gnome-system-log/debian/pixmaps/
Modified:
desktop/experimental/gnome-system-log/debian/changelog
desktop/experimental/gnome-system-log/debian/control
desktop/experimental/gnome-system-log/debian/control.in
desktop/experimental/gnome-system-log/debian/gnome-system-log.install
desktop/experimental/gnome-system-log/debian/patches/01_logview_gksu.patch
desktop/experimental/gnome-system-log/debian/patches/series
desktop/experimental/gnome-system-log/debian/rules
desktop/experimental/gnome-system-log/debian/watch
Modified: desktop/experimental/gnome-system-log/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-system-log/debian/changelog?rev=33058&op=diff
==============================================================================
--- desktop/experimental/gnome-system-log/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-system-log/debian/changelog [utf-8] Mon Mar 12 23:47:22 2012
@@ -3,6 +3,11 @@
* New upstream development release.
* gnome-utils has been split and gnome-system-log is a separate project now.
* Rename the source package to gnome-system-log.
+ * Drop non-gnome-system-log files, packages and build dependencies.
+ * Update watch file and Vcs-* URLs.
+ * Stop using dh-autoreconf.
+ * Bump Build-Depends on libglib2.0-dev to (>= 2.31.0).
+ * Update watch file.
-- Michael Biebl <biebl at debian.org> Tue, 13 Mar 2012 00:29:24 +0100
Modified: desktop/experimental/gnome-system-log/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-system-log/debian/control?rev=33058&op=diff
==============================================================================
--- desktop/experimental/gnome-system-log/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-system-log/debian/control [utf-8] Mon Mar 12 23:47:22 2012
@@ -10,139 +10,23 @@
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),
- libgtop2-dev (>= 2.12.0),
- libcanberra-gtk3-dev (>= 0.26-3~),
- x11proto-xext-dev,
- libxext-dev,
- libx11-dev,
+ libglib2.0-dev (>= 2.31.0),
+ libgtk-3-dev (>= 3.0.0),
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
+ gnome-doc-utils (>= 0.3.2)
Standards-Version: 3.9.2
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.
-
-Package: baobab
-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 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
-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.
+Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-system-log
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-system-log
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)
@@ -150,37 +34,3 @@
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/gnome-system-log/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-system-log/debian/control.in?rev=33058&op=diff
==============================================================================
--- desktop/experimental/gnome-system-log/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-system-log/debian/control.in [utf-8] Mon Mar 12 23:47:22 2012
@@ -5,139 +5,23 @@
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),
- libgtop2-dev (>= 2.12.0),
- libcanberra-gtk3-dev (>= 0.26-3~),
- x11proto-xext-dev,
- libxext-dev,
- libx11-dev,
+ libglib2.0-dev (>= 2.31.0),
+ libgtk-3-dev (>= 3.0.0),
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
+ gnome-doc-utils (>= 0.3.2)
Standards-Version: 3.9.2
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.
-
-Package: baobab
-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 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
-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.
+Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-system-log
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-system-log
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)
@@ -145,37 +29,3 @@
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/gnome-system-log/debian/gnome-system-log.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-system-log/debian/gnome-system-log.install?rev=33058&op=diff
==============================================================================
--- desktop/experimental/gnome-system-log/debian/gnome-system-log.install [utf-8] (original)
+++ desktop/experimental/gnome-system-log/debian/gnome-system-log.install [utf-8] Mon Mar 12 23:47:22 2012
@@ -1,10 +1,1 @@
-usr/bin/gnome-system-log
-usr/share/applications/gnome-system-log.desktop
-usr/share/gnome-utils
-usr/share/gnome/help/gnome-system-log
-usr/share/man/man1/gnome-system-log.1
-usr/share/omf/gnome-system-log
-usr/share/glib-2.0/schemas/org.gnome.gnome-system-log.gschema.xml
-usr/share/GConf/gsettings/logview.convert
-debian/pixmaps/gnome-system-log.xpm /usr/share/pixmaps
debian/org.debian.pkexec.gnome-system-log.policy /usr/share/polkit-1/actions
Modified: desktop/experimental/gnome-system-log/debian/patches/01_logview_gksu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-system-log/debian/patches/01_logview_gksu.patch?rev=33058&op=diff
==============================================================================
--- desktop/experimental/gnome-system-log/debian/patches/01_logview_gksu.patch [utf-8] (original)
+++ desktop/experimental/gnome-system-log/debian/patches/01_logview_gksu.patch [utf-8] Mon Mar 12 23:47:22 2012
@@ -1,9 +1,10 @@
Bug: http://bugzilla.gnome.org/show_bug.cgi?id=126051
This will be obsolete if/when upstream has PolicyKit integration
-diff -uNr gnome-utils-3.0.0.orig/logview/data/gnome-system-log.desktop.in.in gnome-utils-3.0.0/logview/data/gnome-system-log.desktop.in.in
---- gnome-utils-3.0.0.orig/logview/data/gnome-system-log.desktop.in.in 2011-03-16 11:46:32.000000000 -0400
-+++ gnome-utils-3.0.0/logview/data/gnome-system-log.desktop.in.in 2011-04-12 08:33:11.509476222 -0400
+Index: gnome-system-log-3.3.1/data/gnome-system-log.desktop.in.in
+===================================================================
+--- gnome-system-log-3.3.1.orig/data/gnome-system-log.desktop.in.in 2011-10-04 17:13:20.000000000 +0200
++++ gnome-system-log-3.3.1/data/gnome-system-log.desktop.in.in 2012-03-13 00:40:30.111656072 +0100
@@ -1,11 +1,11 @@
[Desktop Entry]
_Name=Log File Viewer
Modified: desktop/experimental/gnome-system-log/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-system-log/debian/patches/series?rev=33058&op=diff
==============================================================================
--- desktop/experimental/gnome-system-log/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-system-log/debian/patches/series [utf-8] Mon Mar 12 23:47:22 2012
@@ -1,2 +1,1 @@
01_logview_gksu.patch
-10_no_disable_deprecated.patch
Modified: desktop/experimental/gnome-system-log/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-system-log/debian/rules?rev=33058&op=diff
==============================================================================
--- desktop/experimental/gnome-system-log/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-system-log/debian/rules [utf-8] Mon Mar 12 23:47:22 2012
@@ -1,6 +1,5 @@
#!/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
@@ -8,14 +7,4 @@
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 {} \;
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-zlib
Modified: desktop/experimental/gnome-system-log/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-system-log/debian/watch?rev=33058&op=diff
==============================================================================
--- desktop/experimental/gnome-system-log/debian/watch [utf-8] (original)
+++ desktop/experimental/gnome-system-log/debian/watch [utf-8] Mon Mar 12 23:47:22 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-system-log/([\d\.]+)/ \
+ gnome-system-log-(.*)\.tar\.xz
More information about the pkg-gnome-commits
mailing list