r26164 - in /desktop/experimental/glade/debian: changelog control control.in rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Fri Jan  7 19:00:31 2011
New Revision: 26164

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26164
Log:
Rename the source package to 'glade'.

Modified:
    desktop/experimental/glade/debian/changelog
    desktop/experimental/glade/debian/control
    desktop/experimental/glade/debian/control.in
    desktop/experimental/glade/debian/rules

Modified: desktop/experimental/glade/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade/debian/changelog?rev=26164&op=diff
==============================================================================
--- desktop/experimental/glade/debian/changelog [utf-8] (original)
+++ desktop/experimental/glade/debian/changelog [utf-8] Fri Jan  7 19:00:31 2011
@@ -1,4 +1,4 @@
-glade-3 (3.9.0-1) UNRELEASED; urgency=low
+glade (3.9.0-1) UNRELEASED; urgency=low
 
   [ Josselin Mouette ]
   * Add symlink for the glade manpage, too. Closes: #545820.
@@ -23,6 +23,7 @@
       debian/source/format,
       debian/patches:
       + Switch to source format 3.0 (quilt).
+  * Rename the source package to 'glade'.
 
  -- Josselin Mouette <joss at debian.org>  Wed, 09 Sep 2009 16:19:07 +0200
 

Modified: desktop/experimental/glade/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade/debian/control?rev=26164&op=diff
==============================================================================
--- desktop/experimental/glade/debian/control [utf-8] (original)
+++ desktop/experimental/glade/debian/control [utf-8] Fri Jan  7 19:00:31 2011
@@ -3,13 +3,13 @@
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
 
-Source: glade-3
+Source: glade
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Deng Xiyue <manphiz-guest at users.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/glade-3
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/glade-3
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/glade
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/glade
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
                gnome-pkg-tools (>= 0.10),
@@ -66,10 +66,10 @@
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
-         libgladeui-1-10 (= ${binary:Version}),
+         libgladeui-2-0 (= ${binary:Version}),
          libgtk3.0-dev (>= 2.20.0),
          libxml2-dev (>= 2.4.0)
-Suggests: libgladeui-1-doc
+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+ toolkit.
@@ -89,7 +89,8 @@
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Replaces: libgladeui-1-dev (<< 3.7.1-1)
+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.

Modified: desktop/experimental/glade/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade/debian/control.in?rev=26164&op=diff
==============================================================================
--- desktop/experimental/glade/debian/control.in [utf-8] (original)
+++ desktop/experimental/glade/debian/control.in [utf-8] Fri Jan  7 19:00:31 2011
@@ -1,10 +1,10 @@
-Source: glade-3
+Source: glade
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/glade-3
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/glade-3
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/glade
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/glade
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
                gnome-pkg-tools (>= 0.10),

Modified: desktop/experimental/glade/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glade/debian/rules?rev=26164&op=diff
==============================================================================
--- desktop/experimental/glade/debian/rules [utf-8] (original)
+++ desktop/experimental/glade/debian/rules [utf-8] Fri Jan  7 19:00:31 2011
@@ -5,8 +5,6 @@
 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
-
-GNOME_MODULE := glade
 
 SHARED_PKG := $(shell sed -rn 's/^Package:[[:space:]]*(libgladeui-[[:digit:]\.]+-[[:digit:]][[:alnum:]]*)[[:space:]]*$$/\1/p' debian/control)