r13852 - /desktop/unstable/gtkmm2.4/debian/
manphiz-guest at users.alioth.debian.org
manphiz-guest at users.alioth.debian.org
Fri Dec 14 07:00:29 UTC 2007
Author: manphiz-guest
Date: Fri Dec 14 07:00:29 2007
New Revision: 13852
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13852
Log:
+ Suggest -doc in -dev.
+ Recommends libglibmm-2.4-doc >= 2.12.2-3 in -doc due to path change.
* debian/libgtkmm-2.4-doc.doc-base.*
+ Fix paths according to the new doc places.
* debian/libgtkmm-2.4-doc.{docs,examples}
- Dropped in favor of libgtkmm-2.4-doc.install.
* debian/libgtkmm-2.4-doc.install
+ Handle doc installation here.
* Add debian/libgtkmm-2.4-doc.links to provide symlink to original doc
path. By doing this, the reference path from external doc packages can
remain intact, so the sed tricks can be dropped.
+ Refine exclude rules.
+ Install docs with original path hierarchy and drop the sed tricks.
Added:
desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.links
Removed:
desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.docs
desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.examples
Modified:
desktop/unstable/gtkmm2.4/debian/changelog
desktop/unstable/gtkmm2.4/debian/control
desktop/unstable/gtkmm2.4/debian/control.in
desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.doc-base.gtkmm2.4-faq
desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.doc-base.gtkmm2.4-reference
desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.doc-base.gtkmm2.4-tutorial
desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.install
desktop/unstable/gtkmm2.4/debian/rules
Modified: desktop/unstable/gtkmm2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/changelog?rev=13852&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/changelog (original)
+++ desktop/unstable/gtkmm2.4/debian/changelog Fri Dec 14 07:00:29 2007
@@ -6,11 +6,22 @@
+ Bump standard version to 3.7.3. No change required.
Thanks Guus Sliepen.
+ Bump cdbs version to >= 0.4.41, reason given below.
+ + Suggest -doc in -dev.
+ + Recommends libglibmm-2.4-doc >= 2.12.2-3 in -doc due to path change.
* debian/patches
+ Rename 99_relibtoolize.patch to 70_relibtoolize.patch for consistency,
and renew it for new version.
+ Add 10_gcc4.3_include_fix.patch to fix FTBFS with gcc 4.3.
(Closes: #452090)
+ * debian/libgtkmm-2.4-doc.doc-base.*
+ + Fix paths according to the new doc places.
+ * debian/libgtkmm-2.4-doc.{docs,examples}
+ - Dropped in favor of libgtkmm-2.4-doc.install.
+ * debian/libgtkmm-2.4-doc.install
+ + Handle doc installation here.
+ * Add debian/libgtkmm-2.4-doc.links to provide symlink to original doc
+ path. By doing this, the reference path from external doc packages can
+ remain intact, so the sed tricks can be dropped.
* debian/rules
+ Add LDFLAG "-Wl,--as-needed" to reduce unneeded shlibs dependencies.
+ Let examples be compressed.
@@ -22,12 +33,13 @@
+ Drop DEB_AUTO_UPDATE_DEBIAN_CONTROL as cdbs dependency is written by
hand, and avoiding generating debian/control twice by a single clean.
+ Replace most ':=' with '+=' to avoid overwriting existing values.
- + Refine the sed scripts to be more concise and readable.
+ + Refine exclude rules.
+ + Install docs with original path hierarchy and drop the sed tricks.
* debian/watch
+ Use spaces instead of tabs when indent
(Thanks Loïc Minier for reviewing and the suggestions.)
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org> Thu, 13 Dec 2007 22:58:54 +0800
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org> Fri, 14 Dec 2007 14:58:24 +0800
gtkmm2.4 (1:2.12.1-1) unstable; urgency=low
Modified: desktop/unstable/gtkmm2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/control?rev=13852&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/control (original)
+++ desktop/unstable/gtkmm2.4/debian/control Fri Dec 14 07:00:29 2007
@@ -25,6 +25,7 @@
libglibmm-2.4-dev (>= 2.14.1),
libatk1.0-dev (>= 1.9.0),
libcairomm-1.0-dev (>= 1.1.12)
+Suggests: libgtkmm-2.4-doc
Description: C++ wrappers for GTK+ 2.4 (development files)
Gtkmm is a C++ interface for the popular GUI library gtk+.
Gtkmm provides a convenient interface for C++ programmers to create
@@ -74,7 +75,7 @@
Depends: ${misc:Depends},
lynx | www-browser,
doc-base
-Suggests: libgtkmm-2.4-dev, libglibmm-2.4-doc
+Recommends: libglibmm-2.4-doc (>= 2.14.2-3)
Description: C++ wrappers for GTK+ 2.4 (documentation)
Gtkmm is a C++ interface for the popular GUI library gtk+.
Gtkmm provides a convenient interface for C++ programmers to create
Modified: desktop/unstable/gtkmm2.4/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/control.in?rev=13852&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/control.in (original)
+++ desktop/unstable/gtkmm2.4/debian/control.in Fri Dec 14 07:00:29 2007
@@ -25,6 +25,7 @@
libglibmm-2.4-dev (>= 2.14.1),
libatk1.0-dev (>= 1.9.0),
libcairomm-1.0-dev (>= 1.1.12)
+Suggests: libgtkmm-2.4-doc
Description: C++ wrappers for GTK+ 2.4 (development files)
Gtkmm is a C++ interface for the popular GUI library gtk+.
Gtkmm provides a convenient interface for C++ programmers to create
@@ -74,7 +75,7 @@
Depends: ${misc:Depends},
lynx | www-browser,
doc-base
-Suggests: libgtkmm-2.4-dev, libglibmm-2.4-doc
+Recommends: libglibmm-2.4-doc (>= 2.14.2-3)
Description: C++ wrappers for GTK+ 2.4 (documentation)
Gtkmm is a C++ interface for the popular GUI library gtk+.
Gtkmm provides a convenient interface for C++ programmers to create
Modified: desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.doc-base.gtkmm2.4-faq
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.doc-base.gtkmm2.4-faq?rev=13852&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.doc-base.gtkmm2.4-faq (original)
+++ desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.doc-base.gtkmm2.4-faq Fri Dec 14 07:00:29 2007
@@ -5,5 +5,5 @@
Section: Apps/Programming
Format: HTML
-Index: /usr/share/doc/libgtkmm-2.4-doc/FAQ/html/index.html
-Files: /usr/share/doc/libgtkmm-2.4-doc/FAQ/html/*.html
+Index: /usr/share/doc/libgtkmm-2.4-doc/docs/FAQ/html/index.html
+Files: /usr/share/doc/libgtkmm-2.4-doc/docs/FAQ/html/*.html
Modified: desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.doc-base.gtkmm2.4-reference
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.doc-base.gtkmm2.4-reference?rev=13852&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.doc-base.gtkmm2.4-reference (original)
+++ desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.doc-base.gtkmm2.4-reference Fri Dec 14 07:00:29 2007
@@ -5,5 +5,5 @@
Section: Apps/Programming
Format: HTML
-Index: /usr/share/doc/libgtkmm-2.4-doc/reference/html/index.html
-Files: /usr/share/doc/libgtkmm-2.4-doc/reference/html/*.html
+Index: /usr/share/doc/libgtkmm-2.4-doc/docs/reference/html/index.html
+Files: /usr/share/doc/libgtkmm-2.4-doc/docs/reference/html/*.html
Modified: desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.doc-base.gtkmm2.4-tutorial
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.doc-base.gtkmm2.4-tutorial?rev=13852&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.doc-base.gtkmm2.4-tutorial (original)
+++ desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.doc-base.gtkmm2.4-tutorial Fri Dec 14 07:00:29 2007
@@ -5,5 +5,5 @@
Section: Apps/Programming
Format: HTML
-Index: /usr/share/doc/libgtkmm-2.4-doc/tutorial/html/index.html
-Files: /usr/share/doc/libgtkmm-2.4-doc/tutorial/html/*.html
+Index: /usr/share/doc/libgtkmm-2.4-doc/docs/tutorial/html/index.html
+Files: /usr/share/doc/libgtkmm-2.4-doc/docs/tutorial/html/*.html
Modified: desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.install?rev=13852&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.install (original)
+++ desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.install Fri Dec 14 07:00:29 2007
@@ -1,1 +1,2 @@
+debian/tmp/usr/share/doc/gtkmm-2.4/* usr/share/doc/libgtkmm-2.4-doc
debian/tmp/usr/share/devhelp/* usr/share/devhelp
Added: desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.links?rev=13852&op=file
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.links (added)
+++ desktop/unstable/gtkmm2.4/debian/libgtkmm-2.4-doc.links Fri Dec 14 07:00:29 2007
@@ -1,0 +1,1 @@
+usr/share/doc/libgtkmm-2.4-doc usr/share/doc/gtkmm-2.4
Modified: desktop/unstable/gtkmm2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtkmm2.4/debian/rules?rev=13852&op=diff
==============================================================================
--- desktop/unstable/gtkmm2.4/debian/rules (original)
+++ desktop/unstable/gtkmm2.4/debian/rules Fri Dec 14 07:00:29 2007
@@ -20,14 +20,12 @@
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+DEB_DH_ALWAYS_EXCLUDE += \
+ "-XDoxyfile -Xdoxygen_tags -Xfragment -X.deps -X.libs -X.o -X.in -X.am"
+
DEB_DH_MAKESHLIBS_ARGS_libgtkmm-2.4-1c2a += -V"libgtkmm-2.4-1c2a (>= 2.12.0)"
DEB_INSTALL_CHANGELOGS_ALL += ChangeLog
-
-DEB_INSTALL_DOCS_ALL += \
- -XMakefile -XDoxyfile -Xdevhelp -Xdoxygen_tags -Xfragment
-
-DEB_INSTALL_EXAMPLES_libgtkmm-2.4-doc += -X.deps -X.libs -X.o -X.in -X.am
#binary-post-install/libgtkmm-2.4-doc::
# fix external doc paths
More information about the pkg-gnome-commits
mailing list