r26162 - in /desktop/experimental/glade-3/debian: ./ patches/ source/
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Fri Jan 7 18:52:47 UTC 2011
Author: pochu
Date: Fri Jan 7 18:52:38 2011
New Revision: 26162
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26162
Log:
* New upstream release.
+ debian/control.in:
- Update build dependencies.
- Standards-Version is 3.9.1, no changes needed.
+ Rename libgladeui* packages for the new SONAME.
+ Add a libglade-common package for the translations/icons.
+ glade-gnome package is gone.
+ debian/glade.menu:
- The binary is now /usr/bin/glade.
+ 02-data-glade.desktop.in.in-Execute-glade-since-that-s-.patch:
- Patch from git master, execute 'glade' instead of 'glade-3'.
+ debian/patches/*:
- Refreshed.
+ debian/copyright:
- Updated.
+ debian/rules,
debian/source/format,
debian/patches:
+ Switch to source format 3.0 (quilt).
Added:
desktop/experimental/glade-3/debian/glade.1
- copied, changed from r26111, desktop/experimental/glade-3/debian/glade-3.1
desktop/experimental/glade-3/debian/libgladeui-2-0.install
- copied, changed from r25595, desktop/experimental/glade-3/debian/libgladeui-1-9.install
desktop/experimental/glade-3/debian/libgladeui-common.install
desktop/experimental/glade-3/debian/libgladeui-dev.install
- copied, changed from r26111, desktop/experimental/glade-3/debian/libgladeui-1-dev.install
desktop/experimental/glade-3/debian/libgladeui-doc.install
desktop/experimental/glade-3/debian/libgladeui-doc.links
- copied, changed from r25595, desktop/experimental/glade-3/debian/libgladeui-1-dev.links
desktop/experimental/glade-3/debian/patches/02-data-glade.desktop.in.in-Execute-glade-since-that-s-.patch
desktop/experimental/glade-3/debian/patches/series
desktop/experimental/glade-3/debian/source/
desktop/experimental/glade-3/debian/source/format
Removed:
desktop/experimental/glade-3/debian/glade-3.1
desktop/experimental/glade-3/debian/glade-gnome.install
desktop/experimental/glade-3/debian/glade.links
desktop/experimental/glade-3/debian/libgladeui-1-9.install
desktop/experimental/glade-3/debian/libgladeui-1-dev.install
desktop/experimental/glade-3/debian/libgladeui-1-dev.links
Modified:
desktop/experimental/glade-3/debian/changelog
desktop/experimental/glade-3/debian/control
desktop/experimental/glade-3/debian/control.in
desktop/experimental/glade-3/debian/copyright
desktop/experimental/glade-3/debian/glade.manpages
desktop/experimental/glade-3/debian/glade.menu
desktop/experimental/glade-3/debian/patches/01_gladeui-types.patch
desktop/experimental/glade-3/debian/patches/99_ltmain_as-needed.patch
desktop/experimental/glade-3/debian/rules
desktop/experimental/glade-3/debian/watch
Modified: desktop/experimental/glade-3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/changelog?rev=26162&op=diff
==============================================================================
--- desktop/experimental/glade-3/debian/changelog [utf-8] (original)
+++ desktop/experimental/glade-3/debian/changelog [utf-8] Fri Jan 7 18:52:38 2011
@@ -1,6 +1,28 @@
-glade-3 (3.6.7-2) UNRELEASED; urgency=low
-
+glade-3 (3.9.0-1) UNRELEASED; urgency=low
+
+ [ Josselin Mouette ]
* Add symlink for the glade manpage, too. Closes: #545820.
+
+ [ Emilio Pozuelo Monfort ]
+ * New upstream release.
+ + debian/control.in:
+ - Update build dependencies.
+ - Standards-Version is 3.9.1, no changes needed.
+ + Rename libgladeui* packages for the new SONAME.
+ + Add a libglade-common package for the translations/icons.
+ + glade-gnome package is gone.
+ + debian/glade.menu:
+ - The binary is now /usr/bin/glade.
+ + 02-data-glade.desktop.in.in-Execute-glade-since-that-s-.patch:
+ - Patch from git master, execute 'glade' instead of 'glade-3'.
+ + debian/patches/*:
+ - Refreshed.
+ + debian/copyright:
+ - Updated.
+ + debian/rules,
+ debian/source/format,
+ debian/patches:
+ + Switch to source format 3.0 (quilt).
-- Josselin Mouette <joss at debian.org> Wed, 09 Sep 2009 16:19:07 +0200
Modified: desktop/experimental/glade-3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/control?rev=26162&op=diff
==============================================================================
--- desktop/experimental/glade-3/debian/control [utf-8] (original)
+++ desktop/experimental/glade-3/debian/control [utf-8] Fri Jan 7 18:52:38 2011
@@ -1,3 +1,8 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
Source: glade-3
Section: gnome
Priority: optional
@@ -7,47 +12,28 @@
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/glade-3
Build-Depends: cdbs (>= 0.4.41),
debhelper (>= 5),
- gettext (>= 0.10.40),
- libgnomeui-dev,
- scrollkeeper,
+ gnome-pkg-tools (>= 0.10),
libxml2-dev (>= 2.4.0),
- libbonoboui2-dev,
- autotools-dev,
- gnome-common (>= 2.8.0),
- gnome-pkg-tools (>= 0.10),
- dpkg-dev (>= 1.13.19),
- libgtk2.0-dev (>= 2.14.0),
+ libgtk3.0-dev (>= 2.91.2),
python-gtk2-dev (>= 2.10.0),
python-support (>= 0.3),
- gtk-doc-tools (>= 1.9),
- gnome-doc-utils (>= 0.9.0)
+ gtk-doc-tools (>= 1.13),
+ gnome-doc-utils (>= 0.18),
+ intltool (>= 0.41.0)
Build-Depends-Indep: libglib2.0-doc,
libgtk2.0-doc
-Standards-Version: 3.8.1
+Standards-Version: 3.9.1
Homepage: http://glade.gnome.org
-Package: libgladeui-1-9
+Package: libgladeui-2-0
Architecture: any
Section: libs
Depends: ${misc:Depends},
- ${shlibs:Depends}
-Conflicts: libgladeui-1-1,
- libgladeui-1-2,
- libgladeui-1-3,
- libgladeui-1-4,
- libgladeui-1-5,
- libgladeui-1-7,
- libgladeui-1-8
-Replaces: libgladeui-1-1,
- libgladeui-1-2,
- libgladeui-1-3,
- libgladeui-1-4,
- libgladeui-1-5,
- libgladeui-1-7,
- libgladeui-1-8
+ ${shlibs:Depends},
+ libgladeui-common
Description: GTK+ User Interface Build core library
Glade is a RAD tool to enable quick and easy development of user
- interfaces for the GTK+ 2 toolkit.
+ interfaces for the GTK+ toolkit.
.
Glade is, since its "3.0" major version, highly modular, and composed
of widgets which can be used by other applications to integrate
@@ -57,16 +43,36 @@
This library provides all the widgets and core code, like parsing and
saving files.
-Package: libgladeui-1-dev
+Package: libgladeui-common
Architecture: all
+Section: libs
+Depends: ${misc:Depends}
+Replaces: libgladeui-1-9
+Description: GTK+ User Interface Build core library (common files)
+ Glade is a RAD tool to enable quick and easy development of user
+ interfaces for the GTK+ toolkit.
+ .
+ Glade is, since its "3.0" major version, highly modular, and composed
+ of widgets which can be used by other applications to integrate
+ functionality similar to the one provided by the Glade application
+ itself.
+ .
+ This library provides all the widgets and core code, like parsing and
+ saving files.
+ .
+ This package contains the common files.
+
+Package: libgladeui-dev
+Architecture: any
Section: libdevel
Depends: ${misc:Depends},
- libgladeui-1-9 (>= ${source:Version}),
- libgtk2.0-dev (>= 2.14.0),
+ libgladeui-1-10 (= ${binary:Version}),
+ libgtk3.0-dev (>= 2.20.0),
libxml2-dev (>= 2.4.0)
+Suggests: libgladeui-1-doc
Description: GTK+ User Interface Build core library (development files)
Glade is a RAD tool to enable quick and easy development of user
- interfaces for the GTK+ 2 toolkit.
+ interfaces for the GTK+ toolkit.
.
Glade is, since its "3.0" major version, highly modular, and composed
of widgets which can be used by other applications to integrate
@@ -79,25 +85,37 @@
This package contains the development files and documentation for the
library.
+Package: libgladeui-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Replaces: libgladeui-1-dev (<< 3.7.1-1)
+Description: GTK+ User Interface Build core library (documentation)
+ Glade is a RAD tool to enable quick and easy development of user
+ interfaces for the GTK+ toolkit.
+ .
+ Glade is, since its "3.0" major version, highly modular, and composed
+ of widgets which can be used by other applications to integrate
+ functionality similar to the one provided by the Glade application
+ itself.
+ .
+ This library provides all the widgets and core code, like parsing and
+ saving files.
+ .
+ This package contains the documentation for the library.
+
Package: glade
Architecture: any
Section: devel
Depends: ${misc:Depends},
${shlibs:Depends}
-Recommends: libgtk2.0-dev (>= 2.14.0),
+Recommends: libgtk2.0-dev (>= 2.20.0),
python-gtk2-dev (>= 2.10.0),
libglade2-dev (>= 1:2.6.0),
devhelp
-Suggests: glade-gnome
-Conflicts: glade-gnome (<= 2.91.1),
- glade-gnome-2 (<= 2.91.1),
- glade-2 (<= 2.10.0-2)
-Replaces: glade-gnome (<= 2.91.1),
- glade-2 (<= 2.10.0-2),
- glade-gnome-2 (<= 2.91.1)
-Description: GTK+ 2 User Interface Builder
+Description: GTK+ User Interface Builder
Glade is a RAD tool to enable quick and easy development of user
- interfaces for the GTK+ 2 toolkit.
+ interfaces for the GTK+ toolkit.
.
The user interfaces designed in Glade are stored in the well-known
XML format, enabling easy integration with external tools. You will
@@ -105,27 +123,4 @@
the XML files and create the interfaces at runtime.
.
This version is more modular than previous ones, so you can install
- modules to add aditional widgets for Glade to use. You can install
- the glade-gnome package to provide GNOME widgets, for instance.
-
-Package: glade-gnome
-Architecture: any
-Section: gnome
-Depends: ${misc:Depends},
- glade (= ${binary:Version}),
- gnome-common (>= 2.8.0),
- ${shlibs:Depends}
-Recommends: libgnomeui-dev,
- libbonoboui2-dev
-Description: GTK+ 2 User Interface Builder (with GNOME 2 support)
- Glade is a RAD tool to enable quick and easy development of user
- interfaces for the GTK+ 2 toolkit.
- .
- The user interfaces designed in Glade are stored in the well-known
- XML format, enabling easy integration with external tools. You will
- probably want to use it with tools such as libglade, which can load
- the XML files and create the interfaces at runtime.
- .
- This package include the module that allows Glade to provide GNOME
- widgets in its pallete.
-
+ modules to add additional widgets for Glade to use.
Modified: desktop/experimental/glade-3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/control.in?rev=26162&op=diff
==============================================================================
--- desktop/experimental/glade-3/debian/control.in [utf-8] (original)
+++ desktop/experimental/glade-3/debian/control.in [utf-8] Fri Jan 7 18:52:38 2011
@@ -7,47 +7,28 @@
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/glade-3
Build-Depends: cdbs (>= 0.4.41),
debhelper (>= 5),
- gettext (>= 0.10.40),
- libgnomeui-dev,
- scrollkeeper,
+ gnome-pkg-tools (>= 0.10),
libxml2-dev (>= 2.4.0),
- libbonoboui2-dev,
- autotools-dev,
- gnome-common (>= 2.8.0),
- gnome-pkg-tools (>= 0.10),
- dpkg-dev (>= 1.13.19),
- libgtk2.0-dev (>= 2.14.0),
+ libgtk3.0-dev (>= 2.91.2),
python-gtk2-dev (>= 2.10.0),
python-support (>= 0.3),
- gtk-doc-tools (>= 1.9),
- gnome-doc-utils (>= 0.9.0)
+ gtk-doc-tools (>= 1.13),
+ gnome-doc-utils (>= 0.18),
+ intltool (>= 0.41.0)
Build-Depends-Indep: libglib2.0-doc,
libgtk2.0-doc
-Standards-Version: 3.8.1
+Standards-Version: 3.9.1
Homepage: http://glade.gnome.org
-Package: libgladeui-1-9
+Package: libgladeui-2-0
Architecture: any
Section: libs
Depends: ${misc:Depends},
- ${shlibs:Depends}
-Conflicts: libgladeui-1-1,
- libgladeui-1-2,
- libgladeui-1-3,
- libgladeui-1-4,
- libgladeui-1-5,
- libgladeui-1-7,
- libgladeui-1-8
-Replaces: libgladeui-1-1,
- libgladeui-1-2,
- libgladeui-1-3,
- libgladeui-1-4,
- libgladeui-1-5,
- libgladeui-1-7,
- libgladeui-1-8
+ ${shlibs:Depends},
+ libgladeui-common
Description: GTK+ User Interface Build core library
Glade is a RAD tool to enable quick and easy development of user
- interfaces for the GTK+ 2 toolkit.
+ interfaces for the GTK+ toolkit.
.
Glade is, since its "3.0" major version, highly modular, and composed
of widgets which can be used by other applications to integrate
@@ -57,16 +38,36 @@
This library provides all the widgets and core code, like parsing and
saving files.
-Package: libgladeui-1-dev
+Package: libgladeui-common
Architecture: all
+Section: libs
+Depends: ${misc:Depends}
+Replaces: libgladeui-1-9
+Description: GTK+ User Interface Build core library (common files)
+ Glade is a RAD tool to enable quick and easy development of user
+ interfaces for the GTK+ toolkit.
+ .
+ Glade is, since its "3.0" major version, highly modular, and composed
+ of widgets which can be used by other applications to integrate
+ functionality similar to the one provided by the Glade application
+ itself.
+ .
+ This library provides all the widgets and core code, like parsing and
+ saving files.
+ .
+ This package contains the common files.
+
+Package: libgladeui-dev
+Architecture: any
Section: libdevel
Depends: ${misc:Depends},
- libgladeui-1-9 (>= ${source:Version}),
- libgtk2.0-dev (>= 2.14.0),
+ libgladeui-2-0 (= ${binary:Version}),
+ libgtk3.0-dev (>= 2.20.0),
libxml2-dev (>= 2.4.0)
+Suggests: libgladeui-doc
Description: GTK+ User Interface Build core library (development files)
Glade is a RAD tool to enable quick and easy development of user
- interfaces for the GTK+ 2 toolkit.
+ interfaces for the GTK+ toolkit.
.
Glade is, since its "3.0" major version, highly modular, and composed
of widgets which can be used by other applications to integrate
@@ -79,25 +80,38 @@
This package contains the development files and documentation for the
library.
+Package: libgladeui-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Conflicts: libgladeui-1-doc
+Replaces: libgladeui-1-dev (<< 3.7.1-1), libgladeui-1-doc
+Description: GTK+ User Interface Build core library (documentation)
+ Glade is a RAD tool to enable quick and easy development of user
+ interfaces for the GTK+ toolkit.
+ .
+ Glade is, since its "3.0" major version, highly modular, and composed
+ of widgets which can be used by other applications to integrate
+ functionality similar to the one provided by the Glade application
+ itself.
+ .
+ This library provides all the widgets and core code, like parsing and
+ saving files.
+ .
+ This package contains the documentation for the library.
+
Package: glade
Architecture: any
Section: devel
Depends: ${misc:Depends},
${shlibs:Depends}
-Recommends: libgtk2.0-dev (>= 2.14.0),
+Recommends: libgtk2.0-dev (>= 2.20.0),
python-gtk2-dev (>= 2.10.0),
libglade2-dev (>= 1:2.6.0),
devhelp
-Suggests: glade-gnome
-Conflicts: glade-gnome (<= 2.91.1),
- glade-gnome-2 (<= 2.91.1),
- glade-2 (<= 2.10.0-2)
-Replaces: glade-gnome (<= 2.91.1),
- glade-2 (<= 2.10.0-2),
- glade-gnome-2 (<= 2.91.1)
-Description: GTK+ 2 User Interface Builder
+Description: GTK+ User Interface Builder
Glade is a RAD tool to enable quick and easy development of user
- interfaces for the GTK+ 2 toolkit.
+ interfaces for the GTK+ toolkit.
.
The user interfaces designed in Glade are stored in the well-known
XML format, enabling easy integration with external tools. You will
@@ -105,27 +119,4 @@
the XML files and create the interfaces at runtime.
.
This version is more modular than previous ones, so you can install
- modules to add aditional widgets for Glade to use. You can install
- the glade-gnome package to provide GNOME widgets, for instance.
-
-Package: glade-gnome
-Architecture: any
-Section: gnome
-Depends: ${misc:Depends},
- glade (= ${binary:Version}),
- gnome-common (>= 2.8.0),
- ${shlibs:Depends}
-Recommends: libgnomeui-dev,
- libbonoboui2-dev
-Description: GTK+ 2 User Interface Builder (with GNOME 2 support)
- Glade is a RAD tool to enable quick and easy development of user
- interfaces for the GTK+ 2 toolkit.
- .
- The user interfaces designed in Glade are stored in the well-known
- XML format, enabling easy integration with external tools. You will
- probably want to use it with tools such as libglade, which can load
- the XML files and create the interfaces at runtime.
- .
- This package include the module that allows Glade to provide GNOME
- widgets in its pallete.
-
+ modules to add additional widgets for Glade to use.
Modified: desktop/experimental/glade-3/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/copyright?rev=26162&op=diff
==============================================================================
--- desktop/experimental/glade-3/debian/copyright [utf-8] (original)
+++ desktop/experimental/glade-3/debian/copyright [utf-8] Fri Jan 7 18:52:38 2011
@@ -5,7 +5,7 @@
<james at teyandei.net> based on Sebastian Bacher's work.
It was downloaded from:
- <http://ftp.gnome.org/pub/GNOME/sources/glade3/>
+ <http://ftp.gnome.org/pub/GNOME/sources/glade/>
Upstream Authors:
@@ -19,54 +19,17 @@
Copyright:
-glade-accumulators.c: * Copyright (C) 2005 The GNOME Foundation.
-glade-app.c: * Copyright (C) 2001 Ximian, Inc.
-glade-app.h: * Copyright (C) 2001 Ximian, Inc.
-glade-builtins.c: * Copyright (C) 2005 The GNOME Foundation.
-glade-catalog.c: * Copyright (C) 2001 Ximian, Inc.
-glade-catalog.c: * Copyright (C) 2004 Imendio AB
-glade-catalog.h: * Copyright (C) 2001 Ximian, Inc.
-glade-catalog.h: * Copyright (C) 2004 Imendio AB
-glade-clipboard.c: * Copyright (C) 2001 The GNOME Foundation.
-glade-clipboard-view.c: * Copyright (C) 2001 The GNOME Foundation.
-glade-command.c: * Copyright (C) 2002 Joaquín Cuenca Abela
-glade-cursor.c: * Copyright (C) 2001 Ximian, Inc.
-glade-custom.c: * Copyright (C) 2005 The GNOME Foundation.
-glade-debug.c: * Copyright (C) 2003 Joaquin Cuenca Abela
-glade-editor.c: * Copyright (C) 2001 Ximian, Inc.
-glade-editor-property.c: * Copyright (C) 2001 Ximian, Inc.
-glade-fixed.c: * Copyright (C) 2006 The GNOME Foundation.
-glade-gnome.c: * Copyright (C) 2006 Juan Pablo Ugarte.
-glade-gtk.c: * Copyright (C) 2001 Ximian, Inc.
-glade-id-allocator.c: * Copyright (C) 2004 Owen Taylor
-glade-palette-box.c: * Copyright (C) 2006 The Gnome Foundation.
-glade-palette-box.h: * Copyright (C) 2006 The Gnome Foundation.
-glade-palette.c: * Copyright (C) 2006 The GNOME Foundation.
-glade-palette.c: * Copyright (C) 2001-2005 Ximian, Inc.
-glade-palette-expander.c: * Copyright (C) 2003 Sun Microsystems, Inc.
-glade-palette-expander.h: * Copyright (C) 2003 Sun Microsystems, Inc.
-glade-palette.h: * Copyright (C) 2006 The GNOME Foundation.
-glade-palette.h: * Copyright (C) 2001-2005 Ximian, Inc.
-glade-palette-item.c: * Copyright (C) 2006 The GNOME Foundation.
-glade-palette-item.h: * Copyright (C) 2006 The GNOME Foundation.
-glade-parameter.c: * Copyright (C) 2001 Ximian, Inc.
-glade-parser.c: * Copyright (C) 1998-2002 James Henstridge <james at daa.com.au>
-glade-parser.h: * Copyright (C) 1998-2002 James Henstridge <james at daa.com.au>
-glade-placeholder.c: * Copyright (C) 2003, 2004 Joaquin Cuenca Abela
-glade-popup.c: * Copyright (C) 2001 Ximian, Inc.
-glade-project.c: * Copyright (C) 2001 Ximian, Inc.
-glade-project-view.c: * Copyright (C) 2001 Ximian, Inc.
-glade-project-window.c: * Copyright (C) 2001 Ximian, Inc.
-glade-property.c: * Copyright (C) 2001 Ximian, Inc.
-glade-property-class.c: * Copyright (C) 2001 Ximian, Inc.
-glade-signal.c: * Copyright (C) 2001 Ximian, Inc.
-glade-signal-editor.c: * Copyright (C) 2001 Ximian, Inc.
-glade-utils.c: * Copyright (C) 2001 Ximian, Inc.
-glade-widget.c: * Copyright (C) 2004 Joaquin Cuenca Abela
-glade-widget.c: * Copyright (C) 2001, 2002, 2003 Ximian, Inc.
-glade-widget-class.c: * Copyright (C) 2001 Ximian, Inc.
-glade-widget-class.c: * Copyright (C) 2004 Imendio AB
-main.c: * Copyright (C) 2001 Ximian, Inc.
+Copyright (C) 2004 Imendio AB
+Copyright (C) 2001, 2005, 2006, 2007 The GNOME Foundation.
+Copyright (C) 2006-2008 Juan Pablo Ugarte
+Copyright (C) 2004 Owen Taylor
+Copyright (C) 2001-2005 Ximian, Inc.
+Copyright (C) 2003 Sun Microsystems, Inc.
+Copyright (C) 1998-2002 James Henstridge <james at daa.com.au>
+Copyright (C) 2002, 2003, 2004 Joaquin Cuenca Abela
+Copyright (C) 2004 - 2010 Tristan Van Berkom
+Copyright (C) 2006, 2007 Vincent Geddes
+Copyright (C) 2010 - Paolo Borelli
License:
Copied: desktop/experimental/glade-3/debian/glade.1 (from r26111, desktop/experimental/glade-3/debian/glade-3.1)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/glade.1?rev=26162&op=diff
==============================================================================
--- desktop/experimental/glade-3/debian/glade-3.1 [utf-8] (original)
+++ desktop/experimental/glade-3/debian/glade.1 [utf-8] Fri Jan 7 18:52:38 2011
@@ -2,12 +2,12 @@
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
-.TH GLADE-3 1 "24 January 2005"
+.TH GLADE 1 "24 January 2005"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
-glade-3 \- GUI Builder for GTK+ 2
+glade \- GUI Builder for GTK+
.SH SYNOPSIS
-.B glade-3
+.B glade
.RI [ options ] " file"
.br
.SH DESCRIPTION
@@ -43,7 +43,7 @@
A single input XML file may be given as an argument. This file should
have been previous created by an interactive session with \fBGlade\fP.
.SH AUTHOR
-glade-3 was written by Chema Celorio <chema at ximian.com>.
+glade was written by Chema Celorio <chema at ximian.com>.
.PP
This manual page was written by Justin Pryzby
<justinpryzby at users.sf.net>, for the Debian project (but may be used
Modified: desktop/experimental/glade-3/debian/glade.manpages
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/glade.manpages?rev=26162&op=diff
==============================================================================
--- desktop/experimental/glade-3/debian/glade.manpages [utf-8] (original)
+++ desktop/experimental/glade-3/debian/glade.manpages [utf-8] Fri Jan 7 18:52:38 2011
@@ -1,1 +1,1 @@
-debian/glade-3.1
+debian/glade.1
Modified: desktop/experimental/glade-3/debian/glade.menu
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/glade.menu?rev=26162&op=diff
==============================================================================
--- desktop/experimental/glade-3/debian/glade.menu [utf-8] (original)
+++ desktop/experimental/glade-3/debian/glade.menu [utf-8] Fri Jan 7 18:52:38 2011
@@ -3,4 +3,4 @@
section="Applications/Programming" \
title="Glade 3" \
icon="/usr/share/pixmaps/glade.xpm" \
- command="/usr/bin/glade-3"
+ command="/usr/bin/glade"
Copied: desktop/experimental/glade-3/debian/libgladeui-2-0.install (from r25595, desktop/experimental/glade-3/debian/libgladeui-1-9.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/libgladeui-2-0.install?rev=26162&op=diff
==============================================================================
--- desktop/experimental/glade-3/debian/libgladeui-1-9.install [utf-8] (original)
+++ desktop/experimental/glade-3/debian/libgladeui-2-0.install [utf-8] Fri Jan 7 18:52:38 2011
@@ -1,6 +1,2 @@
-debian/tmp/usr/share/locale
-debian/tmp/usr/lib/libgladeui-1.so.*
-debian/tmp/usr/lib/glade3/modules/libgladegtk.so
-debian/tmp/usr/lib/glade3/modules/libgladepython.so
-debian/tmp/usr/share/glade3/pixmaps
-debian/tmp/usr/share/glade3/catalogs/gtk+.xml
+debian/tmp/usr/lib/libgladeui-2.so.*
+debian/tmp/usr/lib/glade/modules/*.so
Added: desktop/experimental/glade-3/debian/libgladeui-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/libgladeui-common.install?rev=26162&op=file
==============================================================================
--- desktop/experimental/glade-3/debian/libgladeui-common.install (added)
+++ desktop/experimental/glade-3/debian/libgladeui-common.install [utf-8] Fri Jan 7 18:52:38 2011
@@ -1,0 +1,3 @@
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/glade/pixmaps
+debian/tmp/usr/share/glade/catalogs/*.xml
Copied: desktop/experimental/glade-3/debian/libgladeui-dev.install (from r26111, desktop/experimental/glade-3/debian/libgladeui-1-dev.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/libgladeui-dev.install?rev=26162&op=diff
==============================================================================
--- desktop/experimental/glade-3/debian/libgladeui-1-dev.install [utf-8] (original)
+++ desktop/experimental/glade-3/debian/libgladeui-dev.install [utf-8] Fri Jan 7 18:52:38 2011
@@ -1,4 +1,3 @@
debian/tmp/usr/lib/*.so
debian/tmp/usr/include
debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/share/gtk-doc/html/gladeui/* /usr/share/doc/libgladeui-1-dev/html/
Added: desktop/experimental/glade-3/debian/libgladeui-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/libgladeui-doc.install?rev=26162&op=file
==============================================================================
--- desktop/experimental/glade-3/debian/libgladeui-doc.install (added)
+++ desktop/experimental/glade-3/debian/libgladeui-doc.install [utf-8] Fri Jan 7 18:52:38 2011
@@ -1,0 +1,1 @@
+debian/tmp/usr/share/gtk-doc/html/gladeui/* /usr/share/doc/libgladeui-doc/html/
Copied: desktop/experimental/glade-3/debian/libgladeui-doc.links (from r25595, desktop/experimental/glade-3/debian/libgladeui-1-dev.links)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/libgladeui-doc.links?rev=26162&op=diff
==============================================================================
--- desktop/experimental/glade-3/debian/libgladeui-1-dev.links [utf-8] (original)
+++ desktop/experimental/glade-3/debian/libgladeui-doc.links [utf-8] Fri Jan 7 18:52:38 2011
@@ -1,1 +1,1 @@
-usr/share/doc/libgladeui-1-dev/html usr/share/gtk-doc/html/gladeui
+usr/share/doc/libgladeui-doc/html usr/share/gtk-doc/html/gladeui
Modified: desktop/experimental/glade-3/debian/patches/01_gladeui-types.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/patches/01_gladeui-types.patch?rev=26162&op=diff
==============================================================================
--- desktop/experimental/glade-3/debian/patches/01_gladeui-types.patch [utf-8] (original)
+++ desktop/experimental/glade-3/debian/patches/01_gladeui-types.patch [utf-8] Fri Jan 7 18:52:38 2011
@@ -2,8 +2,8 @@
Bug: http://bugzilla.gnome.org/show_bug.cgi?id=530143
Origin: vendor
---- doc/gladeui.types~ 2008-05-12 17:36:54.000000000 +0200
-+++ doc/gladeui.types 2008-05-12 17:38:31.000000000 +0200
+--- a/doc/gladeui.types~ 2008-05-12 17:36:54.000000000 +0200
++++ b/doc/gladeui.types 2008-05-12 17:38:31.000000000 +0200
@@ -1,4 +1,7 @@
#include <glade.h>
+#include <glade-base-editor.h>
Added: desktop/experimental/glade-3/debian/patches/02-data-glade.desktop.in.in-Execute-glade-since-that-s-.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/patches/02-data-glade.desktop.in.in-Execute-glade-since-that-s-.patch?rev=26162&op=file
==============================================================================
--- desktop/experimental/glade-3/debian/patches/02-data-glade.desktop.in.in-Execute-glade-since-that-s-.patch (added)
+++ desktop/experimental/glade-3/debian/patches/02-data-glade.desktop.in.in-Execute-glade-since-that-s-.patch [utf-8] Fri Jan 7 18:52:38 2011
@@ -1,0 +1,32 @@
+From d88079b0fe6d4d55e5a75d23a69e9a5514b8dfb0 Mon Sep 17 00:00:00 2001
+From: Emilio Pozuelo Monfort <pochu27 at gmail.com>
+Date: Fri, 7 Jan 2011 12:12:53 +0000
+Subject: [PATCH] * data/glade.desktop.in.in: Execute 'glade' since that's the name of the binary now.
+
+---
+ ChangeLog | 5 +++++
+ data/glade.desktop.in.in | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2011-01-07 Emilio Pozuelo Monfort <pochu27 at gmail.com>
++
++ * data/glade.desktop.in.in: Execute 'glade' since that's the name
++ of the binary now.
++
+ 2011-01-06 Tristan Van Berkom <tristanvb at openismus.com>
+
+ * NEWS: Rolling Glade 3.9.0
+--- a/data/glade.desktop.in.in
++++ b/data/glade.desktop.in.in
+@@ -3,7 +3,7 @@
+ _GenericName=Interface Designer
+ _X-GNOME-FullName=Glade Interface Designer
+ _Comment=Create or open user interface designs for GTK+ applications
+-Exec=glade-3 %F
++Exec=glade %F
+ Terminal=false
+ StartupNotify=true
+ Type=Application
Modified: desktop/experimental/glade-3/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/patches/99_ltmain_as-needed.patch?rev=26162&op=diff
==============================================================================
--- desktop/experimental/glade-3/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/experimental/glade-3/debian/patches/99_ltmain_as-needed.patch [utf-8] Fri Jan 7 18:52:38 2011
@@ -1,7 +1,7 @@
---- glade3-3.5.3.orig/ltmain.sh 2008-02-08 08:57:47.000000000 +0800
-+++ glade3-3.5.3/ltmain.sh 2008-12-11 23:02:07.000000000 +0800
-@@ -1807,6 +1807,11 @@
- arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -4716,6 +4716,11 @@
+ arg=$func_stripname_result
;;
+ -Wl,--as-needed)
@@ -10,9 +10,9 @@
+ ;;
+
-Wl,*)
- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
- arg=
-@@ -2150,6 +2155,15 @@
+ func_stripname '-Wl,' '' "$arg"
+ args=$func_stripname_result
+@@ -5067,6 +5072,15 @@
lib=
found=no
case $deplib in
Added: desktop/experimental/glade-3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/patches/series?rev=26162&op=file
==============================================================================
--- desktop/experimental/glade-3/debian/patches/series (added)
+++ desktop/experimental/glade-3/debian/patches/series [utf-8] Fri Jan 7 18:52:38 2011
@@ -1,0 +1,3 @@
+01_gladeui-types.patch
+02-data-glade.desktop.in.in-Execute-glade-since-that-s-.patch
+99_ltmain_as-needed.patch
Modified: desktop/experimental/glade-3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/rules?rev=26162&op=diff
==============================================================================
--- desktop/experimental/glade-3/debian/rules [utf-8] (original)
+++ desktop/experimental/glade-3/debian/rules [utf-8] Fri Jan 7 18:52:38 2011
@@ -1,15 +1,12 @@
#!/usr/bin/make -f
-ALLOWED_DISTS += unstable
-
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-GNOME_MODULE := glade3
+GNOME_MODULE := glade
SHARED_PKG := $(shell sed -rn 's/^Package:[[:space:]]*(libgladeui-[[:digit:]\.]+-[[:digit:]][[:alnum:]]*)[[:space:]]*$$/\1/p' debian/control)
@@ -21,21 +18,12 @@
# ensures that libgladeui's shlibs are in place when calling dh_shlibdeps
binary/glade:: binary/$(SHARED_PKG)
-binary/glade-gnome:: binary/$(SHARED_PKG)
-# link with the freshly build libgladeui during dh_shlibdeps, and use freshly
+# link with the freshly built libgladeui during dh_shlibdeps, and use freshly
# generated shlib information
DEB_SHLIBDEPS_LIBRARY_glade += $(SHARED_PKG)
DEB_SHLIBDEPS_INCLUDE_glade += debian/$(SHARED_PKG)/usr/lib/
-DEB_SHLIBDEPS_LIBRARY_glade-common += $(SHARED_PKG)
-DEB_SHLIBDEPS_INCLUDE_glade-common += debian/$(SHARED_PKG)/usr/lib/
-# move stuff that will go in glade-gnome
binary-post-install/$(SHARED_PKG)::
dh_pysupport -p$(SHARED_PKG)
- for file in $$(find debian/$(SHARED_PKG)/usr/share/glade3/pixmaps/ -name \*gnome\* -or -name \*bonobo\*); do \
- target_dir=$$(dirname debian/glade-gnome/$${file#debian/$(SHARED_PKG)/}); \
- mkdir -p $${target_dir}; \
- mv $${file} $${target_dir}; \
- done
Added: desktop/experimental/glade-3/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/source/format?rev=26162&op=file
==============================================================================
--- desktop/experimental/glade-3/debian/source/format (added)
+++ desktop/experimental/glade-3/debian/source/format [utf-8] Fri Jan 7 18:52:38 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)
Modified: desktop/experimental/glade-3/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade-3/debian/watch?rev=26162&op=diff
==============================================================================
--- desktop/experimental/glade-3/debian/watch [utf-8] (original)
+++ desktop/experimental/glade-3/debian/watch [utf-8] Fri Jan 7 18:52:38 2011
@@ -1,4 +1,4 @@
version=3
-http://download.gnome.org/sources/glade3/([\d\.]+)[24680]/ \
- glade3-([\d\.]+)\.tar\.gz
+http://download.gnome.org/sources/glade/([\d\.]+)[24680]/ \
+ glade-([\d\.]+)\.tar\.gz
More information about the pkg-gnome-commits
mailing list