r11449 - in /packages/unstable/libgksu/debian: changelog control control.in patches/01_fix_keyring_password.diff patches/02_desktop_startup_id_fix.diff patches/03_use-gtk_entry_invisible_char_as_default.diff pos/ca.po pos/cs.po pos/hu.po pos/nl.po rules

[kov at users.alioth.debian.org]

Author: kov
Date: Sun Jun 10 18:48:15 2007
New Revision: 11449

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11449
Log:
merging experimental branch into 'main', unstable branch

Removed:
    packages/unstable/libgksu/debian/patches/01_fix_keyring_password.diff
    packages/unstable/libgksu/debian/patches/02_desktop_startup_id_fix.diff
    packages/unstable/libgksu/debian/patches/03_use-gtk_entry_invisible_char_as_default.diff
    packages/unstable/libgksu/debian/pos/ca.po
    packages/unstable/libgksu/debian/pos/cs.po
    packages/unstable/libgksu/debian/pos/hu.po
    packages/unstable/libgksu/debian/pos/nl.po
Modified:
    packages/unstable/libgksu/debian/changelog
    packages/unstable/libgksu/debian/control
    packages/unstable/libgksu/debian/control.in
    packages/unstable/libgksu/debian/rules

Modified: packages/unstable/libgksu/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgksu/debian/changelog?rev=11449&op=diff
==============================================================================
--- packages/unstable/libgksu/debian/changelog (original)
+++ packages/unstable/libgksu/debian/changelog Sun Jun 10 18:48:15 2007
@@ -1,3 +1,21 @@
+libgksu (2.0.4-1) experimental; urgency=low
+
+  * debian/patches/01_fix_keyring_password.diff,
+    debian/patches/02_desktop_startup_id_fix.diff,
+    debian/patches/03_use-gtk_entry_invisible_char_as_default.diff:
+  - removed; applied upstream
+  * debian/pos/ca.po, debian/pos/cs.po,
+    debian/pos/hu.po, debian/pos/nl.po:
+  - also removed; applied upstream
+  * debian/rules:
+  - added check for upload target (must be experimental)
+  - added code to automatically download the original source tarball
+  - thanks go to lool for making the two changes above possible
+  * debian/control.in:
+  - the changes above require gnome-pkg-tools >= 0.10
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Sun,  4 Feb 2007 15:00:29 -0200
+
 libgksu (2.0.3-9) unstable; urgency=low
 
   * debian/patches/00_gettext_all_linguas.diff:

Modified: packages/unstable/libgksu/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgksu/debian/control?rev=11449&op=diff
==============================================================================
--- packages/unstable/libgksu/debian/control (original)
+++ packages/unstable/libgksu/debian/control Sun Jun 10 18:48:15 2007
@@ -2,8 +2,8 @@
 Section: admin
 Priority: optional
 Maintainer: Gustavo Noronha Silva <kov at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Kilian Krause <kilian at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ondřej Surý <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1.0), libgtk2.0-dev (>= 2.4.0), libglade2-dev, libgconf2-dev, libstartup-notification0-dev, libgnome-keyring-dev, gettext, autotools-dev, gtk-doc-tools, gnome-pkg-tools, libgtop2-dev
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Build-Depends: cdbs, debhelper (>= 4.1.0), libgtk2.0-dev (>= 2.4.0), libglade2-dev, libgconf2-dev, libstartup-notification0-dev, libgnome-keyring-dev, gettext, autotools-dev, gtk-doc-tools, gnome-pkg-tools (>= 0.10), libgtop2-dev
 Standards-Version: 3.7.2
 
 Package: libgksu2-0

Modified: packages/unstable/libgksu/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgksu/debian/control.in?rev=11449&op=diff
==============================================================================
--- packages/unstable/libgksu/debian/control.in (original)
+++ packages/unstable/libgksu/debian/control.in Sun Jun 10 18:48:15 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Gustavo Noronha Silva <kov at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs, debhelper (>= 4.1.0), libgtk2.0-dev (>= 2.4.0), libglade2-dev, libgconf2-dev, libstartup-notification0-dev, libgnome-keyring-dev, gettext, autotools-dev, gtk-doc-tools, gnome-pkg-tools, libgtop2-dev
+Build-Depends: cdbs, debhelper (>= 4.1.0), libgtk2.0-dev (>= 2.4.0), libglade2-dev, libgconf2-dev, libstartup-notification0-dev, libgnome-keyring-dev, gettext, autotools-dev, gtk-doc-tools, gnome-pkg-tools (>= 0.10), libgtop2-dev
 Standards-Version: 3.7.2
 
 Package: libgksu2-0

Modified: packages/unstable/libgksu/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgksu/debian/rules?rev=11449&op=diff
==============================================================================
--- packages/unstable/libgksu/debian/rules (original)
+++ packages/unstable/libgksu/debian/rules Sun Jun 10 18:48:15 2007
@@ -1,10 +1,14 @@
 #!/usr/bin/make -f
+
+GNOME_DOWNLOAD_URL = http://people.debian.org/~kov/gksu/$(GNOME_TARBALL)
 
 include /usr/share/cdbs/1/rules/buildcore.mk
 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/simple-patchsys.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS := --disable-gtk-doc --enable-gnome-keyring