r30201 - in /desktop/experimental/gucharmap: ./ debian/changelog debian/control debian/control.in debian/libgucharmap2-dev.install debian/libgucharmap7.install debian/libgucharmap7.symbols debian/rules debian/watch

jordi at users.alioth.debian.org jordi at users.alioth.debian.org
Wed Oct 12 20:02:27 UTC 2011


Author: jordi
Date: Wed Oct 12 20:02:26 2011
New Revision: 30201

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30201
Log:
* New upstream release.
* debian/watch: track .xz tarballs.
* Drop libgucharmap7 and libgucharmap2-dev, GTK+2 is no longer
  supported.

Added:
    desktop/experimental/gucharmap/
      - copied from r30180, desktop/unstable/gucharmap/
Removed:
    desktop/experimental/gucharmap/debian/libgucharmap2-dev.install
    desktop/experimental/gucharmap/debian/libgucharmap7.install
    desktop/experimental/gucharmap/debian/libgucharmap7.symbols
Modified:
    desktop/experimental/gucharmap/debian/changelog
    desktop/experimental/gucharmap/debian/control
    desktop/experimental/gucharmap/debian/control.in
    desktop/experimental/gucharmap/debian/rules
    desktop/experimental/gucharmap/debian/watch

Modified: desktop/experimental/gucharmap/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/changelog?rev=30201&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/changelog [utf-8] (original)
+++ desktop/experimental/gucharmap/debian/changelog [utf-8] Wed Oct 12 20:02:26 2011
@@ -1,3 +1,12 @@
+gucharmap (1:3.2.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/watch: track .xz tarballs.
+  * Drop libgucharmap7 and libgucharmap2-dev, GTK+2 is no longer
+    supported.
+
+ -- Jordi Mallach <jordi at debian.org>  Tue, 11 Oct 2011 18:38:40 +0200
+
 gucharmap (1:3.0.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/experimental/gucharmap/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/control?rev=30201&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/control [utf-8] (original)
+++ desktop/experimental/gucharmap/debian/control [utf-8] Wed Oct 12 20:02:26 2011
@@ -7,14 +7,13 @@
 Section: gnome
 Priority: optional
 Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: David Weinehall <tao at debian.org>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Luca Falavigna <dktrkranz at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: David Weinehall <tao at debian.org>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 8),
                gobject-introspection (>= 0.9.0),
                libgirepository1.0-dev (>= 0.9.0),
                gir1.2-pango-1.0,
                gir1.2-gtk-3.0,
-               libgtk2.0-dev (>= 2.14.0),
                libgtk-3-dev (>= 3.0.0),
                libglib2.0-dev (>= 2.16.3),
                libgconf2-dev,
@@ -25,8 +24,7 @@
                gtk-doc-tools (>= 1.0),
                intltool (>= 0.40),
                gconf2,
-               libglib2.0-doc,
-               libgtk2.0-doc
+               libglib2.0-doc
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gucharmap
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/gucharmap
@@ -44,35 +42,6 @@
  their detailed properties.  It is an easy way to find the character
  you might only know by its Unicode name or code point.
 
-Package: libgucharmap2-dev
-Section: libdevel
-Architecture: any
-Depends: libgucharmap7 (= ${binary:Version}),
-         ${misc:Depends},
-         libgtk2.0-dev,
-         libglib2.0-dev,
-         libgconf2-dev
-Replaces: libgucharmap-dev
-Conflicts: libgucharmap-dev
-Description: Unicode browser widget library (development headers for GTK+ 2)
- The libgucharmap library contains a Unicode browser widget; it is
- most prominently used by the "gucharmap" program.  See the package of
- the same name for more information.
- .
- This package contains the development headers for the GTK+ 2 version.
-
-Package: libgucharmap7
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: Unicode browser widget library (shared library for GTK+ 2)
- The libgucharmap library contains a Unicode browser widget; it is
- most prominently used by the "gucharmap" program.  See the package of
- the same name for more information.
- .
- This package contains the shared library for the GTK+ 2 version.
-
 Package: libgucharmap-2-90-dev
 Section: libdevel
 Architecture: any
@@ -84,24 +53,24 @@
          libgconf2-dev
 Replaces: libgucharmap-dev
 Conflicts: libgucharmap-dev
-Description: Unicode browser widget library (development headers for GTK+ 3)
+Description: Unicode browser widget library (development headers)
  The libgucharmap library contains a Unicode browser widget; it is
  most prominently used by the "gucharmap" program.  See the package of
  the same name for more information.
  .
- This package contains the development headers for the GTK+ 3 version.
+ This package contains the development headers.
 
 Package: libgucharmap-2-90-7
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Description: Unicode browser widget library (shared library for GTK+ 3)
+Description: Unicode browser widget library (shared library)
  The libgucharmap library contains a Unicode browser widget; it is
  most prominently used by the "gucharmap" program.  See the package of
  the same name for more information.
  .
- This package contains the shared library for the GTK+ 3 version.
+ This package contains the shared library.
 
 Package: gir1.2-gucharmap-2.90
 Section: libs

Modified: desktop/experimental/gucharmap/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/control.in?rev=30201&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/control.in [utf-8] (original)
+++ desktop/experimental/gucharmap/debian/control.in [utf-8] Wed Oct 12 20:02:26 2011
@@ -9,7 +9,6 @@
                libgirepository1.0-dev (>= 0.9.0),
                gir1.2-pango-1.0,
                gir1.2-gtk-3.0,
-               libgtk2.0-dev (>= 2.14.0),
                libgtk-3-dev (>= 3.0.0),
                libglib2.0-dev (>= 2.16.3),
                libgconf2-dev,
@@ -20,8 +19,7 @@
                gtk-doc-tools (>= 1.0),
                intltool (>= 0.40),
                gconf2,
-               libglib2.0-doc,
-               libgtk2.0-doc
+               libglib2.0-doc
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gucharmap
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/gucharmap
@@ -39,35 +37,6 @@
  their detailed properties.  It is an easy way to find the character
  you might only know by its Unicode name or code point.
 
-Package: libgucharmap2-dev
-Section: libdevel
-Architecture: any
-Depends: libgucharmap7 (= ${binary:Version}),
-         ${misc:Depends},
-         libgtk2.0-dev,
-         libglib2.0-dev,
-         libgconf2-dev
-Replaces: libgucharmap-dev
-Conflicts: libgucharmap-dev
-Description: Unicode browser widget library (development headers for GTK+ 2)
- The libgucharmap library contains a Unicode browser widget; it is
- most prominently used by the "gucharmap" program.  See the package of
- the same name for more information.
- .
- This package contains the development headers for the GTK+ 2 version.
-
-Package: libgucharmap7
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: Unicode browser widget library (shared library for GTK+ 2)
- The libgucharmap library contains a Unicode browser widget; it is
- most prominently used by the "gucharmap" program.  See the package of
- the same name for more information.
- .
- This package contains the shared library for the GTK+ 2 version.
-
 Package: libgucharmap-2-90-dev
 Section: libdevel
 Architecture: any
@@ -79,24 +48,24 @@
          libgconf2-dev
 Replaces: libgucharmap-dev
 Conflicts: libgucharmap-dev
-Description: Unicode browser widget library (development headers for GTK+ 3)
+Description: Unicode browser widget library (development headers)
  The libgucharmap library contains a Unicode browser widget; it is
  most prominently used by the "gucharmap" program.  See the package of
  the same name for more information.
  .
- This package contains the development headers for the GTK+ 3 version.
+ This package contains the development headers.
 
 Package: libgucharmap-2-90-7
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Description: Unicode browser widget library (shared library for GTK+ 3)
+Description: Unicode browser widget library (shared library)
  The libgucharmap library contains a Unicode browser widget; it is
  most prominently used by the "gucharmap" program.  See the package of
  the same name for more information.
  .
- This package contains the shared library for the GTK+ 3 version.
+ This package contains the shared library.
 
 Package: gir1.2-gucharmap-2.90
 Section: libs

Modified: desktop/experimental/gucharmap/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/rules?rev=30201&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/rules [utf-8] (original)
+++ desktop/experimental/gucharmap/debian/rules [utf-8] Wed Oct 12 20:02:26 2011
@@ -8,34 +8,11 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_BUILDDIR := $(CURDIR)/debian/build/gtk2
-DEB_BUILDDIR_gucharmap := $(CURDIR)/debian/build/gtk3
-DEB_DESTDIR := $(CURDIR)/debian/tmp-gtk2
-DEB_DESTDIR_gucharmap := $(CURDIR)/debian/tmp
-
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc
-
-configure/gucharmap:: $(DEB_BUILDDIR_gucharmap)/config.status
-$(DEB_BUILDDIR_gucharmap)/config.status:
-	cd $(DEB_BUILDDIR_gucharmap) && \
-		$(DEB_CONFIGURE_SCRIPT_ENV) $(DEB_CONFIGURE_SCRIPT) \
-			$(DEB_CONFIGURE_NORMAL_ARGS) \
-			$(cdbs_configure_flags) \
-			$(DEB_CONFIGURE_EXTRA_FLAGS) \
-			--with-gtk=3.0 \
-			--enable-introspection \
-			$(DEB_CONFIGURE_USER_FLAGS)
-
-build/gucharmap::
-	make -C $(DEB_BUILDDIR_gucharmap)
-
-install/gucharmap::
-	make -C $(DEB_BUILDDIR_gucharmap) install DESTDIR=$(DEB_DESTDIR_gucharmap)
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc \
+			     --enable-introspection
 
 clean::
 	rm -f intltool-extract intltool-merge intltool-update
 	rm -f po/.intltool-merge-cache
-	rm -rf $(DEB_BUILDDIR) $(DEB_BUILDDIR_gucharmap)
-	rm -rf $(DEB_DESTDIR) $(DEB_DESTDIR_gucharmap)
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed

Modified: desktop/experimental/gucharmap/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/watch?rev=30201&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/watch [utf-8] (original)
+++ desktop/experimental/gucharmap/debian/watch [utf-8] Wed Oct 12 20:02:26 2011
@@ -1,3 +1,3 @@
 version=3
 http://download.gnome.org/sources/gucharmap/([\d\.]+)[02468]/ \
-	gucharmap-(.*)\.tar\.bz2
+	gucharmap-(.*)\.tar\.xz




More information about the pkg-gnome-commits mailing list