Merge lp:~jbicha/ubuntu/oneiric/gjs/1.30 into lp:ubuntu/oneiric/gjs

Proposed by Jeremy Bícha
Status: Merged
Merged at revision: 51
Proposed branch: lp:~jbicha/ubuntu/oneiric/gjs/1.30
Merge into: lp:ubuntu/oneiric/gjs
Diff against target: 114 lines (+18/-12)
3 files modified
configure (+10/-10)
configure.ac (+2/-2)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~jbicha/ubuntu/oneiric/gjs/1.30
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Ubuntu branches Pending
Review via email: mp+77632@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

looks good, thanks a lot Jeremy!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure'
2--- configure 2011-09-21 12:38:48 +0000
3+++ configure 2011-09-30 02:48:23 +0000
4@@ -1,6 +1,6 @@
5 #! /bin/sh
6 # Guess values for system-dependent variables and create Makefiles.
7-# Generated by GNU Autoconf 2.68 for gjs 1.29.18.
8+# Generated by GNU Autoconf 2.68 for gjs 1.30.0.
9 #
10 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gjs>.
11 #
12@@ -571,8 +571,8 @@
13 # Identity of this package.
14 PACKAGE_NAME='gjs'
15 PACKAGE_TARNAME='gjs'
16-PACKAGE_VERSION='1.29.18'
17-PACKAGE_STRING='gjs 1.29.18'
18+PACKAGE_VERSION='1.30.0'
19+PACKAGE_STRING='gjs 1.30.0'
20 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gjs'
21 PACKAGE_URL=''
22
23@@ -1375,7 +1375,7 @@
24 # Omit some internal or obsolete options to make the list less imposing.
25 # This message is too long to be a string in the A/UX 3.1 sh.
26 cat <<_ACEOF
27-\`configure' configures gjs 1.29.18 to adapt to many kinds of systems.
28+\`configure' configures gjs 1.30.0 to adapt to many kinds of systems.
29
30 Usage: $0 [OPTION]... [VAR=VALUE]...
31
32@@ -1445,7 +1445,7 @@
33
34 if test -n "$ac_init_help"; then
35 case $ac_init_help in
36- short | recursive ) echo "Configuration of gjs 1.29.18:";;
37+ short | recursive ) echo "Configuration of gjs 1.30.0:";;
38 esac
39 cat <<\_ACEOF
40
41@@ -1589,7 +1589,7 @@
42 test -n "$ac_init_help" && exit $ac_status
43 if $ac_init_version; then
44 cat <<\_ACEOF
45-gjs configure 1.29.18
46+gjs configure 1.30.0
47 generated by GNU Autoconf 2.68
48
49 Copyright (C) 2010 Free Software Foundation, Inc.
50@@ -2079,7 +2079,7 @@
51 This file contains any messages produced by compilers while
52 running configure, to aid debugging if configure makes a mistake.
53
54-It was created by gjs $as_me 1.29.18, which was
55+It was created by gjs $as_me 1.30.0, which was
56 generated by GNU Autoconf 2.68. Invocation command line was
57
58 $ $0 $@
59@@ -2894,7 +2894,7 @@
60
61 # Define the identity of the package.
62 PACKAGE='gjs'
63- VERSION='1.29.18'
64+ VERSION='1.30.0'
65
66
67 cat >>confdefs.h <<_ACEOF
68@@ -17790,7 +17790,7 @@
69 # report actual input values of CONFIG_FILES etc. instead of their
70 # values after options handling.
71 ac_log="
72-This file was extended by gjs $as_me 1.29.18, which was
73+This file was extended by gjs $as_me 1.30.0, which was
74 generated by GNU Autoconf 2.68. Invocation command line was
75
76 CONFIG_FILES = $CONFIG_FILES
77@@ -17856,7 +17856,7 @@
78 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
79 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
80 ac_cs_version="\\
81-gjs config.status 1.29.18
82+gjs config.status 1.30.0
83 configured by $0, generated by GNU Autoconf 2.68,
84 with options \\"\$ac_cs_config\\"
85
86
87=== modified file 'configure.ac'
88--- configure.ac 2011-09-21 12:38:48 +0000
89+++ configure.ac 2011-09-30 02:48:23 +0000
90@@ -2,8 +2,8 @@
91 # Process this file with autoconf to produce a configure script.
92
93 m4_define(pkg_major_version, 1)
94-m4_define(pkg_minor_version, 29)
95-m4_define(pkg_micro_version, 18)
96+m4_define(pkg_minor_version, 30)
97+m4_define(pkg_micro_version, 0)
98 m4_define(pkg_version, pkg_major_version.pkg_minor_version.pkg_micro_version)
99
100 AC_PREREQ(2.61)
101
102=== modified file 'debian/changelog'
103--- debian/changelog 2011-09-21 12:38:48 +0000
104+++ debian/changelog 2011-09-30 02:48:23 +0000
105@@ -1,3 +1,9 @@
106+gjs (1.30.0-0ubuntu1) UNRELEASED; urgency=low
107+
108+ * New upstream stable release.
109+
110+ -- Jeremy Bicha <jbicha@ubuntu.com> Thu, 29 Sep 2011 22:42:12 -0400
111+
112 gjs (1.29.18-0ubuntu1) oneiric; urgency=low
113
114 * New upstream release.

Subscribers

People subscribed via source and target branches

to all changes: