diff --git a/debian/changelog b/debian/changelog index 3196e05411..a40142bb22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +gtk+2.0 (2.4.0-4) experimental; urgency=low + + * Akira TAGOH + + debian/control: + - moved arch-independent files to libgtk2.0-common again. + - separated arch-dependent files to libgtk2.0-bin. + + -- Akira TAGOH Sat, 24 Apr 2004 02:11:52 +0900 + gtk+2.0 (2.4.0-3) experimental; urgency=low * Akira TAGOH @@ -61,6 +70,15 @@ gtk+2.0 (2.4.0-1) experimental; urgency=low -- Sebastien Bacher Mon, 22 Mar 2004 22:00:09 +0100 +gtk+2.0 (2.2.4-5) unstable; urgency=low + + * Akira TAGOH + + debian/control: + - moved arch-independent files to libgtk2.0-common again. + - separated arch-dependent files to libgtk2.0-bin. + + -- Akira TAGOH Sat, 24 Apr 2004 01:12:08 +0900 + gtk+2.0 (2.2.4-4) unstable; urgency=low * Akira TAGOH diff --git a/debian/control.in b/debian/control.in index 5db106099a..e9510bec6a 100644 --- a/debian/control.in +++ b/debian/control.in @@ -10,7 +10,7 @@ Standards-Version: 3.6.1.0 Package: libgtk2.0-@SONAME@ Section: libs Architecture: any -Depends: libgtk2.0-common (>= ${Source-Version}), libgtk2.0-data (>= ${Source-Version}), ${shlibs:Depends} +Depends: libgtk2.0-common (>= ${Source-Version}), libgtk2.0-bin (>= ${Source-Version}), ${shlibs:Depends} Conflicts: libgtk2.0-0png3, eog2 (<< 1.0.1-4), gnome-panel2 (<< 2.0.4-1), celestia (<< 1.2.4-4), gimp1.3 (<< 1.3.7-1.1), metatheme (<< 0.9.7-3), libgnomeui-0 (<< 2.0.6-2), gtk2.0-examples (<< 2.2.0), libgdkxft0 Replaces: libgtk2.0-0png3 Description: The GTK+ graphical user interface library @@ -23,10 +23,10 @@ Description: The GTK+ graphical user interface library Package: libgtk2.0-common Section: misc -Architecture: any -Depends: ${shlibs:Depends} -Replaces: libgtk1.3-common -Conflicts: libgtk1.3-common +Architecture: all +Depends: ${misc:Depends} +Replaces: libgtk1.3-common, libgtk2.0-data +Conflicts: libgtk1.3-common, libgtk2.0-data Description: Common files for the GTK+ graphical user interface library The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable @@ -35,18 +35,19 @@ Description: Common files for the GTK+ graphical user interface library . This package contains the common files which the libraries need. -Package: libgtk2.0-data +Package: libgtk2.0-bin Section: misc -Architecture: all -Depends: ${misc:Depends} -Replaces: libgtk2.0-common (<= 2.4.0-2) -Description: Data files for the GTK+ graphical user interface library +Architecture: any +Depends: ${shlibs:Depends} +Replaces: libgtk2.0-common (<= 2.4.0-3) +Description: The programs for the GTK+ graphical user interface library The GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, the GTK+ is suitable for projects ranging from small one-off tools to complete application suites. . - This package contains the data files which the libraries need. + This package contains the program files which is used for the libraries + and others. Package: libgtk2.0-dev Section: libdevel diff --git a/debian/libgtk2.0-bin.dirs b/debian/libgtk2.0-bin.dirs new file mode 100644 index 0000000000..23445f30c6 --- /dev/null +++ b/debian/libgtk2.0-bin.dirs @@ -0,0 +1,3 @@ +usr/bin +usr/sbin +etc/gtk-2.0 diff --git a/debian/libgtk2.0-bin.files b/debian/libgtk2.0-bin.files new file mode 100644 index 0000000000..4983200a6d --- /dev/null +++ b/debian/libgtk2.0-bin.files @@ -0,0 +1,3 @@ +usr/bin/gtk-query-immodules-2.0 +usr/bin/gdk-pixbuf-query-loaders +etc/gtk-2.0/* diff --git a/debian/libgtk2.0-common.manpages b/debian/libgtk2.0-bin.manpages similarity index 100% rename from debian/libgtk2.0-common.manpages rename to debian/libgtk2.0-bin.manpages diff --git a/debian/libgtk2.0-common.postinst b/debian/libgtk2.0-bin.postinst similarity index 100% rename from debian/libgtk2.0-common.postinst rename to debian/libgtk2.0-bin.postinst diff --git a/debian/libgtk2.0-common.postrm b/debian/libgtk2.0-bin.postrm similarity index 100% rename from debian/libgtk2.0-common.postrm rename to debian/libgtk2.0-bin.postrm diff --git a/debian/libgtk2.0-common.dirs b/debian/libgtk2.0-common.dirs index 23445f30c6..3899d51c85 100644 --- a/debian/libgtk2.0-common.dirs +++ b/debian/libgtk2.0-common.dirs @@ -1,3 +1,2 @@ -usr/bin -usr/sbin -etc/gtk-2.0 +usr/share/locale +usr/share/themes diff --git a/debian/libgtk2.0-common.files b/debian/libgtk2.0-common.files index 4983200a6d..427f82fc3b 100644 --- a/debian/libgtk2.0-common.files +++ b/debian/libgtk2.0-common.files @@ -1,3 +1,2 @@ -usr/bin/gtk-query-immodules-2.0 -usr/bin/gdk-pixbuf-query-loaders -etc/gtk-2.0/* +/usr/share/locale/* +/usr/share/themes/* diff --git a/debian/libgtk2.0-data.dirs b/debian/libgtk2.0-data.dirs deleted file mode 100644 index 3899d51c85..0000000000 --- a/debian/libgtk2.0-data.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/locale -usr/share/themes diff --git a/debian/libgtk2.0-data.files b/debian/libgtk2.0-data.files deleted file mode 100644 index 427f82fc3b..0000000000 --- a/debian/libgtk2.0-data.files +++ /dev/null @@ -1,2 +0,0 @@ -/usr/share/locale/* -/usr/share/themes/* diff --git a/debian/rules b/debian/rules index 4574bab30b..1d38c09040 100644 --- a/debian/rules +++ b/debian/rules @@ -199,9 +199,9 @@ install: install-static install-shared # debian files install -m 755 $(CURDIR)/debian/update-gtk-immodules \ - $(CURDIR)/debian/libgtk$(apiver)-common/usr/sbin/ + $(CURDIR)/debian/libgtk$(apiver)-bin/usr/sbin/ install -m 755 $(CURDIR)/debian/update-gdkpixbuf-loaders \ - $(CURDIR)/debian/libgtk$(apiver)-common/usr/sbin/ + $(CURDIR)/debian/libgtk$(apiver)-bin/usr/sbin/ # don't need executable attribute for f in `find $(CURDIR)/debian/libgtk$(apiver)-$(soname)$(suffix)/usr/share/themes -type f`; do \ @@ -215,7 +215,7 @@ install: install-static install-shared -find $(CURDIR)/debian/ -type d -empty | xargs rmdir -p 2>&1 > /dev/null # don't delete /etc/gtk-2.0 - install -d $(CURDIR)/debian/libgtk$(apiver)-common/etc/gtk-$(apiver) + install -d $(CURDIR)/debian/libgtk$(apiver)-bin/etc/gtk-$(apiver) # Build architecture-independent files here. binary-indep: build install @@ -224,7 +224,7 @@ binary-indep: build install dh_installdocs -i - rm -rf $(CURDIR)/debian/libgtk$(apiver)-data/usr/share/doc/libgtk$(apiver)-data + rm -rf $(CURDIR)/debian/libgtk$(apiver)-common/usr/share/doc/libgtk$(apiver)-common dh_link -plibgtk$(apiver)-doc \ usr/share/doc/libglib$(glibver)-doc/glib \ @@ -238,9 +238,9 @@ binary-indep: build install dh_link -plibgtk$(apiver)-doc \ usr/share/doc/libpango$(pangover)-doc/pango \ usr/share/doc/libgtk$(apiver)-doc/pango - dh_link -plibgtk$(apiver)-data \ + dh_link -plibgtk$(apiver)-common \ usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \ - usr/share/doc/libgtk$(apiver)-data + usr/share/doc/libgtk$(apiver)-common # create symlinks in /usr/share/gtk-doc/html for i in gdk gdk-pixbuf gtk gtk-faq gtk-tutorial; do \ @@ -269,7 +269,7 @@ binary-arch: build install rm -rf $(CURDIR)/debian/libgtk$(apiver)-dbg/usr/share/doc/libgtk$(apiver)-dbg rm -rf $(CURDIR)/debian/libgtk$(apiver)-dev/usr/share/doc/libgtk$(apiver)-dev - rm -rf $(CURDIR)/debian/libgtk$(apiver)-common/usr/share/doc/libgtk$(apiver)-common + rm -rf $(CURDIR)/debian/libgtk$(apiver)-bin/usr/share/doc/libgtk$(apiver)-bin dh_link -plibgtk$(apiver)-dbg \ usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \ @@ -277,9 +277,9 @@ binary-arch: build install dh_link -plibgtk$(apiver)-dev \ usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \ usr/share/doc/libgtk$(apiver)-dev - dh_link -plibgtk$(apiver)-common \ + dh_link -plibgtk$(apiver)-bin \ usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \ - usr/share/doc/libgtk$(apiver)-common + usr/share/doc/libgtk$(apiver)-bin dh_installexamples -a