r10160 - in /packages/unstable/pidgin/trunk/debian: NEWS.Debian changelog control gaim-data.install gaim-prefs.xml gaim.links patches/21_doxygen-paths.patch pidgin-data.docs pidgin.install rules

ari at users.alioth.debian.org ari at users.alioth.debian.org
Thu Apr 19 16:13:51 UTC 2007 

Author: ari
Date: Thu Apr 19 16:13:51 2007
New Revision: 10160

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10160
Log:
Update mtn snapshot; Split gaim transitional package off into a separate package

Added:
    packages/unstable/pidgin/trunk/debian/patches/21_doxygen-paths.patch
Removed:
    packages/unstable/pidgin/trunk/debian/NEWS.Debian
    packages/unstable/pidgin/trunk/debian/gaim-data.install
    packages/unstable/pidgin/trunk/debian/gaim-prefs.xml
    packages/unstable/pidgin/trunk/debian/gaim.links
Modified:
    packages/unstable/pidgin/trunk/debian/changelog
    packages/unstable/pidgin/trunk/debian/control
    packages/unstable/pidgin/trunk/debian/pidgin-data.docs
    packages/unstable/pidgin/trunk/debian/pidgin.install
    packages/unstable/pidgin/trunk/debian/rules

Modified: packages/unstable/pidgin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/changelog?rev=10160&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/changelog (original)
+++ packages/unstable/pidgin/trunk/debian/changelog Thu Apr 19 16:13:51 2007
@@ -1,23 +1,13 @@
-pidgin (1:2.0.0+beta6+mtn20070414-1) experimental; urgency=low
-
-  * New upstream snapshot - revision 56a0c68612d824d0cc2cc7ae088548162c7151ef
-    - Might fix some gstreamer crashes
-  * Add the old /etc/gaim/prefs.xml back to the gaim-data package so that
-    purging the package also purges the config
-  * Install /etc/purple/prefs.xml, not /etc/pidgin/prefs.xml
-  * Fix Replaces: line for pidgin package to replace old gaim, not old pidgin
-
- -- Ari Pollak <ari at debian.org>  Thu, 12 Apr 2007 00:38:48 -0400
-
-pidgin (1:2.0.0+beta6+mtn20070409-1) experimental; urgency=low
-
-  * New upstream snapshot - revision 90db723530550aafe25feb6c1352e02ee9907cd0
+pidgin (2.0.0~beta6+mtn20070418-1) experimental; urgency=low
+
+  * New upstream snapshot - revision ce3b9b8b7c19e2f6c7b9cd85b90b5c254c2c384f
   * Change name of package to pidgin (Closes: #418215)
-  * Remove some leftover dependencies from etch
   * 20_purple-remote_friendly.patch:
     - Make error messages friendlier when python-dbus is not installed
       or if someone calls purple-remote/purple-url-handler with --help or -h
       (Closes: #413204)
+  * 21_doxygen-paths.patch:
+    - Fix building the docs due to a path problem issue
   * Loosen the dependency on pidgin-data slightly (Closes: #403582)
   * Add purple-remote manpage from Anibal Avelar (Closes: #412278)
 

Modified: packages/unstable/pidgin/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/control?rev=10160&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/control (original)
+++ packages/unstable/pidgin/trunk/debian/control Thu Apr 19 16:13:51 2007
@@ -18,7 +18,7 @@
 Package: pidgin
 Architecture: any
 Depends: pidgin-data (>= ${source:Upstream-Version}), pidgin-data (<< ${source:Upstream-Version}-z) (${shlibs:Depends}, libsasl2-modules
-Replaces: gaim (<< 1:2.0.0+beta6+mtn20070409-1)
+Replaces: gaim (<< 1:2.0.0+beta6-3)
 Recommends: gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, python-dbus
 Suggests: gnome-panel (>= 2.1) | kicker (>= 3.1) | docker, evolution-data-server (>= 1.6.0), ${shlibs:Suggests}
 Conflicts: gaim-encryption (<= 3.0~beta7-1), gaim-librvp (<= 0.9.5-2), nautilus-sendto (<= 0.8-2)
@@ -53,7 +53,7 @@
 Package: pidgin-data
 Architecture: all
 Depends: ${misc:Depends}
-Replaces: gaim-data (<< 1:2.0.0+beta6+mtn20070409-1)
+Replaces: gaim-data (<< 1:2.0.0+beta6-3)
 Recommends: pidgin
 Enhances: pidgin
 Description: multi-protocol instant messaging client - data files
@@ -81,37 +81,3 @@
  This package includes the debugging symbols useful for debugging Pidgin
  and its plugins, contained in the pidgin package. The debugging symbols are
  used for execution tracing and core dump analysis.
-
-Package: gaim
-Priority: extra
-Architecture: all
-Depends: pidgin
-Description: transitional package to Pidgin
- This dummy package is provided to smooth the upgrade from Gaim to Pidgin.  It
- contains compatibility links from /usr/bin/gaim and related programs to the
- newly-named programs. If you no longer need these links, this package can be
- safely removed.
-
-Package: gaim-data
-Priority: extra
-Architecture: all
-Depends: pidgin-data
-Description: transitional package to Pidgin
- This dummy package is provided to smooth the upgrade from Gaim to Pidgin.
- This package can be safely removed.
-
-Package: gaim-dbg
-Priority: extra
-Architecture: all
-Depends: pidgin-dbg
-Description: transitional package to Pidgin
- This dummy package is provided to smooth the upgrade from Gaim to Pidgin.
- This package can be safely removed.
-
-Package: gaim-dev
-Priority: extra
-Architecture: all
-Depends: pidgin-dev
-Description: transitional package to Pidgin
- This dummy package is provided to smooth the upgrade from Gaim to Pidgin.
- This package can be safely removed.

Added: packages/unstable/pidgin/trunk/debian/patches/21_doxygen-paths.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/patches/21_doxygen-paths.patch?rev=10160&op=file
==============================================================================
--- packages/unstable/pidgin/trunk/debian/patches/21_doxygen-paths.patch (added)
+++ packages/unstable/pidgin/trunk/debian/patches/21_doxygen-paths.patch Thu Apr 19 16:13:51 2007
@@ -1,0 +1,26 @@
+# 
+# old_revision [52f50d9c1ba2cedab7acbe195e3f223d70f1cc3d]
+# 
+# patch "Doxyfile.in"
+#  from [218aac84c14195944b61471941ac58cc83fbef0b]
+#    to [9b2ee688fa7a2e5f0e9cfe59e1d0e7a7bc4c8663]
+# 
+============================================================
+--- Doxyfile.in	218aac84c14195944b61471941ac58cc83fbef0b
++++ Doxyfile.in	9b2ee688fa7a2e5f0e9cfe59e1d0e7a7bc4c8663
+@@ -615,13 +615,13 @@ HTML_FILE_EXTENSION    = .html
+ # each generated HTML page. If it is left blank doxygen will generate a 
+ # standard header.
+ 
+-HTML_HEADER            = doc/TracHeader.html
++HTML_HEADER            = @top_srcdir@/doc/TracHeader.html
+ 
+ # The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+ # each generated HTML page. If it is left blank doxygen will generate a 
+ # standard footer.
+ 
+-HTML_FOOTER            = doc/TracFooter.html
++HTML_FOOTER            = @top_srcdir@/doc/TracFooter.html
+ 
+ # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+ # style sheet that is used by each HTML page. It can be used to 

Modified: packages/unstable/pidgin/trunk/debian/pidgin-data.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/pidgin-data.docs?rev=10160&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/pidgin-data.docs (original)
+++ packages/unstable/pidgin/trunk/debian/pidgin-data.docs Thu Apr 19 16:13:51 2007
@@ -1,4 +1,3 @@
 debian/NEWS.Debian
-doc/FAQ
 COPYRIGHT
 ChangeLog.API

Modified: packages/unstable/pidgin/trunk/debian/pidgin.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/pidgin.install?rev=10160&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/pidgin.install (original)
+++ packages/unstable/pidgin/trunk/debian/pidgin.install Thu Apr 19 16:13:51 2007
@@ -11,4 +11,3 @@
 debian/tmp/usr/lib/perl5
 debian/tmp/usr/lib/pidgin/*.so*
 debian/tmp/usr/share/applications
-debian/tmp/usr/share/dbus-1

Modified: packages/unstable/pidgin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/rules?rev=10160&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/rules (original)
+++ packages/unstable/pidgin/trunk/debian/rules Thu Apr 19 16:13:51 2007
@@ -33,21 +33,9 @@
 DEB_INSTALL_CHANGELOGS_pidgin-dbg := --no-act
 DEB_INSTALL_DOCS_pidgin-dbg := --no-act
 
-## Compatibility symlinks for old gaim packages
-DEB_DH_LINK_gaim := usr/share/doc/gaim-data usr/share/doc/gaim
-DEB_INSTALL_CHANGELOGS_gaim := --no-act
-DEB_INSTALL_DOCS_gaim := --no-act
-
-DEB_DH_LINK_gaim-dbg := usr/share/doc/gaim-data usr/share/doc/gaim-dbg
-DEB_INSTALL_CHANGELOGS_gaim-dbg := --no-act
-DEB_INSTALL_DOCS_gaim-dbg := --no-act
-
-DEB_DH_LINK_gaim-dev := usr/share/doc/gaim-data usr/share/doc/gaim-dev
-DEB_INSTALL_CHANGELOGS_gaim-dev := --no-act
-DEB_INSTALL_DOCS_gaim-dev := --no-act
-
 
 cleanbuilddir/pidgin::
+	rm -f doc/TracHeader.html doc/TracFooter.html
 	rm -rf $(DEB_SRCDIR)/build
 
 common-install-impl::
@@ -57,7 +45,8 @@
 
 build/pidgin-dev::
 	pod2man debian/dh_pidgin > debian/dh_pidgin.1
-	cd build; doxygen
+	touch doc/TracHeader.html doc/TracFooter.html
+	cd build; make docs
 
 binary-install/pidgin-dev::
 	dh_installdirs -ppidgin-dev usr/share/doc/pidgin-data \

More information about the pkg-gnome-commits mailing list