--- kmformat-0.1~beta2.orig/install-it +++ kmformat-0.1~beta2/install-it @@ -154,9 +154,9 @@ mkdir /usr/share/apps/kmformat cp *.png /usr/share/apps/kmformat cd .. - mkdir /usr/share/doc/KMFormat - cp README /usr/share/doc/KMFormat - cp doc/*.pdf /usr/share/doc/KMFormat + mkdir /usr/share/doc/kmformat + cp README /usr/share/doc/kmformat + cp doc/*.pdf /usr/share/doc/kmformat cp *.desktop /usr/share/apps/konqueror/servicemenus else echo you must be root to install it --- kmformat-0.1~beta2.orig/debian/control +++ kmformat-0.1~beta2/debian/control @@ -0,0 +1,17 @@ +Source: kmformat +Section: kde +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Brandon Holtsclaw +Build-Depends: debhelper (>= 5), libqt4-dev, libqt4-dbg +Standards-Version: 3.8.3 +Homepage: http://www.micoulou.info/kformat/ + +Package: kmformat +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: floppy and USB disk formatting tool for KDE + KMFormat is a Qt 4 formatting tool for floppy and USB disks + with KDE integration. + . + A Google Summer of Code project for Kubuntu. --- kmformat-0.1~beta2.orig/debian/docs +++ kmformat-0.1~beta2/debian/docs @@ -0,0 +1,2 @@ +README +doc/* --- kmformat-0.1~beta2.orig/debian/compat +++ kmformat-0.1~beta2/debian/compat @@ -0,0 +1 @@ +5 --- kmformat-0.1~beta2.orig/debian/rules +++ kmformat-0.1~beta2/debian/rules @@ -0,0 +1,69 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +build: + make -C src + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + $(MAKE) -C src clean + + dh_clean + +install: + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/kmformat. + ./install-it DESTDIR=$(CURDIR)/debian/kmformat + cp src/KMFormat debian/kmformat/usr/bin + mkdir -p debian/kmformat/usr/share/apps/kmformat + cp src/*.png debian/kmformat/usr/share/apps/kmformat + mkdir -p debian/kmformat/usr/share/apps/konqueror/servicemenus + install -m 644 *.desktop debian/kmformat/usr/share/apps/konqueror/servicemenus + +binary-indep: +#nothing to do + +# Build architecture-dependent files here. +binary-arch: install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_installman + dh_link + dh_strip + dh_compress -X.pdf + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-arch +.PHONY: clean binary-arch binary install --- kmformat-0.1~beta2.orig/debian/copyright +++ kmformat-0.1~beta2/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Brandon Holtsclaw on +Sat, 19 Aug 2006 20:34:18 -0500. + +It was downloaded from http://www.micoulou.info/kformat/ + +Upstream Author: Mickael Minarie + +Copyright: (C) 2006 Mickael Minarie + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- kmformat-0.1~beta2.orig/debian/dirs +++ kmformat-0.1~beta2/debian/dirs @@ -0,0 +1 @@ +usr/bin --- kmformat-0.1~beta2.orig/debian/changelog +++ kmformat-0.1~beta2/debian/changelog @@ -0,0 +1,43 @@ +kmformat (0.1~beta2-0ubuntu6) lucid; urgency=low + + * src/Makefile: remove unnecessary libraries to fix FTBFS + * debian/{docs,rules}: install all documentation into + /usr/share/doc/kmformat (LP: #491518), don't compress PDF files + * debian/rules: install .desktop file without execute permissions + * debian/control: move Homepage to its own field + * Bump Standards-Version to 3.8.3 + + -- Ilya Barygin Sat, 16 Jan 2010 13:49:23 +0300 + +kmformat (0.1~beta2-0ubuntu5) karmic; urgency=low + + * Remove build-dep on the non-existant libqt4-debug, replace with libqt4-dbg + * Bump standards version to 3.8.1, no changes required + + -- Jonathan Thomas Mon, 25 May 2009 18:36:30 -0400 + +kmformat (0.1~beta2-0ubuntu4) edgy; urgency=low + + * Re-run qmake and don't build-dep on qt4-debug-dev which no longer exists + + -- Jonathan Riddell Sun, 15 Oct 2006 17:27:50 +0000 + +kmformat (0.1~beta2-0ubuntu3) edgy; urgency=low + + * Modified install-it to not install doc's in both /usr/share/doc/KMFormat + and /usr/share/doc/kmformat (Malone #58478) + + -- Brandon Holtsclaw Fri, 1 Sep 2006 13:07:54 -0500 + +kmformat (0.1~beta2-0ubuntu2) edgy; urgency=low + + * New upstream release + + -- Jonathan Riddell Mon, 28 Aug 2006 13:21:26 +0100 + +kmformat (0.1~beta1-0ubuntu1) edgy; urgency=low + + * Initial release + + -- Brandon Holtsclaw Sat, 19 Aug 2006 20:34:18 -0500 + --- kmformat-0.1~beta2.orig/src/Makefile +++ kmformat-0.1~beta2/src/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: KMFormat -# Generated by qmake (2.00a) (Qt 4.1.2) on: Sat Aug 19 17:34:54 2006 +# Generated by qmake (2.01a) (Qt 4.6.0) on: Sat Jan 16 13:22:26 2010 # Project: KMFormat.pro # Template: app # Command: /usr/bin/qmake-qt4 -unix -o Makefile KMFormat.pro @@ -10,27 +10,26 @@ CC = gcc CXX = g++ -LEX = flex -YACC = yacc -DEFINES = -DQT_GUI_LIB -DQT_CORE_LIB -CFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES) -CXXFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES) -LEXFLAGS = -YACCFLAGS = -d -INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I. -I. -I. -Os +DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB +CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) +CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) +INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I. -I. LINK = g++ -LFLAGS = -LIBS = $(SUBLIBS) -L/usr/lib -lQtGui_debug -lQtCore_debug -lpthread +LFLAGS = -Wl,-O1 +LIBS = $(SUBLIBS) -L/usr/lib -lQtGui -lQtCore -lpthread AR = ar cqs RANLIB = QMAKE = /usr/bin/qmake-qt4 TAR = tar -cf COMPRESS = gzip -9f COPY = cp -f +SED = sed COPY_FILE = $(COPY) COPY_DIR = $(COPY) -r -INSTALL_FILE = $(COPY_FILE) +STRIP = strip +INSTALL_FILE = install -m 644 -p INSTALL_DIR = $(COPY_DIR) +INSTALL_PROGRAM = install -m 755 -p DEL_FILE = rm -f SYMLINK = ln -sf DEL_DIR = rmdir @@ -57,11 +56,15 @@ TstFileExist.o \ moc_QFormatDLG.o \ moc_CDrive.o -DIST = /usr/share/qt4/mkspecs/qconfig.pri \ +DIST = /usr/share/qt4/mkspecs/common/g++.conf \ + /usr/share/qt4/mkspecs/common/unix.conf \ + /usr/share/qt4/mkspecs/common/linux.conf \ + /usr/share/qt4/mkspecs/qconfig.pri \ + /usr/share/qt4/mkspecs/features/qt_functions.prf \ /usr/share/qt4/mkspecs/features/qt_config.prf \ /usr/share/qt4/mkspecs/features/exclusive_builds.prf \ /usr/share/qt4/mkspecs/features/default_pre.prf \ - /usr/share/qt4/mkspecs/features/debug.prf \ + /usr/share/qt4/mkspecs/features/release.prf \ /usr/share/qt4/mkspecs/features/default_post.prf \ /usr/share/qt4/mkspecs/features/warn_on.prf \ /usr/share/qt4/mkspecs/features/qt.prf \ @@ -69,6 +72,9 @@ /usr/share/qt4/mkspecs/features/moc.prf \ /usr/share/qt4/mkspecs/features/resources.prf \ /usr/share/qt4/mkspecs/features/uic.prf \ + /usr/share/qt4/mkspecs/features/yacc.prf \ + /usr/share/qt4/mkspecs/features/lex.prf \ + /usr/share/qt4/mkspecs/features/include_source_dir.prf \ KMFormat.pro QMAKE_TARGET = KMFormat DESTDIR = @@ -77,22 +83,22 @@ first: all ####### Implicit rules -.SUFFIXES: .c .o .cpp .cc .cxx .C +.SUFFIXES: .o .c .cpp .cc .cxx .C .cpp.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" .cc.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" .cxx.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" .C.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" .c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< + $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" ####### Build rules @@ -101,24 +107,35 @@ $(TARGET): $(OBJECTS) $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) -Makefile: KMFormat.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/qconfig.pri \ +Makefile: KMFormat.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \ + /usr/share/qt4/mkspecs/common/unix.conf \ + /usr/share/qt4/mkspecs/common/linux.conf \ + /usr/share/qt4/mkspecs/qconfig.pri \ + /usr/share/qt4/mkspecs/features/qt_functions.prf \ /usr/share/qt4/mkspecs/features/qt_config.prf \ /usr/share/qt4/mkspecs/features/exclusive_builds.prf \ /usr/share/qt4/mkspecs/features/default_pre.prf \ - /usr/share/qt4/mkspecs/features/debug.prf \ + /usr/share/qt4/mkspecs/features/release.prf \ /usr/share/qt4/mkspecs/features/default_post.prf \ /usr/share/qt4/mkspecs/features/warn_on.prf \ /usr/share/qt4/mkspecs/features/qt.prf \ /usr/share/qt4/mkspecs/features/unix/thread.prf \ /usr/share/qt4/mkspecs/features/moc.prf \ /usr/share/qt4/mkspecs/features/resources.prf \ - /usr/share/qt4/mkspecs/features/uic.prf + /usr/share/qt4/mkspecs/features/uic.prf \ + /usr/share/qt4/mkspecs/features/yacc.prf \ + /usr/share/qt4/mkspecs/features/lex.prf \ + /usr/share/qt4/mkspecs/features/include_source_dir.prf $(QMAKE) -unix -o Makefile KMFormat.pro +/usr/share/qt4/mkspecs/common/g++.conf: +/usr/share/qt4/mkspecs/common/unix.conf: +/usr/share/qt4/mkspecs/common/linux.conf: /usr/share/qt4/mkspecs/qconfig.pri: +/usr/share/qt4/mkspecs/features/qt_functions.prf: /usr/share/qt4/mkspecs/features/qt_config.prf: /usr/share/qt4/mkspecs/features/exclusive_builds.prf: /usr/share/qt4/mkspecs/features/default_pre.prf: -/usr/share/qt4/mkspecs/features/debug.prf: +/usr/share/qt4/mkspecs/features/release.prf: /usr/share/qt4/mkspecs/features/default_post.prf: /usr/share/qt4/mkspecs/features/warn_on.prf: /usr/share/qt4/mkspecs/features/qt.prf: @@ -126,16 +143,17 @@ /usr/share/qt4/mkspecs/features/moc.prf: /usr/share/qt4/mkspecs/features/resources.prf: /usr/share/qt4/mkspecs/features/uic.prf: +/usr/share/qt4/mkspecs/features/yacc.prf: +/usr/share/qt4/mkspecs/features/lex.prf: +/usr/share/qt4/mkspecs/features/include_source_dir.prf: qmake: FORCE @$(QMAKE) -unix -o Makefile KMFormat.pro dist: - @$(CHK_DIR_EXISTS) ".tmp/KMFormat1.0.0" || $(MKDIR) ".tmp/KMFormat1.0.0" + @$(CHK_DIR_EXISTS) .tmp/KMFormat1.0.0 || $(MKDIR) .tmp/KMFormat1.0.0 $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/KMFormat1.0.0/ && $(COPY_FILE) --parents QFormatDLG.h CDrive.h ListMountPoint.h TstFileExist.h .tmp/KMFormat1.0.0/ && $(COPY_FILE) --parents main.cpp QFormatDLG.cpp CDrive.cpp ListMountPoint.cpp TstFileExist.cpp .tmp/KMFormat1.0.0/ && $(COPY_FILE) --parents KMFormat_fr.ts .tmp/KMFormat1.0.0/ && (cd `dirname .tmp/KMFormat1.0.0` && $(TAR) KMFormat1.0.0.tar KMFormat1.0.0 && $(COMPRESS) KMFormat1.0.0.tar) && $(MOVE) `dirname .tmp/KMFormat1.0.0`/KMFormat1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/KMFormat1.0.0 -yaccclean: -lexclean: clean:compiler_clean -$(DEL_FILE) $(OBJECTS) -$(DEL_FILE) *~ core *.core @@ -148,9 +166,6 @@ -$(DEL_FILE) Makefile -/usr/bin/moc-qt4: - (cd "$(QTDIR)/src/tools/moc" && $(MAKE)) - mocclean: compiler_moc_header_clean compiler_moc_source_clean mocables: compiler_moc_header_make_all compiler_moc_source_make_all @@ -160,45 +175,56 @@ -$(DEL_FILE) moc_QFormatDLG.cpp moc_CDrive.cpp moc_QFormatDLG.cpp: ListMountPoint.h \ TstFileExist.h \ - QFormatDLG.h \ - /usr/bin/moc-qt4 + QFormatDLG.h /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) QFormatDLG.h -o moc_QFormatDLG.cpp -moc_CDrive.cpp: CDrive.h \ - /usr/bin/moc-qt4 +moc_CDrive.cpp: CDrive.h /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) CDrive.h -o moc_CDrive.cpp compiler_rcc_make_all: compiler_rcc_clean: -compiler_image_collection_make_all: +compiler_image_collection_make_all: qmake_image_collection.cpp compiler_image_collection_clean: -$(DEL_FILE) qmake_image_collection.cpp compiler_moc_source_make_all: compiler_moc_source_clean: compiler_uic_make_all: compiler_uic_clean: -compiler_clean: compiler_moc_header_clean compiler_rcc_clean compiler_image_collection_clean compiler_moc_source_clean compiler_uic_clean +compiler_yacc_decl_make_all: +compiler_yacc_decl_clean: +compiler_yacc_impl_make_all: +compiler_yacc_impl_clean: +compiler_lex_make_all: +compiler_lex_clean: +compiler_clean: compiler_moc_header_clean ####### Compile main.o: main.cpp QFormatDLG.h \ ListMountPoint.h \ TstFileExist.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp QFormatDLG.o: QFormatDLG.cpp QFormatDLG.h \ ListMountPoint.h \ TstFileExist.h \ CDrive.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o QFormatDLG.o QFormatDLG.cpp CDrive.o: CDrive.cpp CDrive.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o CDrive.o CDrive.cpp ListMountPoint.o: ListMountPoint.cpp ListMountPoint.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ListMountPoint.o ListMountPoint.cpp TstFileExist.o: TstFileExist.cpp TstFileExist.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o TstFileExist.o TstFileExist.cpp moc_QFormatDLG.o: moc_QFormatDLG.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_QFormatDLG.o moc_QFormatDLG.cpp moc_CDrive.o: moc_CDrive.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_CDrive.o moc_CDrive.cpp ####### Install