Changeset 6070

Timestamp:

11/30/09 01:21:20 (3 years ago)

Author:

alanbach-guest

Message:

• Sync'd with Debian 0.9.13-1

Location:

pkg/frankie/main/gnome-main-menu/trunk/debian

Files:

• README.source (added)
• changelog (modified) (2 diffs)
• compat (modified) (1 diff)
• control (modified) (2 diffs)
• control.in (added)
• copyright (modified) (1 diff)
• gnome-main-menu.install (deleted)
• libslab-dev.install (deleted)
• libslab0.install (deleted)
• patches/01_fix_menu_path.patch (deleted)
• patches/03_fix_upgrade_packages.patch (deleted)
• patches/04_link_statically.patch (deleted)
• patches/05_binary_locations (deleted)
• patches/06_fix_applet_conf_file.patch (deleted)
• patches/08_add_place_menu.patch (deleted)
• patches/09_double_text.patch (deleted)
• patches/10_default_commands.patch (deleted)
• patches/11_fix_control_center.patch (deleted)
• patches/default-applications.diff (added)
• patches/fix-trigger-panel-run-dialog.diff (added)
• patches/gnome-session-kill.diff (added)
• patches/ltmain-as-needed.diff (added)
• patches/non-linux.diff (added)
• patches/series (added)
• rules (modified) (1 diff)
• watch (added)

pkg/frankie/main/gnome-main-menu/trunk/debian/changelog

@@ -1 @@
-gnome-main-menu (0.9.8.svn.20070430-1.3) unstable; urgency=low
+gnome-main-menu (0.9.13-parsix1) unstable; urgency=low
 
-  * Do not suggest gnome-app-install
+  * Sync'd with Debian 0.9.13-1
 
- -- Alan Baghumian <alan@technotux.org>  Mon, 03 Nov 2008 20:54:00 -0800
+ -- Alan Baghumian <alan@memphis-mobile>  Sun, 29 Nov 2009 16:20:47 -0800
 
-gnome-main-menu (0.9.8.svn.20070430-1.2) unstable; urgency=low
+gnome-main-menu (0.9.13-1) unstable; urgency=low
 
-  * Rebuild against new gtk and libgnome-desktop-dev
+  [ Julian Andres Klode ]
+  * New upstream release (LP: #428860), uses external libslab.
+  * Build-Depend on libunique-dev.
+  * Drop fix-gnomeui.diff, fixed upstream.
+  * Drop autoreconf.diff and run autoreconf at build-time.
+  * Add the pkg-gnome team stuff.
 
- -- Alan Baghumian <alan@technotux.org>  Mon, 03 Nov 2008 12:27:43 -0800
+  [ Emilio Pozuelo Monfort ]
+  * Upload to unstable.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Sun, 08 Nov 2009 21:22:49 +0100
+
+gnome-main-menu (0.9.12-4) unstable; urgency=low
+
+  * Fix building on non-Linux architectures (Closes: #542628)
+  * Switch packaging from CDBS to debhelper 7.
+  * Update Standards-Version to 3.8.3
+  * debian/copyright: Update to DEP-5 draft format.
+
+ -- Julian Andres Klode <jak@debian.org>  Thu, 20 Aug 2009 21:45:47 +0200
+
+gnome-main-menu (0.9.12-3) unstable; urgency=low
+
+  * Disable gnome-session-kill.diff, supported in unstable.
+  * fix-gnomeui.diff: Fix missing gnome-ui-init.h includes (Closes: #532371)
+
+ -- Julian Andres Klode <jak@debian.org>  Tue, 09 Jun 2009 17:00:31 +0200
+
+gnome-main-menu (0.9.12-2) unstable; urgency=low
+
+  * Remake Build-Depends using configure.in checks, fixes building on s390.
+  * Build with -Wl,--as-needed
+
+ -- Julian Andres Klode <jak@debian.org>  Tue, 07 Apr 2009 20:06:41 +0200
+
+gnome-main-menu (0.9.12-1) unstable; urgency=low
+
+  * New upstream release (Closes: #459324)
+    - Uses NetworkManager 0.7 (Closes: #515968)
+  * Take over maintenance of the package
+  * Acknowledge NMU (Closes: #443021)
+  * debian/watch: Add
+  * Add new patches
+    - default-applications.diff: Replace Novell's default applications
+      with the ones we ship.
+    - fix-trigger-panel-run-dialog.diff: We install the binary in
+      /usr/lib/gnome-main-menu, adjust path
+    - gnome-session-kill.diff: Use gnome-session-save --kill instead of
+      not-yet-supported-in-Debian options (like --logout-dialog)
+  * Update Standards-Version to 3.8.1, add README.source
+
+ -- Julian Andres Klode <jak@debian.org>  Tue, 07 Apr 2009 16:55:46 +0200
 
 gnome-main-menu (0.9.8.svn.20070430-1.1) unstable; urgency=low
@@ -64 +113 @@
     - 03_fix_upgrade_packages.patch
     - 11_fix_control_center.patch
-  * Added libslab0 and libslab-dev packages. 
+  * Added libslab0 and libslab-dev packages.
 
  -- Riccardo Setti <giskard@debian.org>  Tue, 12 Dec 2006 21:32:53 +0100

pkg/frankie/main/gnome-main-menu/trunk/debian/compat

@@ -1 @@
-5
+7

pkg/frankie/main/gnome-main-menu/trunk/debian/control

@@ -2 +2 @@
 Section: gnome
 Priority: optional
-Maintainer: Riccardo Setti <giskard@debian.org>
-Uploaders: Clément Stenac <zorglub@debian.org>
-Build-Depends: debhelper (>= 5), cdbs, quilt, autotools-dev, libgnome-desktop-dev, libpanel-applet2-dev, libgtop2-dev, libdbus-glib-1-dev ,network-manager-dev, libhal-storage-dev, libiw-dev, libgnome-menu-dev, libavahi-core-dev, gtk-doc-tools, librsvg2-dev, libnm-util-dev
-Standards-Version: 3.7.2
+Maintainer: Julian Andres Klode <jak@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>
+Build-Depends: debhelper (>= 7.0.50~),
+               quilt,
+               autotools-dev,
+               automake,
+               autoconf,
+               libtool,
+               gtk-doc-tools,
+               intltool,
+               gnome-pkg-tools,
+               libcairo2-dev,
+               libdbus-glib-1-dev,
+               libgconf2-dev,
+               libglade2-dev,
+               libgnome2-dev,
+               libgnome-desktop-dev,
+               libgnome-menu-dev,
+               libgnomeui-dev,
+               libgtop2-dev,
+               libhal-storage-dev,
+               libiw-dev | not+linux-gnu,
+               libnm-glib-dev (>= 0.7) | not+linux-gnu,
+               libnm-util-dev (>= 0.7) | not+linux-gnu,
+               libpanel-applet2-dev,
+               libpango1.0-dev,
+               librsvg2-dev,
+               libunique-dev,
+               libslab-dev (>= 2.27)
+Standards-Version: 3.8.3
 
 Package: gnome-main-menu
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-menus, debconf
-Suggests: network-manager-gnome, beagle, synaptic 
+Suggests: network-manager-gnome, beagle, synaptic | gnome-app-install
 Description: GNOME start menu applet
  This applet provides a "start menu" for the GNOME desktop.
@@ -20 +46 @@
  administration actions and integrates with network-manager for network
  status reporting.
-
-Package: libslab0
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}
-Description: beautification app library file
- This applet provides a "start menu" for the GNOME desktop.
- .
- It features a list of favorite applications, and recently used documents.
- .
- It also integrates with the Beagle search tool to provide search facilities
- from the start menu. It provides shortcuts for common system
- administration actions and integrates with network-manager for network
- status reporting.
- .
- This package contains shared libraries.
-
-Package: libslab-dev
-Architecture: any
-Section: libdevel
-Depends: libslab0 (= ${binary:Version}), libglib2.0-dev, libgtk2.0-dev, libgnome-desktop-dev, librsvg2-dev, libgnome-menu-dev, libpango1.0-dev
-Description: development file for libslab0
- This applet provides a "start menu" for the GNOME desktop.
- .
- It features a list of favorite applications, and recently used documents.
- .
- It also integrates with the Beagle search tool to provide search facilities
- from the start menu. It provides shortcuts for common system
- administration actions and integrates with network-manager for network
- status reporting.
- .
- This package contains header and development files.
-

pkg/frankie/main/gnome-main-menu/trunk/debian/copyright

@@ -1 @@
-This package was debianized by Riccardo Setti <giskard@debian.org> on
-Wed, 23 Aug 2006 14:02:08 +0200.
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=59
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-main-menu/
 
-It was downloaded from cvs.gnome.org
+Files: *
+Copyright: © 2006-2007 Novell, Inc
+License: GPL-2+
 
-Upstream Authors:       Dan Winship    <danw@novell.com>
-                        Jim Krehl      <jimmyk@novell.com>
-                        JP Rosevear    <jpr@novell.com>
-                        Scott Reeves   <sreeves@novell.com>
+Files: nautilus-main-menu/main-menu.c, nautilus-main-menu/nautilus-main-menu.h
+Copyright: © 2004-2005 Free Software Foundation, Inc.
+License: GPL-2+
 
-Copyright: Copyright (c) 2006 Novell, Inc.
+Files: main-menu/src/eggaccelerators.[ch]
+Copyright: © 2002 Red Hat, Inc.
+           © 1998, 2001 Tim Janik
+           © 2006 Novell, Inc
+License: LGPL-2+
 
-License:
-The software is released under the terms of the GNU GENERAL PUBLIC LICENSE
-version 2, see `/usr/share/common-licenses/GPL'.
+Files: debian/*
+Copyright: © 2006 Riccardo Setti <giskard@debian.org>
+           © 2009 Julian Andres Klode <jak@debian.org>
+License: GPL-2+
 
-The libslab, libtile and libutils are released under the terms of the
-GNU Lesser General Public License version 2 or later, see
-`/usr/share/common-licenses/LGPL`
+License: GPL-2+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-The Debian packaging is (C) 2006, Riccardo Setti <giskard@debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+  .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2'.

pkg/frankie/main/gnome-main-menu/trunk/debian/rules

@@ -1 +1 @@
 #!/usr/bin/make -f
+export LDFLAGS += -Wl,--as-needed
+export DEB_BUILD_OPTIONS += nocheck
 
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS += --with-gconf-schema-file-dir=/usr/share/gconf/schemas --libexecdir=/usr/lib/gnome-main-menu --bindir=/usr/lib/gnome-main-menu
+%:
+        dh --with quilt $@
 
+
+override_dh_auto_clean:
+        dh_auto_clean
+
+        # Cleanup
+        find -type d -name autom4te.cache -print0 | xargs -0 -r rm -rf \;
+        find -type d -name build -print0 | xargs -0 -r rm -rf \;
+        find -type f -name Makefile.in -print0 | xargs -0 -r rm -f \;
+        rm -f configure config.sub config.guess aclocal.m4 config.h.in
+
+clean::
+        dh $@
+
+override_dh_auto_configure:
+        ln -s /usr/share/misc/config.sub .
+        ln -s /usr/share/misc/config.guess .
+        autoreconf
+        dh_auto_configure -- --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
+                             --libexecdir=/usr/lib/gnome-main-menu \
+                             --bindir=/usr/lib/gnome-main-menu