[Foo2zjs-commits] r197 - in trunk/foo2zjs_20090301dfsg/debian: . hannah-package
Michael Koch
mkoch at alioth.debian.org
Wed Sep 2 19:48:55 UTC 2009
Author: mkoch
Date: 2009-09-02 19:48:55 +0000 (Wed, 02 Sep 2009)
New Revision: 197
Modified:
trunk/foo2zjs_20090301dfsg/debian/changelog
trunk/foo2zjs_20090301dfsg/debian/control
trunk/foo2zjs_20090301dfsg/debian/hannah-foo2zjs.dirs
trunk/foo2zjs_20090301dfsg/debian/hannah-foo2zjs.menu
trunk/foo2zjs_20090301dfsg/debian/hannah-package/gui.cpp
trunk/foo2zjs_20090301dfsg/debian/hannah-package/gui.h
trunk/foo2zjs_20090301dfsg/debian/hannah-package/hannah.desktop
trunk/foo2zjs_20090301dfsg/debian/hannah-package/hannah.pro
trunk/foo2zjs_20090301dfsg/debian/hannah-package/main.cpp
trunk/foo2zjs_20090301dfsg/debian/rules
Log:
foo2zjs (20090301dfsg-5) unstable; urgency=low
* Remove hannah-foo2zjs package as its now in its own source package.
* debian/README.Debian-source: New file to describe usage of dpatch.
* debian/control: Updated Standards-Version to 3.8.3.
* debian/control: Add Vcs-Browser field.
-- Michael Koch <konqueror at gmx.de> Wed, 02 Sep 2009 08:49:26 +0200
Modified: trunk/foo2zjs_20090301dfsg/debian/changelog
===================================================================
--- trunk/foo2zjs_20090301dfsg/debian/changelog 2009-08-02 11:15:37 UTC (rev 196)
+++ trunk/foo2zjs_20090301dfsg/debian/changelog 2009-09-02 19:48:55 UTC (rev 197)
@@ -1,3 +1,12 @@
+foo2zjs (20090301dfsg-5) unstable; urgency=low
+
+ * Remove hannah-foo2zjs package as its now in its own source package.
+ * debian/README.Debian-source: New file to describe usage of dpatch.
+ * debian/control: Updated Standards-Version to 3.8.3.
+ * debian/control: Add Vcs-Browser field.
+
+ -- Michael Koch <konqueror at gmx.de> Wed, 02 Sep 2009 08:49:26 +0200
+
foo2zjs (20090301dfsg-4) unstable; urgency=low
* debian/hannah-package/gui.cpp: Fix list of argument names for getweb
Modified: trunk/foo2zjs_20090301dfsg/debian/control
===================================================================
--- trunk/foo2zjs_20090301dfsg/debian/control 2009-08-02 11:15:37 UTC (rev 196)
+++ trunk/foo2zjs_20090301dfsg/debian/control 2009-09-02 19:48:55 UTC (rev 197)
@@ -3,10 +3,11 @@
Priority: optional
Maintainer: Debian Foo2zjs Maintainers <foo2zjs-maintainer at lists.alioth.debian.org>
Uploaders: Luca Bedogni <me at lucabedogni.it>, Michael Koch <konqueror at gmx.de>, Steffen Joeris <white at debian.org>, Luca Capello <luca at pca.it>
-Build-Depends: debhelper (>= 5), ghostscript, dpatch, foomatic-filters, libcups2-dev, libqt4-dev
-Standards-Version: 3.8.2
+Build-Depends: debhelper (>= 5), ghostscript, dpatch, foomatic-filters, libcups2-dev
+Standards-Version: 3.8.3
Homepage: http://foo2zjs.rkkda.com/
Vcs-Svn: svn://svn.debian.org/foo2zjs
+Vcs-Browser: http://svn.debian.org/viewsvn/foo2zjs/
Package: foo2zjs
Architecture: any
@@ -23,14 +24,3 @@
The foomatic-db-engine package is recommended to simplify configuring
this printer driver. The psutils package is needed to enable n-up
printing support.
-
-Package: hannah-foo2zjs
-Architecture: any
-Depends: ${shlibs:Depends}, gksu | kdebase-bin (<< 4:4.4.0-1) | kdebase-runtime | ktsuss | sux
-Description: Graphical firmware downloader for the foo2zjs package
- Hannah is a graphical firmware downloader for the foo2zjs package. You
- can select one or more firmware(s) from a list, and let hannah download
- and install them.
- .
- With this software you can potentially install non-free software, so
- beware of that.
Modified: trunk/foo2zjs_20090301dfsg/debian/hannah-foo2zjs.dirs
===================================================================
--- trunk/foo2zjs_20090301dfsg/debian/hannah-foo2zjs.dirs 2009-08-02 11:15:37 UTC (rev 196)
+++ trunk/foo2zjs_20090301dfsg/debian/hannah-foo2zjs.dirs 2009-09-02 19:48:55 UTC (rev 197)
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/applications
-usr/share/menu
Modified: trunk/foo2zjs_20090301dfsg/debian/hannah-foo2zjs.menu
===================================================================
--- trunk/foo2zjs_20090301dfsg/debian/hannah-foo2zjs.menu 2009-08-02 11:15:37 UTC (rev 196)
+++ trunk/foo2zjs_20090301dfsg/debian/hannah-foo2zjs.menu 2009-09-02 19:48:55 UTC (rev 197)
@@ -1,6 +0,0 @@
-?package(hannah-foo2zjs):\
- needs="X11"\
- section="Applications/System/Administration"\
- title="Hannah-foo2zjs"\
- longtitle="Foo2ZJS Firmware Installer (Hannah)"\
- command="/usr/bin/su-to-root -X -c /usr/bin/hannah-foo2zjs"
Modified: trunk/foo2zjs_20090301dfsg/debian/hannah-package/gui.cpp
===================================================================
--- trunk/foo2zjs_20090301dfsg/debian/hannah-package/gui.cpp 2009-08-02 11:15:37 UTC (rev 196)
+++ trunk/foo2zjs_20090301dfsg/debian/hannah-package/gui.cpp 2009-09-02 19:48:55 UTC (rev 197)
@@ -1,265 +0,0 @@
-// Hannah, GUI for downloading specific printer firmware
-// Copyright (C) 2007 Steffen Joeris <white at debian.org>
-//
-// This program 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 program 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 program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-
-#include "gui.h"
-
-MainWindow::MainWindow(QWidget *parent)
- :QWidget(parent)
-{
- int check = QMessageBox::question(this, tr("Hannah - Firmware downloader"),
- tr("Do you want to download and install potential non-free printer firmware?"), tr("&Yes"), tr("&No"),
- QString::null, 0, 1);
-
-
- if (! check == 0 ) {
- exit(0);
- }
-
- createMainWidget();
-
- connect(downloadButton, SIGNAL(clicked()), this, SLOT(callGetweb()));
-};
-
-void MainWindow::createMainWidget()
-{
- setWindowTitle(tr("Hannah - Foo2zjs firmware downloader"));
- QVBoxLayout *mainLayout = new QVBoxLayout;
- hp2600Button = new QCheckBox(tr("Download firmware for HP2600"));
- hp1600Button = new QCheckBox(tr("Download firmware for HP1600"));
- hp1020Button = new QCheckBox(tr("Download firmware for HP1020"));
- hp1018Button = new QCheckBox(tr("Download firmware for HP1018"));
- hp1005Button = new QCheckBox(tr("Download firmware for HP1005"));
- hp1000Button = new QCheckBox(tr("Download firmware for HP1000"));
- minolta2530Button = new QCheckBox(tr("Download firmware for Minolta 2530"));
- minolta2490Button = new QCheckBox(tr("Download firmware for Minolta 2490"));
- minolta2480Button = new QCheckBox(tr("Download firmware for Minolta 2480"));
- minolta2430Button = new QCheckBox(tr("Download firmware for Minolta 2430"));
- minolta2300Button = new QCheckBox(tr("Download firmware for Minolta 2300"));
- minolta2200Button = new QCheckBox(tr("Download firmware for Minolta 2200"));
- minoltaproButton = new QCheckBox(tr("Download firmware for Minolta PageWorks/Pro L"));
- samsung3160Button = new QCheckBox(tr("Download firmware for Samsung CLX-3160"));
- samsung600Button = new QCheckBox(tr("Download firmware for Samsung CLP-600"));
- samsung300Button = new QCheckBox(tr("Download firmware for Samsung CLP-300"));
- xerox6115Button = new QCheckBox(tr("Download firmware for Xerox Phaser 6115"));
- xerox6110Button = new QCheckBox(tr("Download firmware for Xerox Phaser 6110"));
- allButton = new QCheckBox(tr("Mark all for download"));
- downloadButton = new QPushButton(tr("Download marked firmwares"));
- exitButton = new QPushButton(tr("Exit"));
-
- hp2600Button->setFont(QFont("Times", 18));
- hp1600Button->setFont(QFont("Times", 18));
- hp1020Button->setFont(QFont("Times", 18));
- hp1018Button->setFont(QFont("Times", 18));
- hp1005Button->setFont(QFont("Times", 18));
- hp1000Button->setFont(QFont("Times", 18));
- minolta2530Button->setFont(QFont("Times", 18));
- minolta2490Button->setFont(QFont("Times", 18));
- minolta2480Button->setFont(QFont("Times", 18));
- minolta2430Button->setFont(QFont("Times", 18));
- minolta2300Button->setFont(QFont("Times", 18));
- minolta2200Button->setFont(QFont("Times", 18));
- minoltaproButton->setFont(QFont("Times", 18));
- samsung3160Button->setFont(QFont("Times", 18));
- samsung600Button->setFont(QFont("Times", 18));
- samsung300Button->setFont(QFont("Times", 18));
- xerox6115Button->setFont(QFont("Times", 18));
- xerox6110Button->setFont(QFont("Times", 18));
- allButton->setFont(QFont("Times", 18));
- downloadButton->setFont(QFont("Times", 18));
- exitButton->setFont(QFont("Times", 18));
-
- QMenuBar *menubar = new QMenuBar;
- QMenu *menu = new QMenu;
- menubar->addMenu(menu);
- QAction *about = new QAction(tr("About Hannah"), this);
- menu = menubar->addMenu(tr("Help"));
- menu->addAction(about);
-
- statusBar = new QStatusBar;
-
- mainLayout->addWidget(menubar, 0, 0);
- mainLayout->addWidget(hp2600Button, 1, 0);
- mainLayout->addWidget(hp1600Button, 2, 0);
- mainLayout->addWidget(hp1020Button, 3, 0);
- mainLayout->addWidget(hp1018Button, 4, 0);
- mainLayout->addWidget(hp1005Button, 5, 0);
- mainLayout->addWidget(hp1000Button, 6, 0);
- mainLayout->addWidget(minolta2530Button, 7, 0);
- mainLayout->addWidget(minolta2490Button, 8, 0);
- mainLayout->addWidget(minolta2480Button, 9, 0);
- mainLayout->addWidget(minolta2430Button, 10, 0);
- mainLayout->addWidget(minolta2300Button, 11, 0);
- mainLayout->addWidget(minolta2200Button, 12, 0);
- mainLayout->addWidget(minoltaproButton, 13, 0);
- mainLayout->addWidget(samsung3160Button, 14, 0);
- mainLayout->addWidget(samsung600Button, 15, 0);
- mainLayout->addWidget(samsung300Button, 16, 0);
- mainLayout->addWidget(xerox6115Button, 17, 0);
- mainLayout->addWidget(xerox6110Button, 18, 0);
- mainLayout->addWidget(allButton, 19, 0);
- mainLayout->addWidget(statusBar, 20, 0);
- mainLayout->addWidget(downloadButton, 21, 0);
- mainLayout->addWidget(exitButton, 22, 0);
- setMinimumSize(600, 700);
- setLayout(mainLayout);
-
- buttonGroup = new QButtonGroup;
- buttonGroup->setExclusive(false);
- buttonGroup->addButton(hp2600Button, 0);
- buttonGroup->addButton(hp1600Button, 1);
- buttonGroup->addButton(hp1020Button, 2);
- buttonGroup->addButton(hp1018Button, 3);
- buttonGroup->addButton(hp1005Button, 4);
- buttonGroup->addButton(hp1000Button, 5);
- buttonGroup->addButton(minolta2530Button, 6);
- buttonGroup->addButton(minolta2490Button, 7);
- buttonGroup->addButton(minolta2480Button, 8);
- buttonGroup->addButton(minolta2430Button, 9);
- buttonGroup->addButton(minolta2300Button, 10);
- buttonGroup->addButton(minolta2200Button, 11);
- buttonGroup->addButton(minoltaproButton, 12);
- buttonGroup->addButton(samsung3160Button, 13);
- buttonGroup->addButton(samsung600Button, 14);
- buttonGroup->addButton(samsung300Button, 15);
- buttonGroup->addButton(xerox6115Button, 16);
- buttonGroup->addButton(xerox6110Button, 17);
-
- connect(about, SIGNAL(triggered()), this, SLOT(showInfo()));
- connect(allButton, SIGNAL(stateChanged(int)), this, SLOT(setCheckBoxes(int)));
- connect(exitButton, SIGNAL(clicked()), qApp, SLOT(quit()));
-};
-
-void MainWindow::showInfo()
-{
- QMessageBox::information(this, tr("Hannah-Foo2zjs Firmware Downloader"),
- tr("This program is developed by the Debian Foo2ZJS maintainers.\n"
- "It is offered as a convenient method to download the needed\n"
- "firmware for one of the printers supported by Foo2ZJS. Please feel\n"
- "free to report any bugs against the foo2zjs package\n"
- "to the Debian BTS (http://bugs.debian.org).\n"
- "The program's name is Hannah:\n"
- "(grapHical interfAce for dowNloading your priNter's firmwAre at Home).\n"),
- QMessageBox::Ok);
-};
-
-void MainWindow::setCheckBoxes(int state)
-{
- switch (state) {
- case 2:
- hp2600Button->setCheckState(Qt::Checked);
- hp1600Button->setCheckState(Qt::Checked);
- hp1020Button->setCheckState(Qt::Checked);
- hp1018Button->setCheckState(Qt::Checked);
- hp1005Button->setCheckState(Qt::Checked);
- hp1000Button->setCheckState(Qt::Checked);
- minolta2530Button->setCheckState(Qt::Checked);
- minolta2490Button->setCheckState(Qt::Checked);
- minolta2480Button->setCheckState(Qt::Checked);
- minolta2430Button->setCheckState(Qt::Checked);
- minolta2300Button->setCheckState(Qt::Checked);
- minolta2200Button->setCheckState(Qt::Checked);
- minoltaproButton->setCheckState(Qt::Checked);
- samsung3160Button->setCheckState(Qt::Checked);
- samsung600Button->setCheckState(Qt::Checked);
- samsung300Button->setCheckState(Qt::Checked);
- xerox6115Button->setCheckState(Qt::Checked);
- xerox6110Button->setCheckState(Qt::Checked);
- break;
- case 0:
- hp2600Button->setCheckState(Qt::Unchecked);
- hp1600Button->setCheckState(Qt::Unchecked);
- hp1020Button->setCheckState(Qt::Unchecked);
- hp1018Button->setCheckState(Qt::Unchecked);
- hp1005Button->setCheckState(Qt::Unchecked);
- hp1000Button->setCheckState(Qt::Unchecked);
- minolta2530Button->setCheckState(Qt::Unchecked);
- minolta2490Button->setCheckState(Qt::Unchecked);
- minolta2480Button->setCheckState(Qt::Unchecked);
- minolta2430Button->setCheckState(Qt::Unchecked);
- minolta2300Button->setCheckState(Qt::Unchecked);
- minolta2200Button->setCheckState(Qt::Unchecked);
- minoltaproButton->setCheckState(Qt::Unchecked);
- samsung3160Button->setCheckState(Qt::Unchecked);
- samsung600Button->setCheckState(Qt::Unchecked);
- samsung300Button->setCheckState(Qt::Unchecked);
- xerox6115Button->setCheckState(Qt::Unchecked);
- xerox6110Button->setCheckState(Qt::Unchecked);
- break;
- default:
- break;
- }
-}
-
-void MainWindow::callGetweb()
-{
- QAbstractButton *temporary_button;
- int count = 0;
- QStringList current_list;
- current_list << "2600n" << "1600" << "1020" << "1018" << "1005" << "1000" << "2530" << "2490" << "2480" << "2430" << "2300" << "2200" << "cpwl" << "3160" << "600" << "300" << "6115" << "6110";
- QStringList arguments;
-
- foreach( temporary_button, buttonGroup->buttons() ) {
- if ( temporary_button->isChecked() ) {
- arguments << current_list.at(count);
- }
- count++;
- }
-
- QString program = "/usr/bin/getweb";
- string = arguments.join(" ");
- callProgram = new QProcess;
-
- switch (callProgram->state()) {
- case 2:
- QMessageBox::warning(this, tr("Hannah - Firmware downloader 'getweb'"),
- tr("There is already a firmware download in progress. \n"
- "Refuse to start another one."), QMessageBox::Ok);
- break;
- case 1:
- QMessageBox::warning(this, tr("Hannah - Firmware downloader 'getweb'"),
- tr("There is already a firmware download in progress. \n"
- "Refuse to start another one."), QMessageBox::Ok);
- break;
- case 0:
- callProgram->start(program, arguments);
- QString message = QString(tr("Downloading firmware for %1").arg(string));
- statusBar->showMessage(message);
- connect(callProgram, SIGNAL(finished(int)), this, SLOT(checkProgram()));
- break;
- }
-};
-
-void MainWindow::checkProgram()
-{
- switch ( callProgram->exitCode() ) {
- case 0:
- QMessageBox::information(this, tr("Hannah - Firmware downloader"),
- tr("The firmware for the following printers was downloaded and installed successfully:\n"
- "%1\n").arg(string), QMessageBox::Ok);
- statusBar->showMessage(tr("Download and installation finished."));
- break;
- default:
- QMessageBox::critical(this, tr("Hannah - Firmware downloader"),
- tr(callProgram->readAllStandardError()));
- QMessageBox::critical(this, tr("Hannah - Firmware downloader"),
- tr("Something went wrong during the download and installation process for the following printers:\n"
- "%1\n").arg(string), QMessageBox::Ok);
- statusBar->showMessage(tr("An error occured during download and installation process."));
- break;
- }
-};
Modified: trunk/foo2zjs_20090301dfsg/debian/hannah-package/gui.h
===================================================================
--- trunk/foo2zjs_20090301dfsg/debian/hannah-package/gui.h 2009-08-02 11:15:37 UTC (rev 196)
+++ trunk/foo2zjs_20090301dfsg/debian/hannah-package/gui.h 2009-09-02 19:48:55 UTC (rev 197)
@@ -1,80 +0,0 @@
-// Hannah, GUI for downloading specific printer firmware
-// Copyright (C) 2007 Steffen Joeris <white at debian.org>
-//
-// This program 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 program 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 program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-
-#ifndef GUI_H
-#define GUI_H
-
-#include <QMainWindow>
-#include <QWidget>
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QMessageBox>
-#include <QApplication>
-#include <QProcess>
-#include <QCheckBox>
-#include <QAbstractButton>
-#include <QButtonGroup>
-#include <QAction>
-#include <QMenu>
-#include <QMenuBar>
-#include <QStatusBar>
-
-class MainWindow : public QWidget
-{
- Q_OBJECT
-
-public:
- MainWindow(QWidget *parent = 0);
-
-private:
- int state;
- void createMainWidget();
- QCheckBox *hp2600Button;
- QCheckBox *hp1600Button;
- QCheckBox *hp1020Button;
- QCheckBox *hp1018Button;
- QCheckBox *hp1005Button;
- QCheckBox *hp1000Button;
- QCheckBox *minolta2530Button;
- QCheckBox *minolta2490Button;
- QCheckBox *minolta2480Button;
- QCheckBox *minolta2430Button;
- QCheckBox *minolta2300Button;
- QCheckBox *minolta2200Button;
- QCheckBox *minoltaproButton;
- QCheckBox *samsung3160Button;
- QCheckBox *samsung600Button;
- QCheckBox *samsung300Button;
- QCheckBox *xerox6115Button;
- QCheckBox *xerox6110Button;
- QCheckBox *allButton;
- QButtonGroup *buttonGroup;
- QPushButton *downloadButton;
- QPushButton *exitButton;
- QStatusBar *statusBar;
- QProcess *callProgram;
- QString string;
-
-private slots:
- void callGetweb();
- void setCheckBoxes(int);
- void showInfo();
- void checkProgram();
-};
-
-#endif // GUI_H
Modified: trunk/foo2zjs_20090301dfsg/debian/hannah-package/hannah.desktop
===================================================================
--- trunk/foo2zjs_20090301dfsg/debian/hannah-package/hannah.desktop 2009-08-02 11:15:37 UTC (rev 196)
+++ trunk/foo2zjs_20090301dfsg/debian/hannah-package/hannah.desktop 2009-09-02 19:48:55 UTC (rev 197)
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Foo2ZJS Firmware Installer (Hannah)
-Exec=/usr/bin/su-to-root -X -c /usr/bin/hannah-foo2zjs
-Type=Application
-Comment=Foo2ZJS Firmware Downloader and Installer
-Terminal=0
-Categories=System;Settings;
Modified: trunk/foo2zjs_20090301dfsg/debian/hannah-package/hannah.pro
===================================================================
--- trunk/foo2zjs_20090301dfsg/debian/hannah-package/hannah.pro 2009-08-02 11:15:37 UTC (rev 196)
+++ trunk/foo2zjs_20090301dfsg/debian/hannah-package/hannah.pro 2009-09-02 19:48:55 UTC (rev 197)
@@ -1,12 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Thu Sep 27 01:13:29 2007
-######################################################################
-
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-HEADERS += gui.h
-SOURCES += gui.cpp main.cpp
Modified: trunk/foo2zjs_20090301dfsg/debian/hannah-package/main.cpp
===================================================================
--- trunk/foo2zjs_20090301dfsg/debian/hannah-package/main.cpp 2009-08-02 11:15:37 UTC (rev 196)
+++ trunk/foo2zjs_20090301dfsg/debian/hannah-package/main.cpp 2009-09-02 19:48:55 UTC (rev 197)
@@ -1,27 +0,0 @@
-// Hannah, GUI for downloading specific printer firmware
-// Copyright (C) 2007 Steffen Joeris <white at debian.org>
-//
-// This program 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 program 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 program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-
-#include "gui.h"
-
-int main(int argc, char *argv[])
-{
- QApplication app(argc, argv);
- MainWindow window;
- window.show();
- return app.exec();
-}
Modified: trunk/foo2zjs_20090301dfsg/debian/rules
===================================================================
--- trunk/foo2zjs_20090301dfsg/debian/rules 2009-08-02 11:15:37 UTC (rev 196)
+++ trunk/foo2zjs_20090301dfsg/debian/rules 2009-09-02 19:48:55 UTC (rev 197)
@@ -22,7 +22,6 @@
configure: configure-stamp
configure-stamp: patch-stamp
dh_testdir
- cd debian/hannah-package/ && $(QMAKE)
touch configure-stamp
build: build-stamp
@@ -30,7 +29,6 @@
build-stamp: configure-stamp
dh_testdir
$(MAKE) CFLAGS="$(CFLAGS)"
- cd debian/hannah-package && $(MAKE)
touch build-stamp
clean: unpatch
@@ -38,8 +36,6 @@
dh_testroot
rm -f build-stamp configure-stamp
rm -rf debian/patched
- [ ! -f debian/hannah-package/Makefile ] || (cd debian/hannah-package/ && $(MAKE) distclean)
- rm -rf debian/hannah-package/hannah
[ ! -f Makefile ] || $(MAKE) clean
-rm -f foo2hp
-rm -f foo2hp.o
@@ -66,8 +62,6 @@
install -D -m 644 hplj10xx.rules $(CURDIR)/debian/foo2zjs/etc/udev/rules.d/11-hplj10xx.rules
install -m 755 hplj1000 $(CURDIR)/debian/foo2zjs/usr/sbin/hplj1000
install -m 755 getweb $(CURDIR)/debian/foo2zjs/usr/bin/getweb
- install -m 755 debian/hannah-package/hannah $(CURDIR)/debian/hannah-foo2zjs/usr/bin/hannah-foo2zjs
- install -m 644 debian/hannah-package/hannah.desktop $(CURDIR)/debian/hannah-foo2zjs/usr/share/applications/hannah-foo2zjs.desktop
touch $(CURDIR)/debian/foo2zjs/usr/share/foo2zjs/tmp/.placeholder
# Build architecture-independent files here.
More information about the Foo2zjs-commits
mailing list