Merge lp:~noskcaj/synaptic/synaptic into lp:synaptic
- synaptic
- Merge into trunk
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp:~noskcaj/synaptic/synaptic |
| Merge into: | lp:synaptic |
| Diff against target: |
1046 lines (+360/-328) 24 files modified
COPYING (+21/-22) acinclude.m4 (+1/-1) autogen.sh (+1/-1) common/Makefile.am (+1/-1) configure.ac (+243/-0) configure.in (+0/-242) debian/changelog (+10/-0) debian/control (+21/-1) debian/copyright (+28/-28) debian/install (+0/-4) debian/rules (+1/-1) debian/synaptic-common.dirs (+3/-0) debian/synaptic-common.install (+3/-0) debian/synaptic.dirs (+0/-3) debian/synaptic.install (+3/-0) gtk/Makefile.am (+1/-1) macros/Makefile (+1/-1) macros/Makefile.in (+1/-1) macros/autogen.sh (+12/-12) macros/curses.m4 (+3/-3) macros/gnome-gettext.m4 (+1/-1) macros/gnome-libgtop-check.m4 (+2/-2) pre-build.sh (+2/-2) tests/Makefile.am (+1/-1) |
| To merge this branch: | bzr merge lp:~noskcaj/synaptic/synaptic |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| synaptic-developers | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
Many minor improvements, then in the last commit i split the package into synaptic and synaptic-common. Please ignore the last commit if you think that is a bad idea.
FYI: build-flags (and as a result, debhelper 9) cannot be enabled for some reason.
To post a comment you must log in.
Unmerged revisions
- 2148. By Jackson Doak
-
Split synaptic into synaptic and synaptic-common
- 2147. By Jackson Doak
-
update autotools files
- 2146. By Jackson Doak
-
Finish configure.ac transition
- 2145. By Jackson Doak
-
Rename configure.in to configure.ac
- 2144. By Jackson Doak
-
Update COPYING to latest GPL v2
- 2143. By Jackson Doak
-
Use debian copyright format 1.0
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'COPYING' |
| 2 | --- COPYING 2004-11-21 16:33:06 +0000 |
| 3 | +++ COPYING 2013-10-12 20:38:26 +0000 |
| 4 | @@ -1,12 +1,12 @@ |
| 5 | - GNU GENERAL PUBLIC LICENSE |
| 6 | - Version 2, June 1991 |
| 7 | + GNU GENERAL PUBLIC LICENSE |
| 8 | + Version 2, June 1991 |
| 9 | |
| 10 | - Copyright (C) 1989, 1991 Free Software Foundation, Inc. |
| 11 | - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 12 | + Copyright (C) 1989, 1991 Free Software Foundation, Inc., |
| 13 | + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 14 | Everyone is permitted to copy and distribute verbatim copies |
| 15 | of this license document, but changing it is not allowed. |
| 16 | |
| 17 | - Preamble |
| 18 | + Preamble |
| 19 | |
| 20 | The licenses for most software are designed to take away your |
| 21 | freedom to share and change it. By contrast, the GNU General Public |
| 22 | @@ -15,7 +15,7 @@ |
| 23 | General Public License applies to most of the Free Software |
| 24 | Foundation's software and to any other program whose authors commit to |
| 25 | using it. (Some other Free Software Foundation software is covered by |
| 26 | -the GNU Library General Public License instead.) You can apply it to |
| 27 | +the GNU Lesser General Public License instead.) You can apply it to |
| 28 | your programs, too. |
| 29 | |
| 30 | When we speak of free software, we are referring to freedom, not |
| 31 | @@ -55,8 +55,8 @@ |
| 32 | |
| 33 | The precise terms and conditions for copying, distribution and |
| 34 | modification follow. |
| 35 | - |
| 36 | |
| 37 | - GNU GENERAL PUBLIC LICENSE |
| 38 | + |
| 39 | + GNU GENERAL PUBLIC LICENSE |
| 40 | TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION |
| 41 | |
| 42 | 0. This License applies to any program or other work which contains |
| 43 | @@ -110,7 +110,7 @@ |
| 44 | License. (Exception: if the Program itself is interactive but |
| 45 | does not normally print such an announcement, your work based on |
| 46 | the Program is not required to print an announcement.) |
| 47 | - |
| 48 | |
| 49 | + |
| 50 | These requirements apply to the modified work as a whole. If |
| 51 | identifiable sections of that work are not derived from the Program, |
| 52 | and can be reasonably considered independent and separate works in |
| 53 | @@ -168,7 +168,7 @@ |
| 54 | access to copy the source code from the same place counts as |
| 55 | distribution of the source code, even though third parties are not |
| 56 | compelled to copy the source along with the object code. |
| 57 | - |
| 58 | |
| 59 | + |
| 60 | 4. You may not copy, modify, sublicense, or distribute the Program |
| 61 | except as expressly provided under this License. Any attempt |
| 62 | otherwise to copy, modify, sublicense or distribute the Program is |
| 63 | @@ -225,7 +225,7 @@ |
| 64 | |
| 65 | This section is intended to make thoroughly clear what is believed to |
| 66 | be a consequence of the rest of this License. |
| 67 | - |
| 68 | |
| 69 | + |
| 70 | 8. If the distribution and/or use of the Program is restricted in |
| 71 | certain countries either by patents or by copyrighted interfaces, the |
| 72 | original copyright holder who places the Program under this License |
| 73 | @@ -255,7 +255,7 @@ |
| 74 | of preserving the free status of all derivatives of our free software and |
| 75 | of promoting the sharing and reuse of software generally. |
| 76 | |
| 77 | - NO WARRANTY |
| 78 | + NO WARRANTY |
| 79 | |
| 80 | 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY |
| 81 | FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN |
| 82 | @@ -277,9 +277,9 @@ |
| 83 | PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE |
| 84 | POSSIBILITY OF SUCH DAMAGES. |
| 85 | |
| 86 | - END OF TERMS AND CONDITIONS |
| 87 | - |
| 88 | |
| 89 | - How to Apply These Terms to Your New Programs |
| 90 | + END OF TERMS AND CONDITIONS |
| 91 | + |
| 92 | + How to Apply These Terms to Your New Programs |
| 93 | |
| 94 | If you develop a new program, and you want it to be of the greatest |
| 95 | possible use to the public, the best way to achieve this is to make it |
| 96 | @@ -303,17 +303,16 @@ |
| 97 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 98 | GNU General Public License for more details. |
| 99 | |
| 100 | - You should have received a copy of the GNU General Public License |
| 101 | - along with this program; if not, write to the Free Software |
| 102 | - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 103 | - |
| 104 | + You should have received a copy of the GNU General Public License along |
| 105 | + with this program; if not, write to the Free Software Foundation, Inc., |
| 106 | + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
| 107 | |
| 108 | Also add information on how to contact you by electronic and paper mail. |
| 109 | |
| 110 | If the program is interactive, make it output a short notice like this |
| 111 | when it starts in an interactive mode: |
| 112 | |
| 113 | - Gnomovision version 69, Copyright (C) year name of author |
| 114 | + Gnomovision version 69, Copyright (C) year name of author |
| 115 | Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. |
| 116 | This is free software, and you are welcome to redistribute it |
| 117 | under certain conditions; type `show c' for details. |
| 118 | @@ -336,5 +335,5 @@ |
| 119 | This General Public License does not permit incorporating your program into |
| 120 | proprietary programs. If your program is a subroutine library, you may |
| 121 | consider it more useful to permit linking proprietary applications with the |
| 122 | -library. If this is what you want to do, use the GNU Library General |
| 123 | -Public License instead of this License. |
| 124 | +library. If this is what you want to do, use the GNU Lesser General |
| 125 | +Public License instead of this License. |
| 126 | \ No newline at end of file |
| 127 | |
| 128 | === modified file 'acinclude.m4' |
| 129 | --- acinclude.m4 2003-02-02 17:10:39 +0000 |
| 130 | +++ acinclude.m4 2013-10-12 20:38:26 +0000 |
| 131 | @@ -254,7 +254,7 @@ |
| 132 | |
| 133 | dnl These rules are solely for the distribution goal. While doing this |
| 134 | dnl we only have to keep exactly one list of the available catalogs |
| 135 | - dnl in configure.in. |
| 136 | + dnl in configure.ac. |
| 137 | for lang in $ALL_LINGUAS; do |
| 138 | GMOFILES="$GMOFILES $lang.gmo" |
| 139 | POFILES="$POFILES $lang.po" |
| 140 | |
| 141 | === modified file 'autogen.sh' |
| 142 | --- autogen.sh 2006-02-24 09:49:58 +0000 |
| 143 | +++ autogen.sh 2013-10-12 20:38:26 +0000 |
| 144 | @@ -8,7 +8,7 @@ |
| 145 | |
| 146 | PKG_NAME="synaptic" |
| 147 | |
| 148 | -(test -f $srcdir/configure.in \ |
| 149 | +(test -f $srcdir/configure.ac \ |
| 150 | && test -f $srcdir/ChangeLog \ |
| 151 | && test -d $srcdir/gtk) || { |
| 152 | echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" |
| 153 | |
| 154 | === modified file 'common/Makefile.am' |
| 155 | --- common/Makefile.am 2010-11-12 19:15:27 +0000 |
| 156 | +++ common/Makefile.am 2013-10-12 20:38:26 +0000 |
| 157 | @@ -2,7 +2,7 @@ |
| 158 | |
| 159 | noinst_LIBRARIES = libsynaptic.a |
| 160 | |
| 161 | -INCLUDES = -I/usr/include/apt-pkg @RPM_HDRS@ @DEB_HDRS@ @GTK_CFLAGS@ \ |
| 162 | +AM_CPPFLAGS = -I/usr/include/apt-pkg @RPM_HDRS@ @DEB_HDRS@ @GTK_CFLAGS@ \ |
| 163 | $(LIBEPT_CFLAGS) \ |
| 164 | -DSYNAPTICLOCALEDIR=\""$(synapticlocaledir)"\" \ |
| 165 | -DSYNAPTICSTATEDIR=\""$(localstatedir)"\" |
| 166 | |
| 167 | === added file 'configure.ac' |
| 168 | --- configure.ac 1970-01-01 00:00:00 +0000 |
| 169 | +++ configure.ac 2013-10-12 20:38:26 +0000 |
| 170 | @@ -0,0 +1,243 @@ |
| 171 | +dnl Process this file with autoconf to produce a configure script. |
| 172 | +AC_INIT(synaptic, 0.80.5) |
| 173 | +AC_CONFIG_SRCDIR(configure.ac) |
| 174 | + |
| 175 | +AM_INIT_AUTOMAKE |
| 176 | +AM_CONFIG_HEADER(config.h) |
| 177 | +AM_MAINTAINER_MODE |
| 178 | + |
| 179 | +dnl Checks for programs. |
| 180 | +AC_ISC_POSIX |
| 181 | +AC_PROG_CC |
| 182 | +AM_PROG_CC_STDC |
| 183 | +AC_HEADER_STDC |
| 184 | +AC_PROG_CXX |
| 185 | +AC_PROG_MAKE_SET |
| 186 | +AC_PROG_RANLIB |
| 187 | + |
| 188 | +dnl generated with: cd po;for i in $(ls *.po); do echo -n "${i%%.po} "; done |
| 189 | +dnl i18n |
| 190 | +ALL_LINGUAS="af am ar ast az be@latin be bg bn bo br bs ca ca@valencia ckb crh csb cs cy da de_DE de dv el en_AU en_CA en_GB eo es et eu fa fil fi fo fr fur fy ga gl gu gv he hi hr ht hu hy ia id is it ja ka km kn ko ku ky la lo lt lv mk ml mr ms my nb nds ne nl_NL nl nn no oc pa pl ps pt_BR pt pt_PT qu ro ru sc si sk sl sq sr@Latn sr sv ta_LK ta te tet th tl tr tt ug uk ur uz vi xh zh_CN zh_HK zh_TW" |
| 191 | +AM_GLIB_GNU_GETTEXT |
| 192 | +GETTEXT_PACKAGE=synaptic |
| 193 | +AC_SUBST(GETTEXT_PACKAGE) |
| 194 | +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",[description]) |
| 195 | +AC_PROG_INTLTOOL([0.23]) |
| 196 | +synapticlocaledir='${prefix}/${DATADIRNAME}/locale' |
| 197 | +AC_SUBST(synapticlocaledir) |
| 198 | + |
| 199 | + |
| 200 | +dnl ask for wings |
| 201 | +dnl AC_ARG_WITH(wings, |
| 202 | +dnl [--with-wings build with WINGs gui (obsolete)], |
| 203 | +dnl [AC_CHECK_PROG(WINGS, get-wings-flags, yes, no) |
| 204 | +dnl if test x"$WINGS" == xno; then |
| 205 | +dnl AC_MSG_ERROR([WINGs is not installed]) |
| 206 | +dnl fi |
| 207 | +dnl ] |
| 208 | +dnl ) |
| 209 | +dnl if test x"$WINGS" = xyes; then |
| 210 | +dnl BUILD_wings="wings" |
| 211 | +dnl WINGS_LIBS=`get-wings-flags --ldflags` |
| 212 | +dnl WINGS_LIBS="$GUI_LIBS `get-wings-flags --libs`" |
| 213 | +dnl WINGS_HDRS=`get-wings-flags --cflags` |
| 214 | +dnl AC_SUBST(WINGS_LIBS) |
| 215 | +dnl AC_SUBST(WINGS_HDRS) |
| 216 | +dnl fi |
| 217 | +dnl AC_SUBST(BUILD_wings) |
| 218 | + |
| 219 | +dnl we build for gtk3 by default now |
| 220 | +pkg_modules="gtk+-3.0 >= 2.91.0, pango >= 1.0.0, glib-2.0" |
| 221 | +vte_modules="vte-2.90" |
| 222 | + |
| 223 | +PKG_CHECK_MODULES(GTK, [$pkg_modules]) |
| 224 | +BUILD_gtk="gtk" |
| 225 | + |
| 226 | +AC_SUBST(GTK_CFLAGS) |
| 227 | +AC_SUBST(GTK_LIBS) |
| 228 | +AC_SUBST(BUILD_gtk) |
| 229 | + |
| 230 | +dnl if test x"$WINGS" = xno; then |
| 231 | +if test x"$GTK" = xno; then |
| 232 | + AC_MSG_ERROR([ Gtk is not installed, you need to install it to get a GUI]) |
| 233 | +fi |
| 234 | +dnl fi |
| 235 | + |
| 236 | + |
| 237 | + |
| 238 | + |
| 239 | +dnl Check for rpm version |
| 240 | +dnl ===================== |
| 241 | +rpm_version="none" |
| 242 | +AC_MSG_CHECKING(RPM version) |
| 243 | +SAVE_LIBS="$LIBS" |
| 244 | +SAVE_CPPFLAGS="$CPPFLAGS" |
| 245 | + |
| 246 | +RPM_HDRS="" |
| 247 | +LIBS="$SAVE_LIBS -lrpmio -lrpmdb -lpopt" |
| 248 | +CPPFLAGS="$SAVE_CPPFLAGS -I/usr/include/rpm" |
| 249 | +AC_CHECK_HEADER(rpm/rpmlib.h, |
| 250 | + [AC_CHECK_LIB(rpm,rpmdbInitIterator, |
| 251 | + [AC_DEFINE(HAVE_RPM, 1, [whether RPM is present]) |
| 252 | + RPM_LIBS="-lrpm -lrpmio -lrpmdb -lpopt" |
| 253 | + SAVE_CPPFLAGS="$SAVE_CPPFLAGS -I/usr/include/rpm" |
| 254 | + RPM_HDRS="-I/usr/include/rpm" |
| 255 | + rpm_version="4"])]) |
| 256 | + |
| 257 | +if test $rpm_version = "none"; then |
| 258 | +LIBS="$SAVE_LIBS -lpopt" |
| 259 | +CPPFLAGS="$SAVE_CPPFLAGS -I/usr/include/rpm" |
| 260 | +AC_CHECK_HEADER(rpm/rpmlib.h, |
| 261 | + [AC_CHECK_LIB(rpm,rpmdbOpen, |
| 262 | + [AC_DEFINE(HAVE_RPM, 1, [wheter RPM is present]) |
| 263 | + RPM_LIBS="-lrpm -lpopt" |
| 264 | + SAVE_CPPFLAGS="$SAVE_CPPFLAGS -I/usr/include/rpm" |
| 265 | + RPM_HDRS="-I/usr/include/rpm" |
| 266 | + rpm_version="3"])]) |
| 267 | +fi |
| 268 | + |
| 269 | +AC_SUBST(RPM_LIBS) |
| 270 | +AC_SUBST(RPM_HDRS) |
| 271 | +CPPFLAGS="$SAVE_CPPFLAGS" |
| 272 | +LIBS="$SAVE_LIBS" |
| 273 | +AC_MSG_RESULT("RPM version is $rpm_version") |
| 274 | + |
| 275 | +AC_MSG_CHECKING(for --enable-scripts) |
| 276 | +AC_ARG_ENABLE([scripts], |
| 277 | + AC_HELP_STRING(--enable-scripts, enable the extension system), |
| 278 | + [enable_scripts="$enableval"],[enable_scripts="no"]) |
| 279 | +if test "$enable_scripts" != "no"; then |
| 280 | + AC_MSG_RESULT(no) |
| 281 | + AC_DEFINE(WITH_LUA, 1, |
| 282 | + [Define if you want to enable the extension system.]) |
| 283 | +else |
| 284 | + AC_MSG_RESULT(yes) |
| 285 | +fi |
| 286 | +AM_CONDITIONAL(WITH_LUA, test "$enable_scripts" != "no") |
| 287 | + |
| 288 | +DEB_HDRS="" |
| 289 | +AC_SUBST(DEB_HDRS) |
| 290 | +DEB_LIBS="-lapt-inst" |
| 291 | +AC_SUBST(DEB_LIBS) |
| 292 | + |
| 293 | +dnl Checks for header files. |
| 294 | +AC_HEADER_STDC |
| 295 | +AC_CHECK_HEADERS(unistd.h libintl.h iconv.h) |
| 296 | + |
| 297 | +# check apt configuration |
| 298 | +AC_LANG([C++]) |
| 299 | +# bail out if we don't have apts headers |
| 300 | +AC_CHECK_HEADER(apt-pkg/configuration.h, [], |
| 301 | + AC_ERROR([You need the apt-pkg headers installed to compile synaptic.])) |
| 302 | + |
| 303 | +# if metaindex is there we use a apt with authentication support |
| 304 | +AC_CHECK_HEADER(apt-pkg/metaindex.h, |
| 305 | + AC_DEFINE(WITH_APT_AUTH, 1, [build with apt auth support] ) |
| 306 | +) |
| 307 | +# check if we have apts new-style cdrom.h |
| 308 | +AC_CHECK_HEADER(apt-pkg/cdrom.h, |
| 309 | + AC_DEFINE(HAVE_APTPKG_CDROM, 1, |
| 310 | + [whether apt-pkg/cdrom.h is present]) ) |
| 311 | + |
| 312 | +# check and use libept if available |
| 313 | +PKG_CHECK_MODULES([LIBEPT], [libept >= 1.0], |
| 314 | + [AC_DEFINE(WITH_EPT, 1, [build with libept]) |
| 315 | + AC_SUBST(LIBEPT_CFLAGS) |
| 316 | + AC_SUBST(LIBEPT_LIBS) |
| 317 | + ], |
| 318 | + [AC_MSG_NOTICE([no libept found, building without]) |
| 319 | + ]) |
| 320 | + |
| 321 | +AC_LANG([C]) |
| 322 | + |
| 323 | +dnl Checks for typedefs, structures, and compiler characteristics. |
| 324 | +AC_C_CONST |
| 325 | +AC_C_INLINE |
| 326 | + |
| 327 | +dnl Checks for library functions. |
| 328 | +AC_FUNC_STRCOLL |
| 329 | +AC_CHECK_FUNCS(regcomp strdup iconv) |
| 330 | + |
| 331 | +# use vte if available |
| 332 | +# vte_module is set above in the gtk3 test |
| 333 | +PKG_CHECK_MODULES(VTE, [$vte_modules], |
| 334 | + [AC_DEFINE(HAVE_VTE, 1, [build with VTE as output terminal]) |
| 335 | + AC_DEFINE(HAVE_TERMINAL, 1, [build with a terminal widget]) |
| 336 | + AC_SUBST(VTE_CFLAGS) |
| 337 | + AC_SUBST(VTE_LIBS) |
| 338 | + ], |
| 339 | + [AC_MSG_NOTICE([no vte found, building without]) |
| 340 | + ]) |
| 341 | + |
| 342 | +# use dpkg progress by default unless the user disables it |
| 343 | +AC_ARG_WITH(dpkg-progress, |
| 344 | + [ --without-dpkg-progress build without support for dpkg progress bar], |
| 345 | + [], |
| 346 | + [with_dpkg_progress=yes]) |
| 347 | +# if dpkg-progress is used, we need vte, so check that here |
| 348 | +# (FIXME: is this actually true? we could build without terminal and progress |
| 349 | +# bar only) |
| 350 | +AS_IF([test "x$with_dpkg_progress" != xno], |
| 351 | + [PKG_CHECK_MODULES(VTE, [$vte_modules], |
| 352 | + [], |
| 353 | + [AC_MSG_FAILURE([dpkg-progress requires vte, you can build without vte when using --without-dpkg-progress]) |
| 354 | + ]) |
| 355 | + AC_DEFINE(WITH_DPKG_STATUSFD, 1, [build with dpkg progress bar]) |
| 356 | + ], |
| 357 | + []) |
| 358 | + |
| 359 | +# launchpad integration |
| 360 | +AC_ARG_WITH(launchpad-integration, |
| 361 | + [ --with-launchpad-integration build with launchpad-integration], |
| 362 | + [PKG_CHECK_MODULES(LP, ["launchpad-integration"]) |
| 363 | + AC_DEFINE(WITH_LAUNCHPAD_INTEGRATION, 1, [build with launchpad-integration]) |
| 364 | + AC_SUBST(LP_CFLAGS) |
| 365 | + AC_SUBST(LP_LIBS) |
| 366 | + ] |
| 367 | +) |
| 368 | + |
| 369 | +AC_ARG_WITH(pkg-hold, |
| 370 | + [ --with-pkg-hold build with experimental package "hold" feature], |
| 371 | + AC_DEFINE(SYNAPTIC_PKG_HOLD, 1, [build with package pin feature] ) |
| 372 | +) |
| 373 | + |
| 374 | +AC_ARG_WITH(gtk-disable-deprecated, |
| 375 | + [ --with-gtk-disable-deprecated build with -DGTK_DISABLE_DEPRECATED], |
| 376 | + [GTK_DISABLE_DEPRECATED="-DGTK_DISABLE_DEPRECATED" |
| 377 | + AC_SUBST(GTK_DISABLE_DEPRECATED)] |
| 378 | +) |
| 379 | + |
| 380 | +#use multiarch unless the user disables it |
| 381 | +AC_ARG_WITH(apt-multiarch-support, |
| 382 | + [ --without-apt-multiarch-support build without support for apt multiarch], |
| 383 | + [], [with_apt_multiarch_support=yes]) |
| 384 | +AS_IF([test "x$with_apt_multiarch_support" != "xno"], |
| 385 | + [AC_DEFINE(WITH_APT_MULTIARCH_SUPPORT, 1, [build with multiarch])] |
| 386 | + ) |
| 387 | + |
| 388 | + |
| 389 | +AC_OUTPUT([ |
| 390 | +tests/Makefile |
| 391 | +common/Makefile |
| 392 | +gtk/Makefile |
| 393 | +gtk/gtkbuilder/Makefile |
| 394 | +data/Makefile |
| 395 | +man/Makefile |
| 396 | +pixmaps/Makefile |
| 397 | +pixmaps/hicolor/Makefile |
| 398 | +pixmaps/hicolor/16x16/Makefile |
| 399 | +pixmaps/hicolor/24x24/Makefile |
| 400 | +po/Makefile.in |
| 401 | +help/Makefile |
| 402 | +help/C/Makefile |
| 403 | +help/es/Makefile |
| 404 | +help/sv/Makefile |
| 405 | +doc/Makefile |
| 406 | +doc/html/Makefile |
| 407 | +doc/html/C/Makefile |
| 408 | +doc/html/es/Makefile |
| 409 | +doc/html/sv/Makefile |
| 410 | +Makefile |
| 411 | +],[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]) |
| 412 | + |
| 413 | + |
| 414 | |
| 415 | === removed file 'configure.in' |
| 416 | --- configure.in 2012-12-12 13:19:15 +0000 |
| 417 | +++ configure.in 1970-01-01 00:00:00 +0000 |
| 418 | @@ -1,242 +0,0 @@ |
| 419 | -dnl Process this file with autoconf to produce a configure script. |
| 420 | -AC_INIT(configure.in) |
| 421 | - |
| 422 | -AM_INIT_AUTOMAKE(synaptic, 0.75.5) |
| 423 | -AM_CONFIG_HEADER(config.h) |
| 424 | -AM_MAINTAINER_MODE |
| 425 | - |
| 426 | -dnl Checks for programs. |
| 427 | -AC_ISC_POSIX |
| 428 | -AC_PROG_CC |
| 429 | -AM_PROG_CC_STDC |
| 430 | -AC_HEADER_STDC |
| 431 | -AC_PROG_CXX |
| 432 | -AC_PROG_MAKE_SET |
| 433 | -AC_PROG_RANLIB |
| 434 | - |
| 435 | -dnl generated with: cd po;for i in $(ls *.po); do echo -n "${i%%.po} "; done |
| 436 | -dnl i18n |
| 437 | -ALL_LINGUAS="af am ar ast az be@latin be bg bn bo br bs ca ca@valencia ckb crh csb cs cy da de_DE de dv el en_AU en_CA en_GB eo es et eu fa fil fi fo fr fur fy ga gl gu gv he hi hr ht hu hy ia id is it ja ka km kn ko ku ky la lo lt lv mk ml mr ms my nb nds ne nl_NL nl nn no oc pa pl ps pt_BR pt pt_PT qu ro ru sc si sk sl sq sr@Latn sr sv ta_LK ta te tet th tl tr tt ug uk ur uz vi xh zh_CN zh_HK zh_TW" |
| 438 | -AM_GLIB_GNU_GETTEXT |
| 439 | -GETTEXT_PACKAGE=synaptic |
| 440 | -AC_SUBST(GETTEXT_PACKAGE) |
| 441 | -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",[description]) |
| 442 | -AC_PROG_INTLTOOL([0.23]) |
| 443 | -synapticlocaledir='${prefix}/${DATADIRNAME}/locale' |
| 444 | -AC_SUBST(synapticlocaledir) |
| 445 | - |
| 446 | - |
| 447 | -dnl ask for wings |
| 448 | -dnl AC_ARG_WITH(wings, |
| 449 | -dnl [--with-wings build with WINGs gui (obsolete)], |
| 450 | -dnl [AC_CHECK_PROG(WINGS, get-wings-flags, yes, no) |
| 451 | -dnl if test x"$WINGS" == xno; then |
| 452 | -dnl AC_MSG_ERROR([WINGs is not installed]) |
| 453 | -dnl fi |
| 454 | -dnl ] |
| 455 | -dnl ) |
| 456 | -dnl if test x"$WINGS" = xyes; then |
| 457 | -dnl BUILD_wings="wings" |
| 458 | -dnl WINGS_LIBS=`get-wings-flags --ldflags` |
| 459 | -dnl WINGS_LIBS="$GUI_LIBS `get-wings-flags --libs`" |
| 460 | -dnl WINGS_HDRS=`get-wings-flags --cflags` |
| 461 | -dnl AC_SUBST(WINGS_LIBS) |
| 462 | -dnl AC_SUBST(WINGS_HDRS) |
| 463 | -dnl fi |
| 464 | -dnl AC_SUBST(BUILD_wings) |
| 465 | - |
| 466 | -dnl we build for gtk3 by default now |
| 467 | -pkg_modules="gtk+-3.0 >= 2.91.0, pango >= 1.0.0, glib-2.0" |
| 468 | -vte_modules="vte-2.90" |
| 469 | - |
| 470 | -PKG_CHECK_MODULES(GTK, [$pkg_modules]) |
| 471 | -BUILD_gtk="gtk" |
| 472 | - |
| 473 | -AC_SUBST(GTK_CFLAGS) |
| 474 | -AC_SUBST(GTK_LIBS) |
| 475 | -AC_SUBST(BUILD_gtk) |
| 476 | - |
| 477 | -dnl if test x"$WINGS" = xno; then |
| 478 | -if test x"$GTK" = xno; then |
| 479 | - AC_MSG_ERROR([ Gtk is not installed, you need to install it to get a GUI]) |
| 480 | -fi |
| 481 | -dnl fi |
| 482 | - |
| 483 | - |
| 484 | - |
| 485 | - |
| 486 | -dnl Check for rpm version |
| 487 | -dnl ===================== |
| 488 | -rpm_version="none" |
| 489 | -AC_MSG_CHECKING(RPM version) |
| 490 | -SAVE_LIBS="$LIBS" |
| 491 | -SAVE_CPPFLAGS="$CPPFLAGS" |
| 492 | - |
| 493 | -RPM_HDRS="" |
| 494 | -LIBS="$SAVE_LIBS -lrpmio -lrpmdb -lpopt" |
| 495 | -CPPFLAGS="$SAVE_CPPFLAGS -I/usr/include/rpm" |
| 496 | -AC_CHECK_HEADER(rpm/rpmlib.h, |
| 497 | - [AC_CHECK_LIB(rpm,rpmdbInitIterator, |
| 498 | - [AC_DEFINE(HAVE_RPM, 1, [whether RPM is present]) |
| 499 | - RPM_LIBS="-lrpm -lrpmio -lrpmdb -lpopt" |
| 500 | - SAVE_CPPFLAGS="$SAVE_CPPFLAGS -I/usr/include/rpm" |
| 501 | - RPM_HDRS="-I/usr/include/rpm" |
| 502 | - rpm_version="4"])]) |
| 503 | - |
| 504 | -if test $rpm_version = "none"; then |
| 505 | -LIBS="$SAVE_LIBS -lpopt" |
| 506 | -CPPFLAGS="$SAVE_CPPFLAGS -I/usr/include/rpm" |
| 507 | -AC_CHECK_HEADER(rpm/rpmlib.h, |
| 508 | - [AC_CHECK_LIB(rpm,rpmdbOpen, |
| 509 | - [AC_DEFINE(HAVE_RPM, 1, [wheter RPM is present]) |
| 510 | - RPM_LIBS="-lrpm -lpopt" |
| 511 | - SAVE_CPPFLAGS="$SAVE_CPPFLAGS -I/usr/include/rpm" |
| 512 | - RPM_HDRS="-I/usr/include/rpm" |
| 513 | - rpm_version="3"])]) |
| 514 | -fi |
| 515 | - |
| 516 | -AC_SUBST(RPM_LIBS) |
| 517 | -AC_SUBST(RPM_HDRS) |
| 518 | -CPPFLAGS="$SAVE_CPPFLAGS" |
| 519 | -LIBS="$SAVE_LIBS" |
| 520 | -AC_MSG_RESULT("RPM version is $rpm_version") |
| 521 | - |
| 522 | -AC_MSG_CHECKING(for --enable-scripts) |
| 523 | -AC_ARG_ENABLE([scripts], |
| 524 | - AC_HELP_STRING(--enable-scripts, enable the extension system), |
| 525 | - [enable_scripts="$enableval"],[enable_scripts="no"]) |
| 526 | -if test "$enable_scripts" != "no"; then |
| 527 | - AC_MSG_RESULT(no) |
| 528 | - AC_DEFINE(WITH_LUA, 1, |
| 529 | - [Define if you want to enable the extension system.]) |
| 530 | -else |
| 531 | - AC_MSG_RESULT(yes) |
| 532 | -fi |
| 533 | -AM_CONDITIONAL(WITH_LUA, test "$enable_scripts" != "no") |
| 534 | - |
| 535 | -DEB_HDRS="" |
| 536 | -AC_SUBST(DEB_HDRS) |
| 537 | -DEB_LIBS="-lapt-inst" |
| 538 | -AC_SUBST(DEB_LIBS) |
| 539 | - |
| 540 | -dnl Checks for header files. |
| 541 | -AC_HEADER_STDC |
| 542 | -AC_CHECK_HEADERS(unistd.h libintl.h iconv.h) |
| 543 | - |
| 544 | -# check apt configuration |
| 545 | -AC_LANG([C++]) |
| 546 | -# bail out if we don't have apts headers |
| 547 | -AC_CHECK_HEADER(apt-pkg/configuration.h, [], |
| 548 | - AC_ERROR([You need the apt-pkg headers installed to compile synaptic.])) |
| 549 | - |
| 550 | -# if metaindex is there we use a apt with authentication support |
| 551 | -AC_CHECK_HEADER(apt-pkg/metaindex.h, |
| 552 | - AC_DEFINE(WITH_APT_AUTH, 1, [build with apt auth support] ) |
| 553 | -) |
| 554 | -# check if we have apts new-style cdrom.h |
| 555 | -AC_CHECK_HEADER(apt-pkg/cdrom.h, |
| 556 | - AC_DEFINE(HAVE_APTPKG_CDROM, 1, |
| 557 | - [whether apt-pkg/cdrom.h is present]) ) |
| 558 | - |
| 559 | -# check and use libept if available |
| 560 | -PKG_CHECK_MODULES([LIBEPT], [libept >= 1.0], |
| 561 | - [AC_DEFINE(WITH_EPT, 1, [build with libept]) |
| 562 | - AC_SUBST(LIBEPT_CFLAGS) |
| 563 | - AC_SUBST(LIBEPT_LIBS) |
| 564 | - ], |
| 565 | - [AC_MSG_NOTICE([no libept found, building without]) |
| 566 | - ]) |
| 567 | - |
| 568 | -AC_LANG([C]) |
| 569 | - |
| 570 | -dnl Checks for typedefs, structures, and compiler characteristics. |
| 571 | -AC_C_CONST |
| 572 | -AC_C_INLINE |
| 573 | - |
| 574 | -dnl Checks for library functions. |
| 575 | -AC_FUNC_STRCOLL |
| 576 | -AC_CHECK_FUNCS(regcomp strdup iconv) |
| 577 | - |
| 578 | -# use vte if available |
| 579 | -# vte_module is set above in the gtk3 test |
| 580 | -PKG_CHECK_MODULES(VTE, [$vte_modules], |
| 581 | - [AC_DEFINE(HAVE_VTE, 1, [build with VTE as output terminal]) |
| 582 | - AC_DEFINE(HAVE_TERMINAL, 1, [build with a terminal widget]) |
| 583 | - AC_SUBST(VTE_CFLAGS) |
| 584 | - AC_SUBST(VTE_LIBS) |
| 585 | - ], |
| 586 | - [AC_MSG_NOTICE([no vte found, building without]) |
| 587 | - ]) |
| 588 | - |
| 589 | -# use dpkg progress by default unless the user disables it |
| 590 | -AC_ARG_WITH(dpkg-progress, |
| 591 | - [ --without-dpkg-progress build without support for dpkg progress bar], |
| 592 | - [], |
| 593 | - [with_dpkg_progress=yes]) |
| 594 | -# if dpkg-progress is used, we need vte, so check that here |
| 595 | -# (FIXME: is this actually true? we could build without terminal and progress |
| 596 | -# bar only) |
| 597 | -AS_IF([test "x$with_dpkg_progress" != xno], |
| 598 | - [PKG_CHECK_MODULES(VTE, [$vte_modules], |
| 599 | - [], |
| 600 | - [AC_MSG_FAILURE([dpkg-progress requires vte, you can build without vte when using --without-dpkg-progress]) |
| 601 | - ]) |
| 602 | - AC_DEFINE(WITH_DPKG_STATUSFD, 1, [build with dpkg progress bar]) |
| 603 | - ], |
| 604 | - []) |
| 605 | - |
| 606 | -# launchpad integration |
| 607 | -AC_ARG_WITH(launchpad-integration, |
| 608 | - [ --with-launchpad-integration build with launchpad-integration], |
| 609 | - [PKG_CHECK_MODULES(LP, ["launchpad-integration"]) |
| 610 | - AC_DEFINE(WITH_LAUNCHPAD_INTEGRATION, 1, [build with launchpad-integration]) |
| 611 | - AC_SUBST(LP_CFLAGS) |
| 612 | - AC_SUBST(LP_LIBS) |
| 613 | - ] |
| 614 | -) |
| 615 | - |
| 616 | -AC_ARG_WITH(pkg-hold, |
| 617 | - [ --with-pkg-hold build with experimental package "hold" feature], |
| 618 | - AC_DEFINE(SYNAPTIC_PKG_HOLD, 1, [build with package pin feature] ) |
| 619 | -) |
| 620 | - |
| 621 | -AC_ARG_WITH(gtk-disable-deprecated, |
| 622 | - [ --with-gtk-disable-deprecated build with -DGTK_DISABLE_DEPRECATED], |
| 623 | - [GTK_DISABLE_DEPRECATED="-DGTK_DISABLE_DEPRECATED" |
| 624 | - AC_SUBST(GTK_DISABLE_DEPRECATED)] |
| 625 | -) |
| 626 | - |
| 627 | -#use multiarch unless the user disables it |
| 628 | -AC_ARG_WITH(apt-multiarch-support, |
| 629 | - [ --without-apt-multiarch-support build without support for apt multiarch], |
| 630 | - [], [with_apt_multiarch_support=yes]) |
| 631 | -AS_IF([test "x$with_apt_multiarch_support" != "xno"], |
| 632 | - [AC_DEFINE(WITH_APT_MULTIARCH_SUPPORT, 1, [build with multiarch])] |
| 633 | - ) |
| 634 | - |
| 635 | - |
| 636 | -AC_OUTPUT([ |
| 637 | -tests/Makefile |
| 638 | -common/Makefile |
| 639 | -gtk/Makefile |
| 640 | -gtk/gtkbuilder/Makefile |
| 641 | -data/Makefile |
| 642 | -man/Makefile |
| 643 | -pixmaps/Makefile |
| 644 | -pixmaps/hicolor/Makefile |
| 645 | -pixmaps/hicolor/16x16/Makefile |
| 646 | -pixmaps/hicolor/24x24/Makefile |
| 647 | -po/Makefile.in |
| 648 | -help/Makefile |
| 649 | -help/C/Makefile |
| 650 | -help/es/Makefile |
| 651 | -help/sv/Makefile |
| 652 | -doc/Makefile |
| 653 | -doc/html/Makefile |
| 654 | -doc/html/C/Makefile |
| 655 | -doc/html/es/Makefile |
| 656 | -doc/html/sv/Makefile |
| 657 | -Makefile |
| 658 | -],[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]) |
| 659 | - |
| 660 | - |
| 661 | |
| 662 | === modified file 'debian/changelog' |
| 663 | --- debian/changelog 2013-09-14 11:41:27 +0000 |
| 664 | +++ debian/changelog 2013-10-12 20:38:26 +0000 |
| 665 | @@ -1,3 +1,13 @@ |
| 666 | +synaptic (0.80.5) UNRELEASED; urgency=low |
| 667 | + |
| 668 | + * Team upload |
| 669 | + * debian/copyright: Use debian format 1.0 |
| 670 | + * COPYING: Update to latest GPL-v2 |
| 671 | + * Rename configure.in to configure.ac |
| 672 | + * Split synaptic into synaptic and synaptic-common |
| 673 | + |
| 674 | + -- Jackson Doak <noskcaj@ubuntu.com> Sat, 12 Oct 2013 17:24:19 +1100 |
| 675 | + |
| 676 | synaptic (0.80.4) unstable; urgency=low |
| 677 | |
| 678 | * gtk/rgdebinstallprogress.cc: |
| 679 | |
| 680 | === modified file 'debian/control' |
| 681 | --- debian/control 2013-03-11 01:00:01 +0000 |
| 682 | +++ debian/control 2013-10-12 20:38:26 +0000 |
| 683 | @@ -10,7 +10,7 @@ |
| 684 | |
| 685 | Package: synaptic |
| 686 | Architecture: any |
| 687 | -Depends: ${shlibs:Depends}, ${misc:Depends}, hicolor-icon-theme |
| 688 | +Depends: ${shlibs:Depends}, ${misc:Depends}, hicolor-icon-theme, synaptic-common |
| 689 | Conflicts: menu (<< 2.1.11) |
| 690 | Recommends: gksu|kdebase-bin|policykit-1, libgtk2-perl (>= 1:1.130), rarian-compat |
| 691 | Suggests: dwww, menu, deborphan, apt-xapian-index, tasksel, software-properties-gtk |
| 692 | @@ -28,3 +28,23 @@ |
| 693 | * Configure packages through the debconf system |
| 694 | * Browse all available documentation related to a package (dwww is required) |
| 695 | |
| 696 | +Package: synaptic-common |
| 697 | +Architecture: all |
| 698 | +Depends: ${shlibs:Depends}, ${misc:Depends}, hicolor-icon-theme |
| 699 | +Conflicts: menu (<< 2.1.11) |
| 700 | +Recommends: gksu|kdebase-bin|policykit-1, libgtk2-perl (>= 1:1.130), rarian-compat |
| 701 | +Suggests: dwww, menu, deborphan, apt-xapian-index, tasksel, software-properties-gtk |
| 702 | +Description: Graphical package manager - common files |
| 703 | + Synaptic is a graphical package management tool based on GTK+ and APT. |
| 704 | + Synaptic enables you to install, upgrade and remove software packages in |
| 705 | + a user friendly way. This contains it's common files. |
| 706 | + . |
| 707 | + Besides these basic functions the following features are provided: |
| 708 | + * Search and filter the list of available packages |
| 709 | + * Perform smart system upgrades |
| 710 | + * Fix broken package dependencies |
| 711 | + * Edit the list of used repositories (sources.list) |
| 712 | + * Download the latest changelog of a package |
| 713 | + * Configure packages through the debconf system |
| 714 | + * Browse all available documentation related to a package (dwww is required) |
| 715 | + |
| 716 | |
| 717 | === modified file 'debian/copyright' |
| 718 | --- debian/copyright 2012-01-31 09:23:13 +0000 |
| 719 | +++ debian/copyright 2013-10-12 20:38:26 +0000 |
| 720 | @@ -1,28 +1,28 @@ |
| 721 | -This package was debianized by Michael Vogt <mvo@debian.org> on |
| 722 | -Tue, 13 Nov 2001 23:17:20 +0100. |
| 723 | - |
| 724 | -It was downloaded from |
| 725 | -http://www.nongnu.org/synaptic |
| 726 | - |
| 727 | -Upstream Authors: "Alfredo K. Kojima" <kojima@conectiva.com.br> |
| 728 | - "Michael Vogt" <mvo@debian.org> |
| 729 | - |
| 730 | -Copyright: |
| 731 | - |
| 732 | - * This program is free software; you can redistribute it and/or |
| 733 | - * modify it under the terms of the GNU General Public License as |
| 734 | - * published by the Free Software Foundation; either version 2 of the |
| 735 | - * License, or (at your option) any later version. |
| 736 | - * |
| 737 | - * This program is distributed in the hope that it will be useful, |
| 738 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 739 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 740 | - * GNU General Public License for more details. |
| 741 | - * |
| 742 | - * You should have received a copy of the GNU General Public License |
| 743 | - * along with this program; if not, write to the Free Software |
| 744 | - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 |
| 745 | - * USA |
| 746 | - |
| 747 | -GNU GENERAL PUBLIC LICENSE, |
| 748 | -see /usr/share/common-licenses/GPL |
| 749 | +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ |
| 750 | +Upstream-Name: synaptic |
| 751 | +Source: http://www.nongnu.org/synaptic |
| 752 | + |
| 753 | +Files: * |
| 754 | +Copyright: 2002-2013, Michael Vogt <mvo@debian.org>, |
| 755 | + Alfredo K. Kojima <kojima@conectiva.com.br> |
| 756 | +License: GPL-2+ |
| 757 | + This program is free software; you can redistribute it |
| 758 | + and/or modify it under the terms of the GNU General Public |
| 759 | + License as published by the Free Software Foundation; either |
| 760 | + version 2 of the License, or (at your option) any later |
| 761 | + version. |
| 762 | + . |
| 763 | + This program is distributed in the hope that it will be |
| 764 | + useful, but WITHOUT ANY WARRANTY; without even the implied |
| 765 | + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR |
| 766 | + PURPOSE. See the GNU General Public License for more |
| 767 | + details. |
| 768 | + . |
| 769 | + You should have received a copy of the GNU General Public |
| 770 | + License along with this package; if not, write to the Free |
| 771 | + Software Foundation, Inc., 51 Franklin St, Fifth Floor, |
| 772 | + Boston, MA 02110-1301 USA |
| 773 | + . |
| 774 | + On Debian systems, the full text of the GNU General Public |
| 775 | + License version 2 can be found in the file |
| 776 | + `/usr/share/common-licenses/GPL-2'. |
| 777 | \ No newline at end of file |
| 778 | |
| 779 | === removed file 'debian/install' |
| 780 | --- debian/install 2012-01-31 09:23:13 +0000 |
| 781 | +++ debian/install 1970-01-01 00:00:00 +0000 |
| 782 | @@ -1,4 +0,0 @@ |
| 783 | -debian/synaptic_32x32.xpm usr/share/synaptic/pixmaps |
| 784 | -debian/source_synaptic.py usr/share/apport/package-hooks |
| 785 | -debian/synaptic-pkexec usr/bin/ |
| 786 | - |
| 787 | |
| 788 | === modified file 'debian/rules' |
| 789 | --- debian/rules 2012-05-15 12:21:23 +0000 |
| 790 | +++ debian/rules 2013-10-12 20:38:26 +0000 |
| 791 | @@ -23,7 +23,7 @@ |
| 792 | # of the install (e.g. package-supported.{Ubuntu,Debian} and |
| 793 | # do run-time switching |
| 794 | if [ -f debian/package-supported.png.$(DIST) ]; then \ |
| 795 | - cp debian/package-supported.png.$(DIST) $(CURDIR)/debian/synaptic/usr/share/icons/hicolor/16x16/actions/package-supported.png; \ |
| 796 | + cp debian/package-supported.png.$(DIST) $(CURDIR)/debian/synaptic-common/usr/share/icons/hicolor/16x16/actions/package-supported.png; \ |
| 797 | fi |
| 798 | |
| 799 | override_dh_installman: |
| 800 | |
| 801 | === added file 'debian/synaptic-common.dirs' |
| 802 | --- debian/synaptic-common.dirs 1970-01-01 00:00:00 +0000 |
| 803 | +++ debian/synaptic-common.dirs 2013-10-12 20:38:26 +0000 |
| 804 | @@ -0,0 +1,3 @@ |
| 805 | +usr/share/icons/hicolor/16x16/actions/ |
| 806 | +usr/share/apport/package-hooks |
| 807 | +usr/share/pixmaps |
| 808 | \ No newline at end of file |
| 809 | |
| 810 | === added file 'debian/synaptic-common.install' |
| 811 | --- debian/synaptic-common.install 1970-01-01 00:00:00 +0000 |
| 812 | +++ debian/synaptic-common.install 2013-10-12 20:38:26 +0000 |
| 813 | @@ -0,0 +1,3 @@ |
| 814 | +usr/share |
| 815 | +debian/synaptic_32x32.xpm usr/share/synaptic/pixmaps |
| 816 | +debian/source_synaptic.py usr/share/apport/package-hooks |
| 817 | \ No newline at end of file |
| 818 | |
| 819 | === modified file 'debian/synaptic.dirs' |
| 820 | --- debian/synaptic.dirs 2012-01-31 09:23:13 +0000 |
| 821 | +++ debian/synaptic.dirs 2013-10-12 20:38:26 +0000 |
| 822 | @@ -1,4 +1,1 @@ |
| 823 | var/lib/synaptic |
| 824 | -usr/share/icons/hicolor/16x16/actions/ |
| 825 | -usr/share/apport/package-hooks |
| 826 | -usr/share/pixmaps |
| 827 | |
| 828 | === added file 'debian/synaptic.install' |
| 829 | --- debian/synaptic.install 1970-01-01 00:00:00 +0000 |
| 830 | +++ debian/synaptic.install 2013-10-12 20:38:26 +0000 |
| 831 | @@ -0,0 +1,3 @@ |
| 832 | +#usr/bin |
| 833 | +usr/sbin |
| 834 | +debian/synaptic-pkexec usr/bin/ |
| 835 | \ No newline at end of file |
| 836 | |
| 837 | === modified file 'gtk/Makefile.am' |
| 838 | --- gtk/Makefile.am 2011-12-17 20:21:19 +0000 |
| 839 | +++ gtk/Makefile.am 2013-10-12 20:38:26 +0000 |
| 840 | @@ -1,7 +1,7 @@ |
| 841 | SUBDIRS = gtkbuilder |
| 842 | |
| 843 | |
| 844 | -INCLUDES= -I${top_srcdir}/common \ |
| 845 | +AM_CPPFLAGS= -I${top_srcdir}/common \ |
| 846 | -I${top_srcdir}/pixmaps \ |
| 847 | -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ |
| 848 | -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ |
| 849 | |
| 850 | === modified file 'macros/Makefile' |
| 851 | --- macros/Makefile 2003-02-02 17:10:39 +0000 |
| 852 | +++ macros/Makefile 2013-10-12 20:38:26 +0000 |
| 853 | @@ -112,7 +112,7 @@ |
| 854 | GZIP_ENV = --best |
| 855 | all: all-redirect |
| 856 | .SUFFIXES: |
| 857 | -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) |
| 858 | +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) |
| 859 | cd $(top_srcdir) && $(AUTOMAKE) --gnu macros/Makefile |
| 860 | |
| 861 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) |
| 862 | |
| 863 | === modified file 'macros/Makefile.in' |
| 864 | --- macros/Makefile.in 2004-03-02 22:04:49 +0000 |
| 865 | +++ macros/Makefile.in 2013-10-12 20:38:26 +0000 |
| 866 | @@ -220,7 +220,7 @@ |
| 867 | all: all-am |
| 868 | |
| 869 | .SUFFIXES: |
| 870 | -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) |
| 871 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) |
| 872 | cd $(top_srcdir) && \ |
| 873 | $(AUTOMAKE) --gnu macros/Makefile |
| 874 | Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status |
| 875 | |
| 876 | === modified file 'macros/autogen.sh' |
| 877 | --- macros/autogen.sh 2003-02-02 17:10:39 +0000 |
| 878 | +++ macros/autogen.sh 2013-10-12 20:38:26 +0000 |
| 879 | @@ -17,7 +17,7 @@ |
| 880 | DIE=1 |
| 881 | } |
| 882 | |
| 883 | -(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && { |
| 884 | +(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && { |
| 885 | (libtool --version) < /dev/null > /dev/null 2>&1 || { |
| 886 | echo |
| 887 | echo "**Error**: You must have \`libtool' installed to compile Gnome." |
| 888 | @@ -27,8 +27,8 @@ |
| 889 | } |
| 890 | } |
| 891 | |
| 892 | -#grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && { |
| 893 | -# grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \ |
| 894 | +#grep "^AM_GNU_GETTEXT" $srcdir/configure.ac >/dev/null && { |
| 895 | +# grep "sed.*POTFILES" $srcdir/configure.ac >/dev/null || \ |
| 896 | # (gettext --version) < /dev/null > /dev/null 2>&1 || { |
| 897 | # echo |
| 898 | # echo "**Error**: You must have \`gettext' installed to compile Gnome." |
| 899 | @@ -38,8 +38,8 @@ |
| 900 | # } |
| 901 | #} |
| 902 | |
| 903 | -#grep "^AM_GNOME_GETTEXT" $srcdir/configure.in >/dev/null && { |
| 904 | -# grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \ |
| 905 | +#grep "^AM_GNOME_GETTEXT" $srcdir/configure.ac >/dev/null && { |
| 906 | +# grep "sed.*POTFILES" $srcdir/configure.ac >/dev/null || \ |
| 907 | # (gettext --version) < /dev/null > /dev/null 2>&1 || { |
| 908 | # echo |
| 909 | # echo "**Error**: You must have \`gettext' installed to compile Gnome." |
| 910 | @@ -85,7 +85,7 @@ |
| 911 | am_opt=--include-deps;; |
| 912 | esac |
| 913 | |
| 914 | -for coin in `find $srcdir -name configure.in -print` |
| 915 | +for coin in `find $srcdir -name configure.ac -print` |
| 916 | do |
| 917 | dr=`dirname $coin` |
| 918 | if test -f $dr/NO-AUTO-GEN; then |
| 919 | @@ -118,9 +118,9 @@ |
| 920 | fi |
| 921 | fi |
| 922 | done |
| 923 | - if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then |
| 924 | - if grep "sed.*POTFILES" configure.in >/dev/null; then |
| 925 | - : do nothing -- we still have an old unmodified configure.in |
| 926 | + if grep "^AM_GNU_GETTEXT" configure.ac >/dev/null; then |
| 927 | + if grep "sed.*POTFILES" configure.ac >/dev/null; then |
| 928 | + : do nothing -- we still have an old unmodified configure.ac |
| 929 | else |
| 930 | echo "Creating $dr/aclocal.m4 ..." |
| 931 | test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 |
| 932 | @@ -130,7 +130,7 @@ |
| 933 | test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 |
| 934 | fi |
| 935 | fi |
| 936 | - if grep "^AM_GNOME_GETTEXT" configure.in >/dev/null; then |
| 937 | + if grep "^AM_GNOME_GETTEXT" configure.ac >/dev/null; then |
| 938 | echo "Creating $dr/aclocal.m4 ..." |
| 939 | test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 |
| 940 | echo "Running gettextize... Ignore non-fatal messages." |
| 941 | @@ -138,7 +138,7 @@ |
| 942 | echo "Making $dr/aclocal.m4 writable ..." |
| 943 | test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 |
| 944 | fi |
| 945 | - if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then |
| 946 | + if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then |
| 947 | if test -z "$NO_LIBTOOLIZE" ; then |
| 948 | echo "Running libtoolize..." |
| 949 | libtoolize --force --copy |
| 950 | @@ -155,7 +155,7 @@ |
| 951 | exit 1 |
| 952 | } |
| 953 | |
| 954 | - if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then |
| 955 | + if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then |
| 956 | echo "Running autoheader..." |
| 957 | autoheader || { echo "**Error**: autoheader failed."; exit 1; } |
| 958 | fi |
| 959 | |
| 960 | === modified file 'macros/curses.m4' |
| 961 | --- macros/curses.m4 2003-02-02 17:10:39 +0000 |
| 962 | +++ macros/curses.m4 2013-10-12 20:38:26 +0000 |
| 963 | @@ -10,7 +10,7 @@ |
| 964 | dnl @CURSES_INCLUDEDIR@ and @CURSES_LIBS@ will be available in |
| 965 | dnl Makefile.in's |
| 966 | dnl - Modify the following configure variables (these are the only |
| 967 | -dnl curses.m4 variables you can access from within configure.in) |
| 968 | +dnl curses.m4 variables you can access from within configure.ac) |
| 969 | dnl CURSES_INCLUDEDIR - contains -I's and possibly -DRENAMED_CURSES if |
| 970 | dnl an ncurses.h that's been renamed to curses.h |
| 971 | dnl is found. |
| 972 | @@ -21,7 +21,7 @@ |
| 973 | dnl Usage: |
| 974 | dnl ====== |
| 975 | dnl 1) Add lines indicated below to acconfig.h |
| 976 | -dnl 2) call AC_CHECK_CURSES after AC_PROG_CC in your configure.in |
| 977 | +dnl 2) call AC_CHECK_CURSES after AC_PROG_CC in your configure.ac |
| 978 | dnl 3) Instead of #include <curses.h> you should use the following to |
| 979 | dnl properly locate ncurses or curses header file |
| 980 | dnl |
| 981 | @@ -36,7 +36,7 @@ |
| 982 | dnl |
| 983 | dnl Notes with automake: |
| 984 | dnl - call AM_CONDITIONAL(HAS_CURSES, test "$has_curses" = true) from |
| 985 | -dnl configure.in |
| 986 | +dnl configure.ac |
| 987 | dnl - your Makefile.am can look something like this |
| 988 | dnl ----------------------------------------------- |
| 989 | dnl INCLUDES= blah blah blah $(CURSES_INCLUDEDIR) |
| 990 | |
| 991 | === modified file 'macros/gnome-gettext.m4' |
| 992 | --- macros/gnome-gettext.m4 2003-02-02 17:10:39 +0000 |
| 993 | +++ macros/gnome-gettext.m4 2013-10-12 20:38:26 +0000 |
| 994 | @@ -190,7 +190,7 @@ |
| 995 | |
| 996 | dnl These rules are solely for the distribution goal. While doing this |
| 997 | dnl we only have to keep exactly one list of the available catalogs |
| 998 | - dnl in configure.in. |
| 999 | + dnl in configure.ac. |
| 1000 | for lang in $ALL_LINGUAS; do |
| 1001 | GMOFILES="$GMOFILES $lang.gmo" |
| 1002 | POFILES="$POFILES $lang.po" |
| 1003 | |
| 1004 | === modified file 'macros/gnome-libgtop-check.m4' |
| 1005 | --- macros/gnome-libgtop-check.m4 2003-02-02 17:10:39 +0000 |
| 1006 | +++ macros/gnome-libgtop-check.m4 2013-10-12 20:38:26 +0000 |
| 1007 | @@ -69,7 +69,7 @@ |
| 1008 | dnl IMPORTANT NOTICE: |
| 1009 | dnl If you increase this number here, this means that *ALL* |
| 1010 | dnl modules will require the new version, even if they explicitly |
| 1011 | - dnl give a lower number in their `configure.in' !!! |
| 1012 | + dnl give a lower number in their `configure.ac' !!! |
| 1013 | real_min_libgtop_version=1.0.0 |
| 1014 | min_libgtop_version=ifelse([$1], ,$real_min_libgtop_version,$1) |
| 1015 | dnl I know, the following code looks really ugly, but if you want |
| 1016 | @@ -92,7 +92,7 @@ |
| 1017 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` |
| 1018 | test x$real_min_libgtop_micro = x && real_min_libgtop_micro=0 |
| 1019 | dnl You cannot require a version less then $real_min_libgtop_version, |
| 1020 | - dnl so you don't need to update each `configure.in' when it's increased. |
| 1021 | + dnl so you don't need to update each `configure.ac' when it's increased. |
| 1022 | if test $real_min_libgtop_major -gt $min_libgtop_major ; then |
| 1023 | min_libgtop_major=$real_min_libgtop_major |
| 1024 | min_libgtop_minor=$real_min_libgtop_minor |
| 1025 | |
| 1026 | === modified file 'pre-build.sh' |
| 1027 | --- pre-build.sh 2012-01-31 09:23:13 +0000 |
| 1028 | +++ pre-build.sh 2013-10-12 20:38:26 +0000 |
| 1029 | @@ -1,9 +1,9 @@ |
| 1030 | #!/bin/sh |
| 1031 | |
| 1032 | DEBVER=$(dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p') |
| 1033 | -CONFVER=$(sed -n -e 's/AM_INIT_AUTOMAKE(synaptic, \(.*\))/\1/p' configure.in) |
| 1034 | +CONFVER=$(sed -n -e 's/AM_INIT_AUTOMAKE(synaptic, \(.*\))/\1/p' configure.ac) |
| 1035 | if [ "$DEBVER" != "$CONFVER" ]; then |
| 1036 | - sed -i -e "s/$CONFVER/$DEBVER/" configure.in |
| 1037 | + sed -i -e "s/$CONFVER/$DEBVER/" configure.ac |
| 1038 | fi |
| 1039 | |
| 1040 | |
| 1041 | |
| 1042 | === modified file 'tests/Makefile.am' |
| 1043 | --- tests/Makefile.am 2010-11-12 19:45:33 +0000 |
| 1044 | +++ tests/Makefile.am 2013-10-12 20:38:26 +0000 |
| 1045 | @@ -1,5 +1,5 @@ |
| 1046 | |
| 1047 | -INCLUDES= -I${top_srcdir}/common \ |
| 1048 | +AM_CPPFLAGS= -I${top_srcdir}/common \ |
| 1049 | @GTK_CFLAGS@ @VTE_CFLAGS@ @LP_CFLAGS@ $(LIBTAGCOLL_CFLAGS) $(LIBEPT_CFLAGS) -O0 -g3 |
| 1050 | |
| 1051 | noinst_PROGRAMS = test_rpackage test_rpackageview |
